mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264decoder: Ignore invalid max_num_reorder_frames in VUI

Browse source 
It's not fatal and can be ignored

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4357>
This commit is contained in:
Seungha Yang 2023-04-06 20:26:24 +09:00 committed by GStreamer Marge Bot
parent f439481d8e
commit e0c2578f73
1 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
subprojects/gst-plugins-bad/gst-libs/gst/codecs/gsth264decoder.c
View file

@ -2168,44 +2168,26 @@ gst_h264_decoder_finish_picture (GstH264Decoder * self,
_bump_dpb (self, bump_level, NULL, ret); _bump_dpb (self, bump_level, NULL, ret);
} }
static gboolean static gint
gst_h264_decoder_update_max_num_reorder_frames (GstH264Decoder * self, gst_h264_decoder_get_max_num_reorder_frames (GstH264Decoder * self,
GstH264SPS * sps) GstH264SPS * sps, gint max_dpb_size)
{ {
GstH264DecoderPrivate *priv = self->priv; GstH264DecoderPrivate *priv = self->priv;
gsize max_num_reorder_frames = 0;
if (sps->vui_parameters_present_flag if (sps->vui_parameters_present_flag
&& sps->vui_parameters.bitstream_restriction_flag) { && sps->vui_parameters.bitstream_restriction_flag) {
max_num_reorder_frames = sps->vui_parameters.num_reorder_frames; if (sps->vui_parameters.num_reorder_frames > max_dpb_size) {
if (max_num_reorder_frames > gst_h264_dpb_get_max_num_frames (priv->dpb)) {
GST_WARNING GST_WARNING
("max_num_reorder_frames present, but larger than MaxDpbFrames (%d > %d)", ("max_num_reorder_frames present, but larger than MaxDpbFrames (%d > %d)",
(gint) max_num_reorder_frames, sps->vui_parameters.num_reorder_frames, max_dpb_size);
gst_h264_dpb_get_max_num_frames (priv->dpb)); return max_dpb_size;
max_num_reorder_frames = 0;
return FALSE;
} }
gst_h264_dpb_set_max_num_reorder_frames (priv->dpb, max_num_reorder_frames); return sps->vui_parameters.num_reorder_frames;
return TRUE;
}
if (priv->compliance == GST_H264_DECODER_COMPLIANCE_STRICT) {
gst_h264_dpb_set_max_num_reorder_frames (priv->dpb,
gst_h264_dpb_get_max_num_frames (priv->dpb));
return TRUE;
}
/* max_num_reorder_frames not present, infer it from profile/constraints. */
if (sps->profile_idc == 66 || sps->profile_idc == 83) {
/* baseline, constrained baseline and scalable-baseline profiles
only contain I/P frames. */
max_num_reorder_frames = 0;
} else if (sps->constraint_set3_flag) { } else if (sps->constraint_set3_flag) {
/* constraint_set3_flag may mean the -intra only profile. */ /* If max_num_reorder_frames is not present, if profile id is equal to
* 44, 86, 100, 110, 122, or 244 and constraint_set3_flag is equal to 1,
* max_num_reorder_frames shall be inferred to be equal to 0 */
switch (sps->profile_idc) { switch (sps->profile_idc) {
case 44: case 44:
case 86: case 86:
@ -2213,19 +2195,21 @@ gst_h264_decoder_update_max_num_reorder_frames (GstH264Decoder * self,
case 110: case 110:
case 122: case 122:
case 244: case 244:
max_num_reorder_frames = 0; return 0;
break;
default: default:
max_num_reorder_frames = gst_h264_dpb_get_max_num_frames (priv->dpb);
break; break;
} }
} else {
max_num_reorder_frames = gst_h264_dpb_get_max_num_frames (priv->dpb);
} }
gst_h264_dpb_set_max_num_reorder_frames (priv->dpb, max_num_reorder_frames); /* Relaxed conditions (undefined by spec) */
if (priv->compliance != GST_H264_DECODER_COMPLIANCE_STRICT &&
(sps->profile_idc == 66 || sps->profile_idc == 83)) {
/* baseline, constrained baseline and scalable-baseline profiles
* only contain I/P frames. */
return 0;
}
return TRUE; return max_dpb_size;
} }
typedef enum typedef enum
@ -2477,8 +2461,8 @@ gst_h264_decoder_process_sps (GstH264Decoder * self, GstH264SPS * sps)
gst_h264_dpb_set_interlaced (priv->dpb, interlaced); gst_h264_dpb_set_interlaced (priv->dpb, interlaced);
} }
if (!gst_h264_decoder_update_max_num_reorder_frames (self, sps)) gst_h264_dpb_set_max_num_reorder_frames (priv->dpb,
return GST_FLOW_ERROR; gst_h264_decoder_get_max_num_reorder_frames (self, sps, max_dpb_size));
return GST_FLOW_OK; return GST_FLOW_OK;
} }