From 2ee518a988018284099c17ef85554a012e46e182 Mon Sep 17 00:00:00 2001 From: Wangfei Date: Fri, 15 Mar 2019 14:29:41 +0800 Subject: [PATCH] vaapiencode: handle DMABuf caps feature in sink pad Add DMABuff caps features in all encoders' sink pad. --- gst/vaapi/gstvaapiencode.c | 3 ++- gst/vaapi/gstvaapiencode_h264.c | 2 ++ gst/vaapi/gstvaapiencode_h264_fei.c | 2 ++ gst/vaapi/gstvaapiencode_h265.c | 2 ++ gst/vaapi/gstvaapiencode_jpeg.c | 2 ++ gst/vaapi/gstvaapiencode_mpeg2.c | 2 ++ gst/vaapi/gstvaapiencode_vp8.c | 2 ++ gst/vaapi/gstvaapiencode_vp9.c | 2 ++ 8 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gst/vaapi/gstvaapiencode.c b/gst/vaapi/gstvaapiencode.c index b64233f..af8c77a 100644 --- a/gst/vaapi/gstvaapiencode.c +++ b/gst/vaapi/gstvaapiencode.c @@ -379,7 +379,8 @@ ensure_allowed_sinkpad_caps (GstVaapiEncode * encode) if (!encode->encoder) return TRUE; - out_caps = gst_caps_from_string (GST_VAAPI_MAKE_SURFACE_CAPS); + out_caps = gst_caps_from_string (GST_VAAPI_MAKE_SURFACE_CAPS ";" + GST_VAAPI_MAKE_DMABUF_CAPS); if (!out_caps) goto failed_create_va_caps; diff --git a/gst/vaapi/gstvaapiencode_h264.c b/gst/vaapi/gstvaapiencode_h264.c index 856afd6..ed19c40 100644 --- a/gst/vaapi/gstvaapiencode_h264.c +++ b/gst/vaapi/gstvaapiencode_h264.c @@ -84,6 +84,8 @@ static const char gst_vaapiencode_h264_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_h264_fei.c b/gst/vaapi/gstvaapiencode_h264_fei.c index 5aa4483..caf68b3 100644 --- a/gst/vaapi/gstvaapiencode_h264_fei.c +++ b/gst/vaapi/gstvaapiencode_h264_fei.c @@ -64,6 +64,8 @@ static const char gst_vaapiencode_h264_fei_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_h265.c b/gst/vaapi/gstvaapiencode_h265.c index 6a9b796..268f404 100644 --- a/gst/vaapi/gstvaapiencode_h265.c +++ b/gst/vaapi/gstvaapiencode_h265.c @@ -58,6 +58,8 @@ static const char gst_vaapiencode_h265_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_jpeg.c b/gst/vaapi/gstvaapiencode_jpeg.c index cf1ea6b..81da4c7 100644 --- a/gst/vaapi/gstvaapiencode_jpeg.c +++ b/gst/vaapi/gstvaapiencode_jpeg.c @@ -55,6 +55,8 @@ static const char gst_vaapiencode_jpeg_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_mpeg2.c b/gst/vaapi/gstvaapiencode_mpeg2.c index 32bc346..3622bbe 100644 --- a/gst/vaapi/gstvaapiencode_mpeg2.c +++ b/gst/vaapi/gstvaapiencode_mpeg2.c @@ -57,6 +57,8 @@ static const char gst_vaapiencode_mpeg2_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_vp8.c b/gst/vaapi/gstvaapiencode_vp8.c index cb040f7..fcaffbb 100644 --- a/gst/vaapi/gstvaapiencode_vp8.c +++ b/gst/vaapi/gstvaapiencode_vp8.c @@ -55,6 +55,8 @@ static const char gst_vaapiencode_vp8_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ diff --git a/gst/vaapi/gstvaapiencode_vp9.c b/gst/vaapi/gstvaapiencode_vp9.c index 43aff6d..7a69384 100644 --- a/gst/vaapi/gstvaapiencode_vp9.c +++ b/gst/vaapi/gstvaapiencode_vp9.c @@ -55,6 +55,8 @@ static const char gst_vaapiencode_vp9_sink_caps_str[] = GST_VAAPI_MAKE_SURFACE_CAPS ", " GST_CAPS_INTERLACED_FALSE "; " GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ", " + GST_CAPS_INTERLACED_FALSE ";" + GST_VAAPI_MAKE_DMABUF_CAPS "," GST_CAPS_INTERLACED_FALSE; /* *INDENT-ON* */ -- 2.7.4