mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-16 11:28:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-10-03 11:32:24 +02:00
parent afb740b897 d4d5e350d0
commit d4b2751c39
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/ffmpeg/gstffmpegdec.c
View file

@ -1881,6 +1881,28 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
gst_ffmpegdec_video_negotiate (ffmpegdec, TRUE);
}
/* Whether a frame is interlaced or not is unknown at the time of
buffer allocation, so caps on the buffer in opaque will have
the previous frame's interlaced flag set. So if interlacedness
has changed since allocation, we update the buffer (if any)
caps now with the correct interlaced flag. */
if (ffmpegdec->picture->opaque != NULL) {
GstBuffer *buffer = ffmpegdec->picture->opaque;
if (GST_BUFFER_CAPS (buffer) && GST_PAD_CAPS (ffmpegdec->srcpad)) {
GstStructure *s = gst_caps_get_structure (GST_BUFFER_CAPS (buffer), 0);
gboolean interlaced;
gboolean found = gst_structure_get_boolean (s, "interlaced", &interlaced);
if (!found || (!!interlaced != !!ffmpegdec->format.video.interlaced)) {
GST_DEBUG_OBJECT (ffmpegdec,
"Buffer interlacing does not match pad, updating");
buffer = gst_buffer_make_metadata_writable (buffer);
gst_buffer_set_caps (buffer, GST_PAD_CAPS (ffmpegdec->srcpad));
ffmpegdec->picture->opaque = buffer;
}
}
}
/* check if we are dealing with a keyframe here, this will also check if we
* are dealing with B frames. */
iskeyframe = check_keyframe (ffmpegdec);