mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

avviddec: Avoid flushing on framerate changes

Browse source 
A framerate change does not require flushing the decoder and causes
issues with some specific fragmented files if the two fragments have
different framerate.

Fixes #1522

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3270>
This commit is contained in:
Nicolas Dufresne 2022-10-26 10:44:01 -04:00 committed by GStreamer Marge Bot
parent 990d124790
commit 9ebe338d80
1 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
subprojects/gst-libav/ext/libav/gstavviddec.c
View file

@ -456,6 +456,33 @@ gst_ffmpegviddec_get_palette (GstFFMpegVidDec * ffmpegdec,
} }
} }
static gboolean
gst_ffmpegviddec_needs_reset (GstFFMpegVidDec * ffmpegdec,
GstVideoCodecState * state)
{
GstCaps *last_caps, *new_caps;
gboolean needs_reset;
if (ffmpegdec->last_caps == NULL)
return TRUE;
last_caps = gst_caps_copy (ffmpegdec->last_caps);
new_caps = gst_caps_copy (state->caps);
/* Simply ignore framerate for now, this could easily be evolved per CODEC if
* future issue are found.*/
gst_structure_remove_field (gst_caps_get_structure (last_caps, 0),
"framerate");
gst_structure_remove_field (gst_caps_get_structure (new_caps, 0),
"framerate");
needs_reset = !gst_caps_is_equal (last_caps, new_caps);
gst_caps_unref (last_caps);
gst_caps_unref (new_caps);
return needs_reset;
}
static gboolean static gboolean
gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
@ -469,15 +496,15 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
ffmpegdec = (GstFFMpegVidDec *) decoder; ffmpegdec = (GstFFMpegVidDec *) decoder;
oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
if (ffmpegdec->last_caps != NULL &&
gst_caps_is_equal (ffmpegdec->last_caps, state->caps)) {
return TRUE;
}
GST_DEBUG_OBJECT (ffmpegdec, "setcaps called"); GST_DEBUG_OBJECT (ffmpegdec, "setcaps called");
GST_OBJECT_LOCK (ffmpegdec); GST_OBJECT_LOCK (ffmpegdec);
if (!gst_ffmpegviddec_needs_reset (ffmpegdec, state)) {
gst_caps_replace (&ffmpegdec->last_caps, state->caps);
goto update_state;
}
/* close old session */ /* close old session */
if (ffmpegdec->opened) { if (ffmpegdec->opened) {
GST_OBJECT_UNLOCK (ffmpegdec); GST_OBJECT_UNLOCK (ffmpegdec);
@ -600,6 +627,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
if (!gst_ffmpegviddec_open (ffmpegdec)) if (!gst_ffmpegviddec_open (ffmpegdec))
goto open_failed; goto open_failed;
update_state:
if (ffmpegdec->input_state) if (ffmpegdec->input_state)
gst_video_codec_state_unref (ffmpegdec->input_state); gst_video_codec_state_unref (ffmpegdec->input_state);
ffmpegdec->input_state = gst_video_codec_state_ref (state); ffmpegdec->input_state = gst_video_codec_state_ref (state);