mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 13:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source
This commit is contained in:
Sebastian Dröge 2012-06-14 15:44:18 +02:00
commit de82bfbbba
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/ffmpeg/gstffmpegviddec.c
View file

@ -413,7 +413,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
{ {
GstFFMpegVidDec *ffmpegdec; GstFFMpegVidDec *ffmpegdec;
GstFFMpegVidDecClass *oclass; GstFFMpegVidDecClass *oclass;
gboolean ret = TRUE; gboolean ret = FALSE;
ffmpegdec = (GstFFMpegVidDec *) decoder; ffmpegdec = (GstFFMpegVidDec *) decoder;
oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec)); oclass = (GstFFMpegVidDecClass *) (G_OBJECT_GET_CLASS (ffmpegdec));
@ -528,6 +528,8 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder,
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);
ret = TRUE;
done: done:
GST_OBJECT_UNLOCK (ffmpegdec); GST_OBJECT_UNLOCK (ffmpegdec);
@ -1071,20 +1073,21 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
(guint64) ffmpegdec->picture->reordered_opaque); (guint64) ffmpegdec->picture->reordered_opaque);
GST_DEBUG_OBJECT (ffmpegdec, "repeat_pict:%d", GST_DEBUG_OBJECT (ffmpegdec, "repeat_pict:%d",
ffmpegdec->picture->repeat_pict); ffmpegdec->picture->repeat_pict);
GST_DEBUG_OBJECT (ffmpegdec, "interlaced_frame:%d", GST_DEBUG_OBJECT (ffmpegdec, "interlaced_frame:%d (current:%d)",
ffmpegdec->picture->interlaced_frame); ffmpegdec->picture->interlaced_frame,
GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info));
if (G_UNLIKELY (ffmpegdec->output_state if (G_UNLIKELY (ffmpegdec->input_state
&& ffmpegdec->picture->interlaced_frame != && ffmpegdec->picture->interlaced_frame !=
GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->output_state->info))) { GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info))) {
GST_WARNING ("Change in interlacing ! picture:%d, recorded:%d", GST_WARNING ("Change in interlacing ! picture:%d, recorded:%d",
ffmpegdec->picture->interlaced_frame, ffmpegdec->picture->interlaced_frame,
GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->output_state->info)); GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info));
if (ffmpegdec->picture->interlaced_frame) if (ffmpegdec->picture->interlaced_frame)
GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->output_state->info) = GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->input_state->info) =
GST_VIDEO_INTERLACE_MODE_INTERLEAVED; GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
else else
GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->output_state->info) = GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->input_state->info) =
GST_VIDEO_INTERLACE_MODE_PROGRESSIVE; GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
gst_ffmpegviddec_negotiate (ffmpegdec, TRUE); gst_ffmpegviddec_negotiate (ffmpegdec, TRUE);
} }
@ -1095,17 +1098,17 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
if (G_UNLIKELY (*ret != GST_FLOW_OK)) if (G_UNLIKELY (*ret != GST_FLOW_OK))
goto no_output; goto no_output;
if (G_UNLIKELY (ffmpegdec->output_state if (G_UNLIKELY (ffmpegdec->input_state
&& ffmpegdec->picture->interlaced_frame != && ffmpegdec->picture->interlaced_frame !=
GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->output_state->info))) { GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info))) {
GST_WARNING ("Change in interlacing ! picture:%d, recorded:%d", GST_WARNING ("Change in interlacing ! picture:%d, recorded:%d",
ffmpegdec->picture->interlaced_frame, ffmpegdec->picture->interlaced_frame,
GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->output_state->info)); GST_VIDEO_INFO_IS_INTERLACED (&ffmpegdec->input_state->info));
if (ffmpegdec->picture->interlaced_frame) if (ffmpegdec->picture->interlaced_frame)
GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->output_state->info) = GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->input_state->info) =
GST_VIDEO_INTERLACE_MODE_INTERLEAVED; GST_VIDEO_INTERLACE_MODE_INTERLEAVED;
else else
GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->output_state->info) = GST_VIDEO_INFO_INTERLACE_MODE (&ffmpegdec->input_state->info) =
GST_VIDEO_INTERLACE_MODE_PROGRESSIVE; GST_VIDEO_INTERLACE_MODE_PROGRESSIVE;
gst_ffmpegviddec_negotiate (ffmpegdec, TRUE); gst_ffmpegviddec_negotiate (ffmpegdec, TRUE);
} }