diff options
| author | Sreerenj Balachandran <sreerenj.balachandran@intel.com> | 2015-06-17 14:20:37 +0300 |
|---|---|---|
| committer | Sreerenj Balachandran <sreerenj.balachandran@intel.com> | 2015-06-17 14:20:37 +0300 |
| commit | 28e50ad40788735bcfaa0d5f33abcd942d678b09 (patch) | |
| tree | 23c101be4b9360b5fac1006ba2eca2e1d6f12689 /gst/vaapi/gstvaapisink.c | |
| parent | 64acc74d1795c3f5cadddc550e5d4c77257a878d (diff) | |
| download | gstreamer-vaapi-28e50ad40788735bcfaa0d5f33abcd942d678b09.tar.gz | |
vaapisink: Fix the capsfeature advertisement in padtemplate
This fixes the regression introduced in 64acc74.
If a pad supports multiple set of capsfeatures, it needs to add
multiple equal structures with different feature sets to the caps.
Because caps structures with the same name but with a non-equal
set of caps features are not compatible.
Without this patch, playbin will autoplug xvimagesink instead of vaapisink.
https://bugzilla.gnome.org/show_bug.cgi?id=750095
Diffstat (limited to 'gst/vaapi/gstvaapisink.c')
| -rw-r--r-- | gst/vaapi/gstvaapisink.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c index 26ea5bf4..5c78a0b2 100644 --- a/gst/vaapi/gstvaapisink.c +++ b/gst/vaapi/gstvaapisink.c @@ -58,17 +58,19 @@ GST_DEBUG_CATEGORY_STATIC (gst_debug_vaapisink); /* *INDENT-OFF* */ static const char gst_vaapisink_sink_caps_str[] = GST_VIDEO_CAPS_MAKE_WITH_FEATURES ( - GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE + GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE, + "{ ENCODED, NV12, I420, YV12 }") ";" #if GST_CHECK_VERSION(1,3,1) - "," GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION + GST_VIDEO_CAPS_MAKE_WITH_FEATURES ( + GST_CAPS_FEATURE_MEMORY_VAAPI_SURFACE "," + GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, + "{ ENCODED, NV12, I420, YV12 }") ";" #endif - ,"{ ENCODED, NV12, I420, YV12 }") ";" + GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ";" #if GST_CHECK_VERSION(1,3,1) GST_VIDEO_CAPS_MAKE_WITH_FEATURES ( GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, GST_VIDEO_FORMATS_ALL); -#else - GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL); #endif /* *INDENT-ON* */ |