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

theoradec: Fix decoding in the presence of GstVideoCropMeta

Browse source 
Store the video info of the internal frame decode width/height
separate to the exposed (cropped) frame info, so that it can be
used for mapping the downstream allocated video frame buffer correctly
when using GstVideoCropMeta.

Fixes playback of files with sizes that aren't a multiple of 16-pixels
width or height.

https://bugzilla.gnome.org/show_bug.cgi?id=741030
This commit is contained in:
Jan Schmidt 2015-02-01 03:39:07 +11:00
parent 1942870257
commit 9a541157cf
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/theora/gsttheoradec.c
View file

@ -507,6 +507,8 @@ theora_handle_type_packet (GstTheoraDec * dec)
break; break;
} }
dec->uncropped_info = state->info;
gst_video_decoder_negotiate (GST_VIDEO_DECODER (dec)); gst_video_decoder_negotiate (GST_VIDEO_DECODER (dec));
dec->have_header = TRUE; dec->have_header = TRUE;
@ -694,7 +696,7 @@ theora_handle_image (GstTheoraDec * dec, th_ycbcr_buffer buf,
GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, dec, GST_CAT_TRACE_OBJECT (GST_CAT_PERFORMANCE, dec,
"doing unavoidable video frame copy"); "doing unavoidable video frame copy");
if (G_UNLIKELY (!gst_video_frame_map (&vframe, &dec->output_state->info, if (G_UNLIKELY (!gst_video_frame_map (&vframe, &dec->uncropped_info,
frame->output_buffer, GST_MAP_WRITE))) frame->output_buffer, GST_MAP_WRITE)))
goto invalid_frame; goto invalid_frame;
@ -912,14 +914,18 @@ theora_dec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
} }
if (dec->can_crop) { if (dec->can_crop) {
GstVideoInfo info = state->info; GstVideoInfo *info = &dec->uncropped_info;
GstCaps *caps; GstCaps *caps;
/* Calculate uncropped size */ GST_LOG_OBJECT (decoder, "Using GstVideoCropMeta, uncropped wxh = %dx%d",
gst_video_info_set_format (&info, info.finfo->format, dec->info.frame_width, info->width, info->height);
gst_video_info_set_format (info, info->finfo->format, dec->info.frame_width,
dec->info.frame_height); dec->info.frame_height);
size = MAX (size, info.size);
caps = gst_video_info_to_caps (&info); /* Calculate uncropped size */
size = MAX (size, info->size);
caps = gst_video_info_to_caps (info);
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_caps_unref (caps); gst_caps_unref (caps);
} }

1
ext/theora/gsttheoradec.h
View file

@ -77,6 +77,7 @@ struct _GstTheoraDec
gint telemetry_bits; gint telemetry_bits;
gboolean can_crop; gboolean can_crop;
GstVideoInfo uncropped_info;
}; };
struct _GstTheoraDecClass struct _GstTheoraDecClass