diff --git a/subprojects/gst-plugins-bad/sys/androidmedia/gstamc-constants.h b/subprojects/gst-plugins-bad/sys/androidmedia/gstamc-constants.h index 95a965aed7..31eebe5def 100644 --- a/subprojects/gst-plugins-bad/sys/androidmedia/gstamc-constants.h +++ b/subprojects/gst-plugins-bad/sys/androidmedia/gstamc-constants.h @@ -120,7 +120,10 @@ enum enum { HEVCProfileMain = 0x01, - HEVCProfileMain10 = 0x02 + HEVCProfileMain10 = 0x02, + HEVCProfileMain10HDR10 = 0x1000, + HEVCProfileMain10HDR10Plus = 0x2000, + HEVCProfileMainStill = 0x4 }; enum @@ -156,6 +159,8 @@ enum enum { AVCProfileBaseline = 0x01, + AVCProfileConstrainedBaseline = 0x10000, + AVCProfileConstrainedHigh = 0x80000, AVCProfileMain = 0x02, AVCProfileExtended = 0x04, AVCProfileHigh = 0x08, @@ -181,7 +186,10 @@ enum AVCLevel41 = 0x1000, AVCLevel42 = 0x2000, AVCLevel5 = 0x4000, - AVCLevel51 = 0x8000 + AVCLevel51 = 0x8000, + AVCLevel6 = 0x20000, + AVCLevel61 = 0x40000, + AVCLevel62 = 0x80000 }; enum diff --git a/subprojects/gst-plugins-bad/sys/androidmedia/gstamc.c b/subprojects/gst-plugins-bad/sys/androidmedia/gstamc.c index 82fcdb6e94..e2f016fa4c 100644 --- a/subprojects/gst-plugins-bad/sys/androidmedia/gstamc.c +++ b/subprojects/gst-plugins-bad/sys/androidmedia/gstamc.c @@ -1093,7 +1093,9 @@ static const struct } hevc_profile_mapping_table[] = { { HEVCProfileMain, "main"}, { - HEVCProfileMain10, "main-10"} + HEVCProfileMain10, "main-10"}, { + HEVCProfileMain10HDR10, "main-10"}, { + HEVCProfileMain10HDR10Plus, "main-10"} }; const gchar * @@ -1197,10 +1199,12 @@ static const struct const gchar *alt_str; } avc_profile_mapping_table[] = { { - AVCProfileBaseline, "baseline", "constrained-baseline"}, { + AVCProfileBaseline, "baseline", NULL}, { + AVCProfileConstrainedBaseline, "constrained-baseline", NULL}, { AVCProfileMain, "main", NULL}, { AVCProfileExtended, "extended", NULL}, { AVCProfileHigh, "high"}, { + AVCProfileConstrainedHigh, "constrained-high", NULL}, { AVCProfileHigh10, "high-10", "high-10-intra"}, { AVCProfileHigh422, "high-4:2:2", "high-4:2:2-intra"}, { AVCProfileHigh444, "high-4:4:4", "high-4:4:4-intra"}