diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-06-23 17:33:03 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-06-23 17:51:04 +0200 |
| commit | 7d7f722a18912e7e8fc8a15be1f49b41ccc73669 (patch) | |
| tree | dfc5e24c013c7468df2ad6a2fadbcd6255151de1 /gst | |
| parent | 05a41009f21678eb4c416fa450668bd50894df02 (diff) | |
vaapivideobufferpool: fix regression with video metas
There is another regression with 7a206923 when setting the video
info for the video meta, it should be the one from the image's
allocator rather from the allocation caps.
Test pipeline:
gst-launch-1.0 filesrc location=bug766184.flv ! decodebin \
! tee ! videoconvert ! videoscale \
! video/x-raw, width=1920, height=1080 ! xvimagesink
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/vaapi/gstvaapivideobufferpool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/vaapi/gstvaapivideobufferpool.c b/gst/vaapi/gstvaapivideobufferpool.c index b14bd681..dcdc29e9 100644 --- a/gst/vaapi/gstvaapivideobufferpool.c +++ b/gst/vaapi/gstvaapivideobufferpool.c @@ -228,11 +228,11 @@ gst_vaapi_video_buffer_pool_set_config (GstBufferPool * pool, negotiated_vinfo = gst_allocator_get_vaapi_negotiated_video_info (priv->allocator); + allocator_vinfo = gst_allocator_get_vaapi_video_info (allocator, NULL); priv->vmeta_vinfo = (negotiated_vinfo) ? - *negotiated_vinfo : new_allocation_vinfo; + *negotiated_vinfo : *allocator_vinfo; /* last resource to set the correct buffer size */ - allocator_vinfo = gst_allocator_get_vaapi_video_info (allocator, NULL); if (GST_VIDEO_INFO_SIZE (allocator_vinfo) != size) { gst_buffer_pool_config_set_params (config, caps, GST_VIDEO_INFO_SIZE (allocator_vinfo), min_buffers, max_buffers); |