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

mpeg2dec: fix cropping

Browse source 
fix cropping in mpeg2dec
This commit is contained in:
Wim Taymans 2012-04-02 15:21:36 +02:00
parent f503ef97f7
commit ec170a27eb
2 changed files with 112 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

205
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -42,6 +42,7 @@ typedef gint mpeg2_state_t;
#define STATE_BUFFER 0 #define STATE_BUFFER 0
#endif #endif
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE);
GST_DEBUG_CATEGORY_STATIC (mpeg2dec_debug); GST_DEBUG_CATEGORY_STATIC (mpeg2dec_debug);
#define GST_CAT_DEFAULT (mpeg2dec_debug) #define GST_CAT_DEFAULT (mpeg2dec_debug)
@ -104,9 +105,8 @@ static const GstFormat *gst_mpeg2dec_get_formats (GstPad * pad);
static const GstEventMask *gst_mpeg2dec_get_event_masks (GstPad * pad); static const GstEventMask *gst_mpeg2dec_get_event_masks (GstPad * pad);
#endif #endif
#if 0 static gboolean gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstBuffer ** buf,
static gboolean gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstBuffer ** buf); GstVideoFrame * frame);
#endif
/*static guint gst_mpeg2dec_signals[LAST_SIGNAL] = { 0 };*/ /*static guint gst_mpeg2dec_signals[LAST_SIGNAL] = { 0 };*/
@ -227,104 +227,94 @@ gst_mpeg2dec_qos_reset (GstMpeg2dec * mpeg2dec)
GST_OBJECT_UNLOCK (mpeg2dec); GST_OBJECT_UNLOCK (mpeg2dec);
} }
#if 0
static GstFlowReturn static GstFlowReturn
gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstBuffer ** buf) gst_mpeg2dec_crop_buffer (GstMpeg2dec * dec, GstBuffer ** buf,
GstVideoFrame * frame)
{ {
GstFlowReturn flow_ret; GstFlowReturn ret;
GstBuffer *inbuf = *buf;
GstBuffer *outbuf; GstBuffer *outbuf;
guint outsize, c; GstVideoFrame outframe;
guint i, n_planes;
outsize = gst_video_format_get_size (dec->format, dec->width, dec->height); ret = gst_buffer_pool_acquire_buffer (dec->pool, &outbuf, NULL);
if (G_UNLIKELY (ret != GST_FLOW_OK))
return ret;;
GST_LOG_OBJECT (dec, "Copying input buffer %ux%u (%u) to output buffer " GST_CAT_LOG_OBJECT (GST_CAT_PERFORMANCE, dec,
"%ux%u (%u)", dec->decoded_width, dec->decoded_height, "cropping input buffer to output buffer");
GST_BUFFER_SIZE (inbuf), dec->width, dec->height, outsize);
flow_ret = gst_pad_alloc_buffer_and_set_caps (dec->srcpad, gst_video_frame_map (&outframe, &dec->cinfo, outbuf, GST_MAP_WRITE);
GST_BUFFER_OFFSET_NONE, outsize, GST_PAD_CAPS (dec->srcpad), &outbuf);
if (G_UNLIKELY (flow_ret != GST_FLOW_OK)) n_planes = GST_VIDEO_FRAME_N_PLANES (&outframe);
return flow_ret;
for (c = 0; c < 3; c++) { for (i = 0; i < n_planes; i++) {
const guint8 *src; guint w, h, j;
guint8 *dest; guint8 *sp, *dp;
guint stride_in, stride_out; gint ss, ds;
guint c_height, c_width, line;
src = sp = GST_VIDEO_FRAME_PLANE_DATA (frame, i);
GST_BUFFER_DATA (inbuf) + dp = GST_VIDEO_FRAME_PLANE_DATA (&outframe, i);
gst_video_format_get_component_offset (dec->format, c,
dec->decoded_width, dec->decoded_height);
dest =
GST_BUFFER_DATA (outbuf) +
gst_video_format_get_component_offset (dec->format, c, dec->width,
dec->height);
stride_out = gst_video_format_get_row_stride (dec->format, c, dec->width);
stride_in =
gst_video_format_get_row_stride (dec->format, c, dec->decoded_width);
c_height =
gst_video_format_get_component_height (dec->format, c, dec->height);
c_width = gst_video_format_get_component_width (dec->format, c, dec->width);
GST_DEBUG ("stride_in:%d _out:%d c_width:%d c_height:%d", ss = GST_VIDEO_FRAME_PLANE_STRIDE (frame, i);
stride_in, stride_out, c_width, c_height); ds = GST_VIDEO_FRAME_PLANE_STRIDE (&outframe, i);
if (stride_in == stride_out && stride_in == c_width) { w = MIN (ABS (ss), ABS (ds));
/* FAST PATH */ h = GST_VIDEO_FRAME_COMP_HEIGHT (&outframe, i);
memcpy (dest, src, c_height * stride_out);
dest += stride_out * c_height; GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy plane %u, w:%u h:%u ", i, w, h);
src += stride_out * c_height;
} else { for (j = 0; j < h; j++) {
for (line = 0; line < c_height; line++) { memcpy (dp, sp, w);
memcpy (dest, src, c_width); dp += ds;
dest += stride_out; sp += ss;
src += stride_in;
}
} }
} }
gst_video_frame_unmap (&outframe);
gst_buffer_copy_metadata (outbuf, inbuf, gst_buffer_copy_into (outbuf, *buf,
GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS); GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_FLAGS, 0, -1);
gst_buffer_unref (*buf); gst_buffer_unref (*buf);
*buf = outbuf; *buf = outbuf;
return GST_FLOW_OK; return GST_FLOW_OK;
} }
#endif
static GstFlowReturn static GstFlowReturn
gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps, gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps,
GstVideoInfo * info) GstVideoInfo * vinfo, GstVideoInfo * cinfo)
{ {
GstQuery *query; GstQuery *query;
GstBufferPool *pool; GstBufferPool *pool;
guint size, min, max; guint size, min, max;
GstStructure *config; GstStructure *config;
GstCaps *pcaps;
/* find a pool for the negotiated caps now */ /* find a pool for the negotiated caps now */
query = gst_query_new_allocation (caps, TRUE); query = gst_query_new_allocation (caps, TRUE);
if (!gst_pad_peer_query (dec->srcpad, query)) { if (gst_pad_peer_query (dec->srcpad, query)) {
/* check if downstream supports cropping */
dec->has_cropping =
gst_query_has_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE);
} else {
/* use the query default then */ /* use the query default then */
GST_DEBUG_OBJECT (dec, "didn't get downstream ALLOCATION hints"); GST_DEBUG_OBJECT (dec, "didn't get downstream ALLOCATION hints");
dec->has_cropping = FALSE;
} }
if (gst_query_get_n_allocation_pools (query) > 0) { if (gst_query_get_n_allocation_pools (query) > 0) {
/* we got configuration from our peer, parse them */ /* we got configuration from our peer, parse them */
gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max);
size = MAX (size, info->size);
} else { } else {
pool = NULL; pool = NULL;
size = info->size; size = 0;
min = max = 0; min = max = 0;
} }
GST_DEBUG_OBJECT (dec, GST_DEBUG_OBJECT (dec,
"size:%d, min:%d, max:%d,pool:%p", size, min, max, pool); "size:%d, min:%d, max:%d,pool:%p", size, min, max, pool);
GST_DEBUG_OBJECT (dec, "downstream cropping %d", dec->has_cropping);
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 */
@ -337,8 +327,20 @@ gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps,
} }
dec->pool = pool; dec->pool = pool;
if (dec->need_cropping && dec->has_cropping) {
/* we can crop, configure the pool with buffers of caps and size of the
* decoded picture size and then crop them with metadata */
pcaps = gst_video_info_to_caps (vinfo);
size = MAX (size, GST_VIDEO_INFO_SIZE (vinfo));
} else {
/* no cropping, use cropped videoinfo */
pcaps = gst_caps_ref (caps);
size = MAX (size, GST_VIDEO_INFO_SIZE (cinfo));
}
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, pcaps, size, min, max);
gst_caps_unref (pcaps);
if (gst_query_has_allocation_meta (query, GST_VIDEO_META_API_TYPE)) { if (gst_query_has_allocation_meta (query, GST_VIDEO_META_API_TYPE)) {
/* just set the option, if the pool can support it we will transparently use /* just set the option, if the pool can support it we will transparently use
@ -348,13 +350,6 @@ gst_mpeg2dec_negotiate_pool (GstMpeg2dec * dec, GstCaps * caps,
GST_BUFFER_POOL_OPTION_VIDEO_META); GST_BUFFER_POOL_OPTION_VIDEO_META);
} }
/* check if downstream supports cropping */
dec->use_cropping =
gst_query_has_allocation_meta (query, GST_VIDEO_CROP_META_API_TYPE);
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);
@ -382,8 +377,7 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;
const mpeg2_sequence_t *sequence; const mpeg2_sequence_t *sequence;
gint par_n, par_d; gint par_n, par_d;
gint width, height; GstVideoInfo vinfo, cinfo;
GstVideoInfo vinfo;
GstVideoFormat format; GstVideoFormat format;
GstCaps *caps; GstCaps *caps;
gint y_size, uv_size; gint y_size, uv_size;
@ -393,14 +387,26 @@ 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;
mpeg2dec->width = width = sequence->picture_width;
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 */
if (width > 4096 || width < 16 || height > 4096 || height < 16) if (sequence->width > 4096 || sequence->width < 16 ||
sequence->height > 4096 || sequence->height < 16)
goto invalid_size; goto invalid_size;
GST_DEBUG_OBJECT (mpeg2dec,
"widthxheight: %dx%d , decoded_widthxheight: %dx%d",
sequence->picture_width, sequence->picture_height, sequence->width,
sequence->height);
if (sequence->picture_width != sequence->width ||
sequence->picture_height != sequence->height) {
GST_DEBUG_OBJECT (mpeg2dec, "we need to crop");
mpeg2dec->need_cropping = TRUE;
} else {
GST_DEBUG_OBJECT (mpeg2dec, "no cropping needed");
mpeg2dec->need_cropping = FALSE;
}
y_size = sequence->width * sequence->height; y_size = sequence->width * sequence->height;
/* get subsampling */ /* get subsampling */
if (sequence->chroma_width < sequence->width) { if (sequence->chroma_width < sequence->width) {
@ -424,17 +430,10 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
mpeg2dec->u_offs = y_size; mpeg2dec->u_offs = y_size;
mpeg2dec->v_offs = y_size + uv_size; mpeg2dec->v_offs = y_size + uv_size;
/* we store the codec size before cropping */
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
gst_video_info_set_format (&vinfo, format, sequence->width, sequence->height); gst_video_info_set_format (&vinfo, format, sequence->width, sequence->height);
/* size of the decoded frame */
mpeg2dec->decoded_width = sequence->width;
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;
@ -447,7 +446,8 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
} }
if (par_n == 0 || par_d == 0) { if (par_n == 0 || par_d == 0) {
if (!gst_util_fraction_multiply (4, 3, height, width, &par_n, &par_d)) if (!gst_util_fraction_multiply (4, 3, sequence->picture_height,
sequence->picture_width, &par_n, &par_d))
par_n = par_d = 1; par_n = par_d = 1;
GST_WARNING_OBJECT (mpeg2dec, "Unknown par, assuming %d:%d", par_n, par_d); GST_WARNING_OBJECT (mpeg2dec, "Unknown par, assuming %d:%d", par_n, par_d);
@ -563,15 +563,19 @@ handle_sequence (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
sequence->flags & SEQ_FLAG_LOW_DELAY, sequence->flags & SEQ_FLAG_LOW_DELAY,
sequence->flags & SEQ_FLAG_COLOUR_DESCRIPTION); sequence->flags & SEQ_FLAG_COLOUR_DESCRIPTION);
caps = gst_video_info_to_caps (&vinfo); /* for the output caps we always take the cropped dimensions */
cinfo = vinfo;
gst_video_info_set_format (&cinfo, GST_VIDEO_INFO_FORMAT (&vinfo),
sequence->picture_width, sequence->picture_height);
caps = gst_video_info_to_caps (&cinfo);
gst_pad_set_caps (mpeg2dec->srcpad, caps); gst_pad_set_caps (mpeg2dec->srcpad, caps);
mpeg2dec->vinfo = vinfo; gst_mpeg2dec_negotiate_pool (mpeg2dec, caps, &vinfo, &cinfo);
gst_mpeg2dec_negotiate_pool (mpeg2dec, caps, &vinfo);
gst_caps_unref (caps); gst_caps_unref (caps);
mpeg2dec->vinfo = vinfo;
mpeg2dec->cinfo = cinfo;
mpeg2_custom_fbuf (mpeg2dec->decoder, 1); mpeg2_custom_fbuf (mpeg2dec->decoder, 1);
init_dummybuf (mpeg2dec); init_dummybuf (mpeg2dec);
@ -595,7 +599,7 @@ invalid_frame_period:
invalid_size: invalid_size:
{ {
GST_ERROR_OBJECT (mpeg2dec, "Invalid frame dimensions: %d x %d", GST_ERROR_OBJECT (mpeg2dec, "Invalid frame dimensions: %d x %d",
width, height); sequence->width, sequence->height);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
} }
@ -661,9 +665,20 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
gint type; gint type;
guint8 *buf[3]; guint8 *buf[3];
ret = gst_buffer_pool_acquire_buffer (mpeg2dec->pool, &outbuf, NULL); if (mpeg2dec->need_cropping && !mpeg2dec->has_cropping) {
if (G_UNLIKELY (ret != GST_FLOW_OK)) GstAllocationParams params = { 0, };
goto no_buffer;
/* we need to crop manually */
params.align = 15;
outbuf =
gst_buffer_new_allocate (NULL, GST_VIDEO_INFO_SIZE (&mpeg2dec->vinfo),
&params);
ret = GST_FLOW_OK;
} else {
ret = gst_buffer_pool_acquire_buffer (mpeg2dec->pool, &outbuf, NULL);
if (G_UNLIKELY (ret != GST_FLOW_OK))
goto no_buffer;
}
/* we store the original byteoffset of this picture in the stream here /* we store the original byteoffset of this picture in the stream here
* because we need it for indexing */ * because we need it for indexing */
@ -704,9 +719,10 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
if (frame->buffer) { if (frame->buffer) {
gst_video_frame_unmap (frame); gst_video_frame_unmap (frame);
gst_buffer_unref (frame->buffer); gst_buffer_unref (frame->buffer);
frame->buffer = NULL;
} }
if (mpeg2dec->use_cropping) { if (mpeg2dec->need_cropping && mpeg2dec->has_cropping) {
GstVideoCropMeta *crop; GstVideoCropMeta *crop;
crop = gst_buffer_add_video_crop_meta (outbuf); crop = gst_buffer_add_video_crop_meta (outbuf);
@ -714,8 +730,8 @@ handle_picture (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
* downstream understands clipping */ * downstream understands clipping */
crop->x = 0; crop->x = 0;
crop->y = 0; crop->y = 0;
crop->width = mpeg2dec->width; crop->width = info->sequence->picture_width;
crop->height = mpeg2dec->height; crop->height = info->sequence->picture_height;
} }
gst_video_frame_map (frame, &mpeg2dec->vinfo, outbuf, GST_MAP_WRITE); gst_video_frame_map (frame, &mpeg2dec->vinfo, outbuf, GST_MAP_WRITE);
@ -955,16 +971,13 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
* array of buffers */ * array of buffers */
gst_buffer_ref (outbuf); gst_buffer_ref (outbuf);
#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->need_cropping && !mpeg2dec->has_cropping) {
mpeg2dec->decoded_height != mpeg2dec->height) {
GST_DEBUG_OBJECT (mpeg2dec, "cropping buffer"); GST_DEBUG_OBJECT (mpeg2dec, "cropping buffer");
ret = gst_mpeg2dec_crop_buffer (mpeg2dec, &outbuf); ret = gst_mpeg2dec_crop_buffer (mpeg2dec, &outbuf, frame);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto done; goto done;
} }
#endif
if (mpeg2dec->segment.rate >= 0.0) { if (mpeg2dec->segment.rate >= 0.0) {
/* forward: push right away */ /* forward: push right away */
@ -985,7 +998,7 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
mpeg2dec->queued = g_list_prepend (mpeg2dec->queued, outbuf); mpeg2dec->queued = g_list_prepend (mpeg2dec->queued, outbuf);
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
} }
done:
return ret; return ret;
/* special cases */ /* special cases */

8
ext/mpeg2dec/gstmpeg2dec.h
View file

@ -86,14 +86,12 @@ struct _GstMpeg2dec {
/* video state */ /* video state */
GstVideoInfo vinfo; GstVideoInfo vinfo;
gint decoded_width; GstVideoInfo cinfo;
gint decoded_height; gboolean need_cropping;
gint width; gboolean has_cropping;
gint height;
gint64 frame_period; gint64 frame_period;
gboolean interlaced; gboolean interlaced;
GstBufferPool *pool; GstBufferPool *pool;
gboolean use_cropping;
gint size; gint size;
gint u_offs; gint u_offs;