mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: encoder: mpeg2: Add highP level for 1080@50p/60p.

Browse source 
The MPEG2 spec has amendment 3 to introduce a new level highP, which
is used for 1080@50p/60p streams. We need to add this level to avoid
encoding failure because of the level check.

Fix: #306
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/432>
This commit is contained in:
He Junyan 2021-06-03 22:12:04 +08:00 committed by GStreamer Marge Bot
parent 9f02c3fa4c
commit 310ffc17a8
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/vaapi/gstvaapiutils_mpeg2.c
View file

@ -51,6 +51,7 @@ static const struct map gst_vaapi_mpeg2_level_map[] = {
{ GST_VAAPI_LEVEL_MPEG2_MAIN, "main" }, { GST_VAAPI_LEVEL_MPEG2_MAIN, "main" },
{ GST_VAAPI_LEVEL_MPEG2_HIGH_1440, "high-1440" }, { GST_VAAPI_LEVEL_MPEG2_HIGH_1440, "high-1440" },
{ GST_VAAPI_LEVEL_MPEG2_HIGH, "high" }, { GST_VAAPI_LEVEL_MPEG2_HIGH, "high" },
{ GST_VAAPI_LEVEL_MPEG2_HIGHP, "highP" },
{ 0, NULL } { 0, NULL }
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };
@ -67,6 +68,9 @@ static const GstVaapiMPEG2LevelLimits gst_vaapi_mpeg2_level_limits[] = {
0x06, 1440, 1152, 60, 47001600, 60000, 7340032 }, 0x06, 1440, 1152, 60, 47001600, 60000, 7340032 },
{ GST_VAAPI_LEVEL_MPEG2_HIGH, { GST_VAAPI_LEVEL_MPEG2_HIGH,
0x04, 1920, 1152, 60, 62668800, 80000, 9781248 }, 0x04, 1920, 1152, 60, 62668800, 80000, 9781248 },
/* Amendment 3: New level for 1080@50p/60p */
{ GST_VAAPI_LEVEL_MPEG2_HIGHP,
0x02, 1920, 1152, 60, 125337600, 80000, 9781248 },
{ 0, } { 0, }
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -215,7 +219,7 @@ gst_vaapi_utils_mpeg2_get_level_from_string (const gchar * str)
const gchar * const gchar *
gst_vaapi_utils_mpeg2_get_level_string (GstVaapiLevelMPEG2 level) gst_vaapi_utils_mpeg2_get_level_string (GstVaapiLevelMPEG2 level)
{ {
if (level < GST_VAAPI_LEVEL_MPEG2_LOW || level > GST_VAAPI_LEVEL_MPEG2_HIGH) if (level < GST_VAAPI_LEVEL_MPEG2_LOW || level > GST_VAAPI_LEVEL_MPEG2_HIGHP)
return NULL; return NULL;
return gst_vaapi_mpeg2_level_map[level - GST_VAAPI_LEVEL_MPEG2_LOW].name; return gst_vaapi_mpeg2_level_map[level - GST_VAAPI_LEVEL_MPEG2_LOW].name;
} }
@ -225,7 +229,7 @@ gst_vaapi_utils_mpeg2_get_level_string (GstVaapiLevelMPEG2 level)
const GstVaapiMPEG2LevelLimits * const GstVaapiMPEG2LevelLimits *
gst_vaapi_utils_mpeg2_get_level_limits (GstVaapiLevelMPEG2 level) gst_vaapi_utils_mpeg2_get_level_limits (GstVaapiLevelMPEG2 level)
{ {
if (level < GST_VAAPI_LEVEL_MPEG2_LOW || level > GST_VAAPI_LEVEL_MPEG2_HIGH) if (level < GST_VAAPI_LEVEL_MPEG2_LOW || level > GST_VAAPI_LEVEL_MPEG2_HIGHP)
return NULL; return NULL;
return &gst_vaapi_mpeg2_level_limits[level - GST_VAAPI_LEVEL_MPEG2_LOW]; return &gst_vaapi_mpeg2_level_limits[level - GST_VAAPI_LEVEL_MPEG2_LOW];
} }

2
gst-libs/gst/vaapi/gstvaapiutils_mpeg2.h
View file

@ -33,6 +33,7 @@ G_BEGIN_DECLS
* @GST_VAAPI_LEVEL_MPEG2_MAIN: Main level. * @GST_VAAPI_LEVEL_MPEG2_MAIN: Main level.
* @GST_VAAPI_LEVEL_MPEG2_HIGH_1440: High-1440 level. * @GST_VAAPI_LEVEL_MPEG2_HIGH_1440: High-1440 level.
* @GST_VAAPI_LEVEL_MPEG2_HIGH: High level. * @GST_VAAPI_LEVEL_MPEG2_HIGH: High level.
* @GST_VAAPI_LEVEL_MPEG2_HIGHP: HighP level.
* *
* The set of all levels for #GstVaapiLevelMPEG2. * The set of all levels for #GstVaapiLevelMPEG2.
*/ */
@ -41,6 +42,7 @@ typedef enum {
GST_VAAPI_LEVEL_MPEG2_MAIN, GST_VAAPI_LEVEL_MPEG2_MAIN,
GST_VAAPI_LEVEL_MPEG2_HIGH_1440, GST_VAAPI_LEVEL_MPEG2_HIGH_1440,
GST_VAAPI_LEVEL_MPEG2_HIGH, GST_VAAPI_LEVEL_MPEG2_HIGH,
GST_VAAPI_LEVEL_MPEG2_HIGHP,
} GstVaapiLevelMPEG2; } GstVaapiLevelMPEG2;
/* Returns a relative score for the supplied GstVaapiProfile */ /* Returns a relative score for the supplied GstVaapiProfile */