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

mpeg2dec: Add basic cropping support

Browse source
This commit is contained in:
Edward Hervey 2011-11-04 10:45:47 +01:00
parent e59ba7ca05
commit 444df1a2cc
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -363,6 +363,10 @@ gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps,
alignment = 15; alignment = 15;
} }
GST_DEBUG_OBJECT (dec,
"size:%d, min:%d, max:%d, prefix:%d, alignment:%d, pool:%p", size, min,
max, prefix, alignment, pool);
if (pool == NULL) { if (pool == NULL) {
/* we did not get a pool, make one ourselves then */ /* we did not get a pool, make one ourselves then */
pool = gst_buffer_pool_new (); pool = gst_buffer_pool_new ();
@ -383,6 +387,9 @@ gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps,
dec->use_cropping = dec->use_cropping =
gst_query_has_allocation_meta (query, GST_VIDEO_CROP_META_API); gst_query_has_allocation_meta (query, GST_VIDEO_CROP_META_API);
GST_DEBUG_OBJECT (dec, "downstream supports cropping : %d",
dec->use_cropping);
gst_buffer_pool_set_config (pool, config); gst_buffer_pool_set_config (pool, config);
/* and activate */ /* and activate */
gst_buffer_pool_set_active (pool, TRUE); gst_buffer_pool_set_active (pool, TRUE);
@ -421,8 +428,8 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
if (sequence->frame_period == 0) if (sequence->frame_period == 0)
goto invalid_frame_period; goto invalid_frame_period;
width = sequence->picture_width; mpeg2dec->width = width = sequence->picture_width;
height = sequence->picture_height; mpeg2dec->height = height = sequence->picture_height;
/* mpeg2 video can only be from 16x16 to 4096x4096. Everything /* mpeg2 video can only be from 16x16 to 4096x4096. Everything
* else is a corrupted file */ * else is a corrupted file */
@ -453,12 +460,16 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
mpeg2dec->v_offs = y_size + uv_size; mpeg2dec->v_offs = y_size + uv_size;
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
gst_video_info_set_format (&vinfo, format, width, height); gst_video_info_set_format (&vinfo, format, sequence->width, sequence->height);
/* size of the decoded frame */ /* size of the decoded frame */
mpeg2dec->decoded_width = sequence->width; mpeg2dec->decoded_width = sequence->width;
mpeg2dec->decoded_height = sequence->height; mpeg2dec->decoded_height = sequence->height;
GST_DEBUG_OBJECT (mpeg2dec,
"widthxheight: %dx%d , decoded_widthxheight: %dx%d", width, height,
sequence->width, sequence->height);
/* sink caps par overrides sequence PAR */ /* sink caps par overrides sequence PAR */
if (mpeg2dec->have_par) { if (mpeg2dec->have_par) {
par_n = mpeg2dec->in_par_n; par_n = mpeg2dec->in_par_n;
@ -969,6 +980,17 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
* array of buffers */ * array of buffers */
gst_buffer_ref (outbuf); gst_buffer_ref (outbuf);
if (mpeg2dec->use_cropping) {
GstVideoCropMeta *crop;
crop = gst_buffer_add_video_crop_meta (outbuf);
/* we can do things slightly more efficient when we know that
* downstream understands clipping */
crop->x = 0;
crop->y = 0;
crop->width = mpeg2dec->width;
crop->height = mpeg2dec->height;
}
#if 0 #if 0
/* do cropping if the target region is smaller than the input one */ /* do cropping if the target region is smaller than the input one */
if (mpeg2dec->decoded_width != mpeg2dec->width || if (mpeg2dec->decoded_width != mpeg2dec->width ||

2
ext/mpeg2dec/gstmpeg2dec.h
View file

@ -88,6 +88,8 @@ struct _GstMpeg2dec {
GstVideoInfo vinfo; GstVideoInfo vinfo;
gint decoded_width; gint decoded_width;
gint decoded_height; gint decoded_height;
gint width;
gint height;
gint64 frame_period; gint64 frame_period;
gboolean interlaced; gboolean interlaced;
GstBufferPool *pool; GstBufferPool *pool;