mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: h264: Update level table to "Recommendation H.264 (04/17)".

Browse source 
Added level 6, 6.1 and 6.2. Reference Table A-1 – Level limits
from T-REC-H.264-201704.

https://bugzilla.gnome.org/show_bug.cgi?id=797202
This commit is contained in:
Matteo Valdina 2018-09-24 16:54:29 -05:00 committed by Víctor Manuel Jáquez Leal
parent 619abbdeb4
commit b1b36a44a4
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst-libs/gst/vaapi/gstvaapiutils_h264.c
View file

@ -70,6 +70,9 @@ static const struct map gst_vaapi_h264_level_map[] = {
{ GST_VAAPI_LEVEL_H264_L5, "5" }, { GST_VAAPI_LEVEL_H264_L5, "5" },
{ GST_VAAPI_LEVEL_H264_L5_1, "5.1" }, { GST_VAAPI_LEVEL_H264_L5_1, "5.1" },
{ GST_VAAPI_LEVEL_H264_L5_2, "5.2" }, { GST_VAAPI_LEVEL_H264_L5_2, "5.2" },
{ GST_VAAPI_LEVEL_H264_L6, "6" },
{ GST_VAAPI_LEVEL_H264_L6_1, "6.1" },
{ GST_VAAPI_LEVEL_H264_L6_2, "6.2" },
{ 0, NULL } { 0, NULL }
/* *INDENT-ON* */ /* *INDENT-ON* */
}; };
@ -95,6 +98,9 @@ static const GstVaapiH264LevelLimits gst_vaapi_h264_level_limits[] = {
{ GST_VAAPI_LEVEL_H264_L5, 50, 589824, 22080, 110400, 135000, 135000, 2 }, { GST_VAAPI_LEVEL_H264_L5, 50, 589824, 22080, 110400, 135000, 135000, 2 },
{ GST_VAAPI_LEVEL_H264_L5_1, 51, 983040, 36864, 184320, 240000, 240000, 2 }, { GST_VAAPI_LEVEL_H264_L5_1, 51, 983040, 36864, 184320, 240000, 240000, 2 },
{ GST_VAAPI_LEVEL_H264_L5_2, 52, 2073600, 36864, 184320, 240000, 240000, 2 }, { GST_VAAPI_LEVEL_H264_L5_2, 52, 2073600, 36864, 184320, 240000, 240000, 2 },
{ GST_VAAPI_LEVEL_H264_L6, 60, 4177920, 139264, 696320, 240000, 240000, 2 },
{ GST_VAAPI_LEVEL_H264_L6_1, 61, 8355840, 139264, 696320, 480000, 480000, 2 },
{ GST_VAAPI_LEVEL_H264_L6_2, 62, 16711680, 139264, 696320, 800000, 800000, 2 },
{ 0, } { 0, }
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
@ -322,7 +328,7 @@ not_found:
const gchar * const gchar *
gst_vaapi_utils_h264_get_level_string (GstVaapiLevelH264 level) gst_vaapi_utils_h264_get_level_string (GstVaapiLevelH264 level)
{ {
if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L5_2) if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L6_2)
return NULL; return NULL;
return gst_vaapi_h264_level_map[level - GST_VAAPI_LEVEL_H264_L1].name; return gst_vaapi_h264_level_map[level - GST_VAAPI_LEVEL_H264_L1].name;
} }
@ -331,7 +337,7 @@ gst_vaapi_utils_h264_get_level_string (GstVaapiLevelH264 level)
const GstVaapiH264LevelLimits * const GstVaapiH264LevelLimits *
gst_vaapi_utils_h264_get_level_limits (GstVaapiLevelH264 level) gst_vaapi_utils_h264_get_level_limits (GstVaapiLevelH264 level)
{ {
if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L5_2) if (level < GST_VAAPI_LEVEL_H264_L1 || level > GST_VAAPI_LEVEL_H264_L6_2)
return NULL; return NULL;
return &gst_vaapi_h264_level_limits[level - GST_VAAPI_LEVEL_H264_L1]; return &gst_vaapi_h264_level_limits[level - GST_VAAPI_LEVEL_H264_L1];
} }

6
gst-libs/gst/vaapi/gstvaapiutils_h264.h
View file

@ -45,6 +45,9 @@ G_BEGIN_DECLS
* @GST_VAAPI_LEVEL_H264_L5: H.264 level 5. * @GST_VAAPI_LEVEL_H264_L5: H.264 level 5.
* @GST_VAAPI_LEVEL_H264_L5_1: H.264 level 5.1. * @GST_VAAPI_LEVEL_H264_L5_1: H.264 level 5.1.
* @GST_VAAPI_LEVEL_H264_L5_2: H.264 level 5.2. * @GST_VAAPI_LEVEL_H264_L5_2: H.264 level 5.2.
* @GST_VAAPI_LEVEL_H264_L6: H.264 level 6.
* @GST_VAAPI_LEVEL_H264_L6_1: H.264 level 6.1.
* @GST_VAAPI_LEVEL_H264_L6_2: H.264 level 6.2.
* *
* The set of all levels for #GstVaapiLevelH264. * The set of all levels for #GstVaapiLevelH264.
*/ */
@ -66,6 +69,9 @@ typedef enum {
GST_VAAPI_LEVEL_H264_L5, GST_VAAPI_LEVEL_H264_L5,
GST_VAAPI_LEVEL_H264_L5_1, GST_VAAPI_LEVEL_H264_L5_1,
GST_VAAPI_LEVEL_H264_L5_2, GST_VAAPI_LEVEL_H264_L5_2,
GST_VAAPI_LEVEL_H264_L6,
GST_VAAPI_LEVEL_H264_L6_1,
GST_VAAPI_LEVEL_H264_L6_2,
} GstVaapiLevelH264; } GstVaapiLevelH264;
/* Returns a relative score for the supplied GstVaapiProfile */ /* Returns a relative score for the supplied GstVaapiProfile */