mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 05:05:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/: When doing QoS, don't drop the frame before decoding because we might drop an important reference frame,...

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_base_init),
(gst_ffmpegdec_setcaps), (gst_ffmpegdec_video_frame):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_base_init):
When doing QoS, don't drop the frame before decoding because we might
drop an important reference frame, just make the decoder hurry_up on
this frame.
This commit is contained in:
Wim Taymans 2008-01-25 11:44:29 +00:00
parent dad7b0d4af
commit 15c2ba23c6
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2008-01-25 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_base_init),
(gst_ffmpegdec_setcaps), (gst_ffmpegdec_video_frame):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_base_init):
When doing QoS, don't drop the frame before decoding because we might
drop an important reference frame, just make the decoder hurry_up on
this frame.
2008-01-25 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c:

34
ext/ffmpeg/gstffmpegdec.c
View file

@ -242,7 +242,7 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass)
(params->in_plugin->type == CODEC_TYPE_VIDEO) ? "Video" : "Audio");
details.description = g_strdup_printf ("FFMPEG %s decoder",
params->in_plugin->name);
details.author = "Wim Taymans <wim@fluendo.com>, "
details.author = "Wim Taymans <wim.taymans@gmail.com>, "
"Ronald Bultje <rbultje@ronald.bitfreak.net>, "
"Edward Hervey <bilboed@bilboed.com>";
gst_element_class_set_details (element_class, &details);
@ -674,7 +674,6 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
/* workaround encoder bugs */
ffmpegdec->context->workaround_bugs |= FF_BUG_AUTODETECT;
ffmpegdec->context->error_resilience = 1;
/* for slow cpus */
@ -1373,6 +1372,8 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
gint have_data;
gboolean iskeyframe;
gboolean mode_switch;
gboolean decode;
gint hurry_up;
*ret = GST_FLOW_OK;
*outbuf = NULL;
@ -1382,11 +1383,9 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
/* in case we skip frames */
ffmpegdec->picture->pict_type = -1;
/* run QoS code, returns FALSE if we can skip decoding this
* frame entirely. */
if (G_UNLIKELY (!gst_ffmpegdec_do_qos (ffmpegdec, in_timestamp,
&mode_switch)))
goto drop_qos;
/* run QoS code, we don't stop decoding the frame when we are late because
* else we might skip a reference frame */
decode = gst_ffmpegdec_do_qos (ffmpegdec, in_timestamp, &mode_switch);
if (ffmpegdec->is_realvideo && data != NULL) {
gint slice_count;
@ -1406,10 +1405,22 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
}
}
if (!decode) {
/* no decoding needed, save previous hurry_up value and brutely skip
* decoding everything */
hurry_up = ffmpegdec->context->hurry_up;
ffmpegdec->context->hurry_up = 2;
}
/* now decode the frame */
len = avcodec_decode_video (ffmpegdec->context,
ffmpegdec->picture, &have_data, data, size);
/* restore previous state */
if (!decode)
ffmpegdec->context->hurry_up = hurry_up;
GST_DEBUG_OBJECT (ffmpegdec, "after decode: len %d, have_data %d",
len, have_data);
@ -1527,15 +1538,6 @@ beach:
return len;
/* special cases */
drop_qos:
{
GST_WARNING_OBJECT (ffmpegdec, "Dropping frame because of QoS");
/* drop a frame, set discont on next buffer, pretend we decoded the complete
* buffer */
ffmpegdec->discont = TRUE;
len = size;
goto beach;
}
drop_non_keyframe:
{
GST_WARNING_OBJECT (ffmpegdec, "Dropping non-keyframe (seek/init)");

2
ext/ffmpeg/gstffmpegenc.c
View file

@ -137,7 +137,7 @@ gst_ffmpegenc_base_init (GstFFMpegEncClass * klass)
(params->in_plugin->type == CODEC_TYPE_VIDEO) ? "Video" : "Audio");
details.description = g_strdup_printf ("FFMPEG %s encoder",
params->in_plugin->name);
details.author = "Wim Taymans <wim.taymans@chello.be>, "
details.author = "Wim Taymans <wim.taymans@gmail.com>, "
"Ronald Bultje <rbultje@ronald.bitfreak.net>";
gst_element_class_set_details (element_class, &details);
g_free (details.longname);