diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-14 19:52:31 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-14 19:56:59 +0100 |
| commit | 9f700cc3c4c9b4cc67ea0b44214e22d34cc0dcbb (patch) | |
| tree | 66c34d2407f0178465c277547af8424f5a28adcc /gst-libs | |
| parent | 0a8a8aac5204985f78693b84587f7cc44b82ee91 (diff) | |
take padding into account
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstbasevideodecoder.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gst-libs/gst/video/gstbasevideodecoder.c b/gst-libs/gst/video/gstbasevideodecoder.c index cf90c3cbf..2cc015543 100644 --- a/gst-libs/gst/video/gstbasevideodecoder.c +++ b/gst-libs/gst/video/gstbasevideodecoder.c @@ -313,8 +313,8 @@ gst_base_video_decoder_setcaps (GstBaseVideoDecoder * base_video_decoder, } if (ret) { - gst_buffer_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state. - codec_data, NULL); + gst_buffer_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)-> + state.codec_data, NULL); gst_caps_replace (&GST_BASE_VIDEO_CODEC (base_video_decoder)->state.caps, NULL); GST_BASE_VIDEO_CODEC (base_video_decoder)->state = state; @@ -1992,7 +1992,7 @@ gst_base_video_decoder_set_src_caps (GstBaseVideoDecoder * base_video_decoder) GstQuery *query; GstBufferPool *pool = NULL; GstStructure *config; - guint size, min, max, prefix, alignment; + guint size, min, max, prefix, padding, alignment; gboolean ret; /* minimum sense */ @@ -2045,13 +2045,14 @@ gst_base_video_decoder_set_src_caps (GstBaseVideoDecoder * base_video_decoder) GST_DEBUG_OBJECT (codec, "got downstream ALLOCATION hints"); /* we got configuration from our peer, parse them */ gst_query_parse_allocation_params (query, &size, &min, &max, &prefix, - &alignment, &pool); + &padding, &alignment, &pool); size = MAX (size, info->size); } else { GST_DEBUG_OBJECT (codec, "didn't get downstream ALLOCATION hints"); size = info->size; min = max = 0; prefix = 0; + padding = 0; alignment = 0; } @@ -2065,7 +2066,8 @@ gst_base_video_decoder_set_src_caps (GstBaseVideoDecoder * base_video_decoder) base_video_decoder->pool = pool; config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_set (config, caps, size, min, max, prefix, alignment); + gst_buffer_pool_config_set (config, caps, size, min, max, prefix, padding, + alignment); state->bytes_per_picture = size; /* just set the option, if the pool can support it we will transparently use |