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

ffmpegdec: only clip to a smaller region

Browse source 
When we have an input width/height that should be used for clipping, only
perform the clipping if the rectangle is smaller than the actual picture size.

Fixes #330681
This commit is contained in:
Wim Taymans 2010-02-04 13:26:16 +01:00
parent 8312a8f89d
commit 14e8ce8816
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/ffmpeg/gstffmpegdec.c
View file

@ -823,12 +823,18 @@ gst_ffmpegdec_setcaps (GstPad * pad, GstCaps * caps)
gst_structure_get_int (structure, "height", gst_structure_get_int (structure, "height",
&ffmpegdec->format.video.clip_height); &ffmpegdec->format.video.clip_height);
GST_DEBUG_OBJECT (pad, "clipping to %dx%d",
ffmpegdec->format.video.clip_width, ffmpegdec->format.video.clip_height);
/* take into account the lowres property */ /* take into account the lowres property */
if (ffmpegdec->format.video.clip_width != -1) if (ffmpegdec->format.video.clip_width != -1)
ffmpegdec->format.video.clip_width >>= ffmpegdec->lowres; ffmpegdec->format.video.clip_width >>= ffmpegdec->lowres;
if (ffmpegdec->format.video.clip_height != -1) if (ffmpegdec->format.video.clip_height != -1)
ffmpegdec->format.video.clip_height >>= ffmpegdec->lowres; ffmpegdec->format.video.clip_height >>= ffmpegdec->lowres;
GST_DEBUG_OBJECT (pad, "final clipping to %dx%d",
ffmpegdec->format.video.clip_width, ffmpegdec->format.video.clip_height);
done: done:
GST_OBJECT_UNLOCK (ffmpegdec); GST_OBJECT_UNLOCK (ffmpegdec);
@ -907,7 +913,8 @@ negotiate_failed:
} }
alloc_failed: alloc_failed:
{ {
GST_DEBUG_OBJECT (ffmpegdec, "pad_alloc failed"); GST_DEBUG_OBJECT (ffmpegdec, "pad_alloc failed %d (%s)", ret,
gst_flow_get_name (ret));
return ret; return ret;
} }
} }
@ -1204,9 +1211,11 @@ gst_ffmpegdec_negotiate (GstFFMpegDec * ffmpegdec, gboolean force)
if (width != -1 && height != -1) { if (width != -1 && height != -1) {
/* overwrite the output size with the dimension of the /* overwrite the output size with the dimension of the
* clipping region */ * clipping region but only if they are smaller. */
gst_caps_set_simple (caps, if (width < ffmpegdec->context->width)
"width", G_TYPE_INT, width, "height", G_TYPE_INT, height, NULL); gst_caps_set_simple (caps, "width", G_TYPE_INT, width, NULL);
if (height < ffmpegdec->context->height)
gst_caps_set_simple (caps, "height", G_TYPE_INT, height, NULL);
} }
gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN, interlaced, gst_caps_set_simple (caps, "interlaced", G_TYPE_BOOLEAN, interlaced,
NULL); NULL);
@ -1479,11 +1488,17 @@ get_output_buffer (GstFFMpegDec * ffmpegdec, GstBuffer ** outbuf)
GST_LOG_OBJECT (ffmpegdec, "get output buffer"); GST_LOG_OBJECT (ffmpegdec, "get output buffer");
/* figure out size of output buffer, this is the clipped output size because /* figure out size of output buffer, this is the clipped output size because
* we will copy the picture into it. */ * we will copy the picture into it but only when the clipping region is
* smaller than the actual picture size. */
if ((width = ffmpegdec->format.video.clip_width) == -1) if ((width = ffmpegdec->format.video.clip_width) == -1)
width = ffmpegdec->context->width; width = ffmpegdec->context->width;
else if (width > ffmpegdec->context->width)
width = ffmpegdec->context->width;
if ((height = ffmpegdec->format.video.clip_height) == -1) if ((height = ffmpegdec->format.video.clip_height) == -1)
height = ffmpegdec->context->height; height = ffmpegdec->context->height;
else if (height > ffmpegdec->context->height)
height = ffmpegdec->context->height;
GST_LOG_OBJECT (ffmpegdec, "clip width %d/height %d", width, height); GST_LOG_OBJECT (ffmpegdec, "clip width %d/height %d", width, height);
@ -1724,6 +1739,8 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
ffmpegdec->picture->opaque); ffmpegdec->picture->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",
ffmpegdec->picture->interlaced_frame);
if (G_UNLIKELY (ffmpegdec->picture->interlaced_frame != if (G_UNLIKELY (ffmpegdec->picture->interlaced_frame !=
ffmpegdec->format.video.interlaced)) { ffmpegdec->format.video.interlaced)) {