From: Piotr Brzeziński Date: Thu, 23 Feb 2023 13:14:57 +0000 (+0100) Subject: vtdec: Correctly retrieve reorder queue length from SPS X-Git-Tag: 1.22.7~430 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f534432d6bbbbae7bcd8fc8452fa744c3dda801;p=platform%2Fupstream%2Fgstreamer.git vtdec: Correctly retrieve reorder queue length from SPS Part-of: --- diff --git a/subprojects/gst-plugins-bad/sys/applemedia/meson.build b/subprojects/gst-plugins-bad/sys/applemedia/meson.build index cb2b2f2..100f14a 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/meson.build +++ b/subprojects/gst-plugins-bad/sys/applemedia/meson.build @@ -115,7 +115,7 @@ if applemedia_found_deps objcpp_args : gst_plugins_bad_args + applemedia_args + applemedia_objc_args + applemedia_objcpp_args, link_args : noseh_link_args, include_directories : [configinc, libsinc], - dependencies : [gstvideo_dep, gstaudio_dep, gstpbutils_dep, gst_dep, gstbase_dep, gstgl_dep, gstglproto_dep] + applemedia_frameworks, + dependencies : [gstvideo_dep, gstaudio_dep, gstpbutils_dep, gst_dep, gstbase_dep, gstgl_dep, gstglproto_dep, gstcodecparsers_dep] + applemedia_frameworks, override_options : ['cpp_std=c++11'], install : true, install_dir : plugins_install_dir, diff --git a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c index 01cb3ea..f5e5415 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c +++ b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.c @@ -1066,54 +1066,6 @@ gst_vtdec_push_frames_if_needed (GstVtdec * vtdec, gboolean drain, return ret; } -static gboolean -parse_h264_profile_and_level_from_codec_data (GstVtdec * vtdec, - GstBuffer * codec_data, int *profile, int *level) -{ - GstMapInfo map; - guint8 *data; - gint size; - gboolean ret = TRUE; - - gst_buffer_map (codec_data, &map, GST_MAP_READ); - data = map.data; - size = map.size; - - /* parse the avcC data */ - if (size < 7) - goto avcc_too_small; - - /* parse the version, this must be 1 */ - if (data[0] != 1) - goto wrong_version; - - /* AVCProfileIndication */ - /* profile_compat */ - /* AVCLevelIndication */ - if (profile) - *profile = data[1]; - - if (level) - *level = data[3]; - -out: - gst_buffer_unmap (codec_data, &map); - - return ret; - -avcc_too_small: - GST_ELEMENT_ERROR (vtdec, STREAM, DECODE, (NULL), - ("invalid codec_data buffer length")); - ret = FALSE; - goto out; - -wrong_version: - GST_ELEMENT_ERROR (vtdec, STREAM, DECODE, (NULL), - ("wrong avcC version in codec_data")); - ret = FALSE; - goto out; -} - static int get_dpb_max_mb_s_from_level (GstVtdec * vtdec, int level) { @@ -1170,47 +1122,126 @@ gst_vtdec_compute_reorder_queue_length (GstVtdec * vtdec, vtdec->reorder_queue_length = 0; } + GST_DEBUG_OBJECT (vtdec, "Reorder queue length: %d", + vtdec->reorder_queue_length); + return TRUE; +} + +static gboolean +parse_h264_decoder_config_record (GstVtdec * vtdec, GstBuffer * codec_data, + GstH264DecoderConfigRecord ** config) +{ + GstH264NalParser *parser = gst_h264_nal_parser_new (); + GstMapInfo map; + gboolean ret = TRUE; + + gst_buffer_map (codec_data, &map, GST_MAP_READ); + + if (gst_h264_parser_parse_decoder_config_record (parser, map.data, map.size, + config) != GST_H264_PARSER_OK) { + GST_WARNING_OBJECT (vtdec, "Failed to parse codec-data"); + ret = FALSE; + } + + gst_h264_nal_parser_free (parser); + gst_buffer_unmap (codec_data, &map); + return ret; +} + +static gboolean +get_h264_dpb_size_from_sps (GstVtdec * vtdec, GstH264NalUnit * nalu, + gint * dpb_size) +{ + GstH264ParserResult result; + GstH264SPS sps; + gint width_mb, height_mb; + gint max_dpb_frames, max_dpb_size, max_dpb_mbs; + + result = gst_h264_parse_sps (nalu, &sps); + if (result != GST_H264_PARSER_OK) { + GST_WARNING_OBJECT (vtdec, "Failed to parse SPS, result %d", result); + return FALSE; + } + + max_dpb_mbs = get_dpb_max_mb_s_from_level (vtdec, sps.level_idc); + if (max_dpb_mbs == -1) { + GST_ELEMENT_ERROR (vtdec, STREAM, DECODE, (NULL), + ("invalid level found in SPS, could not compute max_dpb_mbs")); + gst_h264_sps_clear (&sps); + return FALSE; + } + + /* This formula is specified in sections A.3.1.h and A.3.2.f of the 2009 + * edition of the standard */ + width_mb = sps.width / 16; + height_mb = sps.height / 16; + max_dpb_frames = MIN (max_dpb_mbs / (width_mb * height_mb), + GST_VTDEC_DPB_MAX_SIZE); + + if (sps.vui_parameters_present_flag + && sps.vui_parameters.bitstream_restriction_flag) + max_dpb_frames = MAX (1, sps.vui_parameters.max_dec_frame_buffering); + + /* Some non-conforming H264 streams may request a number of frames + * larger than the calculated limit. + * See https://chromium-review.googlesource.com/c/chromium/src/+/760276/ + */ + max_dpb_size = MAX (max_dpb_frames, sps.num_ref_frames); + if (max_dpb_size > GST_VTDEC_DPB_MAX_SIZE) { + GST_WARNING_OBJECT (vtdec, "Too large calculated DPB size %d", + max_dpb_size); + max_dpb_size = GST_VTDEC_DPB_MAX_SIZE; + } + + *dpb_size = max_dpb_size; + + gst_h264_sps_clear (&sps); return TRUE; } static gboolean compute_h264_decode_picture_buffer_length (GstVtdec * vtdec, - GstBuffer * codec_data, int *length) + GstBuffer * codec_data, gint * length) { - int profile, level; - int dpb_mb_size = 16; - int max_dpb_size_frames = 16; - int max_dpb_mb_s = -1; - int width_in_mb_s = GST_ROUND_UP_16 (vtdec->video_info.width) / dpb_mb_size; - int height_in_mb_s = GST_ROUND_UP_16 (vtdec->video_info.height) / dpb_mb_size; + GstH264DecoderConfigRecord *config = NULL; + GstH264NalUnit *nalu; + guint8 profile, level; + gboolean ret = TRUE; + gint new_length; + guint i; *length = 0; - if (!parse_h264_profile_and_level_from_codec_data (vtdec, codec_data, - &profile, &level)) + if (vtdec->video_info.width == 0 || vtdec->video_info.height == 0) return FALSE; - if (vtdec->video_info.width == 0 || vtdec->video_info.height == 0) + if (!parse_h264_decoder_config_record (vtdec, codec_data, &config)) return FALSE; + profile = config->profile_indication; + level = config->level_indication; GST_INFO_OBJECT (vtdec, "parsed profile %d, level %d", profile, level); + if (profile == 66) { /* baseline or constrained-baseline, we don't need to reorder */ - return TRUE; + goto out; } - max_dpb_mb_s = get_dpb_max_mb_s_from_level (vtdec, level); - if (max_dpb_mb_s == -1) { - GST_ELEMENT_ERROR (vtdec, STREAM, DECODE, (NULL), - ("invalid level in codec_data, could not compute max_dpb_mb_s")); - return FALSE; + for (i = 0; i < config->sps->len; i++) { + nalu = &g_array_index (config->sps, GstH264NalUnit, i); + + if (nalu->type != GST_H264_NAL_SPS) + continue; + + if (!get_h264_dpb_size_from_sps (vtdec, nalu, &new_length)) + GST_WARNING_OBJECT (vtdec, "Failed to get DPB size from SPS"); + else + *length = MAX (*length, new_length); } - /* this formula is specified in sections A.3.1.h and A.3.2.f of the 2009 - * edition of the standard */ - *length = MIN (floor (max_dpb_mb_s / (width_in_mb_s * height_in_mb_s)), - max_dpb_size_frames); - return TRUE; +out: + gst_h264_decoder_config_record_free (config); + return ret; } static gboolean diff --git a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.h b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.h index b5dbae2..f368b2c 100644 --- a/subprojects/gst-plugins-bad/sys/applemedia/vtdec.h +++ b/subprojects/gst-plugins-bad/sys/applemedia/vtdec.h @@ -30,6 +30,8 @@ #if defined(APPLEMEDIA_MOLTENVK) #include #endif +#define GST_USE_UNSTABLE_API +#include G_BEGIN_DECLS @@ -42,6 +44,8 @@ G_BEGIN_DECLS typedef struct _GstVtdec GstVtdec; typedef struct _GstVtdecClass GstVtdecClass; +#define GST_VTDEC_DPB_MAX_SIZE 16 + struct _GstVtdec { GstVideoDecoder base_vtdec;