mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

androidmedia: Add extra H.26[45] profile mappings

Browse source 
Update the android headers and add missing mappings for H.264/H.265
profiles that have been added in newer android releases

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7743>
This commit is contained in:
Jan Schmidt 2024-10-22 21:28:04 +11:00 committed by GStreamer Marge Bot
parent c830f87a32
commit 13c3d397a2
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/sys/androidmedia/gstamc-constants.h
View file

@ -120,7 +120,10 @@ enum
enum enum
{ {
HEVCProfileMain = 0x01, HEVCProfileMain = 0x01,
HEVCProfileMain10 = 0x02 HEVCProfileMain10 = 0x02,
HEVCProfileMain10HDR10 = 0x1000,
HEVCProfileMain10HDR10Plus = 0x2000,
HEVCProfileMainStill = 0x4
}; };
enum enum
@ -156,6 +159,8 @@ enum
enum enum
{ {
AVCProfileBaseline = 0x01, AVCProfileBaseline = 0x01,
AVCProfileConstrainedBaseline = 0x10000,
AVCProfileConstrainedHigh = 0x80000,
AVCProfileMain = 0x02, AVCProfileMain = 0x02,
AVCProfileExtended = 0x04, AVCProfileExtended = 0x04,
AVCProfileHigh = 0x08, AVCProfileHigh = 0x08,
@ -181,7 +186,10 @@ enum
AVCLevel41 = 0x1000, AVCLevel41 = 0x1000,
AVCLevel42 = 0x2000, AVCLevel42 = 0x2000,
AVCLevel5 = 0x4000, AVCLevel5 = 0x4000,
AVCLevel51 = 0x8000 AVCLevel51 = 0x8000,
AVCLevel6 = 0x20000,
AVCLevel61 = 0x40000,
AVCLevel62 = 0x80000
}; };
enum enum

8
subprojects/gst-plugins-bad/sys/androidmedia/gstamc.c
View file

@ -1093,7 +1093,9 @@ static const struct
} hevc_profile_mapping_table[] = { } hevc_profile_mapping_table[] = {
{ {
HEVCProfileMain, "main"}, { HEVCProfileMain, "main"}, {
HEVCProfileMain10, "main-10"} HEVCProfileMain10, "main-10"}, {
HEVCProfileMain10HDR10, "main-10"}, {
HEVCProfileMain10HDR10Plus, "main-10"}
}; };
const gchar * const gchar *
@ -1197,10 +1199,12 @@ static const struct
const gchar *alt_str; const gchar *alt_str;
} avc_profile_mapping_table[] = { } avc_profile_mapping_table[] = {
{ {
AVCProfileBaseline, "baseline", "constrained-baseline"}, { AVCProfileBaseline, "baseline", NULL}, {
AVCProfileConstrainedBaseline, "constrained-baseline", NULL}, {
AVCProfileMain, "main", NULL}, { AVCProfileMain, "main", NULL}, {
AVCProfileExtended, "extended", NULL}, { AVCProfileExtended, "extended", NULL}, {
AVCProfileHigh, "high"}, { AVCProfileHigh, "high"}, {
AVCProfileConstrainedHigh, "constrained-high", NULL}, {
AVCProfileHigh10, "high-10", "high-10-intra"}, { AVCProfileHigh10, "high-10", "high-10-intra"}, {
AVCProfileHigh422, "high-4:2:2", "high-4:2:2-intra"}, { AVCProfileHigh422, "high-4:2:2", "high-4:2:2-intra"}, {
AVCProfileHigh444, "high-4:4:4", "high-4:4:4-intra"} AVCProfileHigh444, "high-4:4:4", "high-4:4:4-intra"}