From a1584b6f99caaf61812ac6a9654ec0e6da8240da Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Tue, 17 Dec 2019 16:10:53 -0800 Subject: [PATCH] msdkdec: make sure to use video memory on Linux The block that sets use_video_memory flag is after the the condition `if gst_msdk_context_prepare` but it always returns false when there is no other msdk elements. So the decoder ends up with use_video_memory as FALSE. Note that msdkvpp always set use_video_memory as TRUE. When use_video_memory is FALSE then the msdkdec allocates the output frames with posix_memalign (see gstmsdksystemmemory.c). The result is then copied back to the GstVideoPool's buffers (or to the downstream pool's buffers if any). When use_video_memory is TRUE then the msdkdec uses vaCreateSurfaces to create vaapi surfaces for the hw decoder to decode into (see gstmsdkvideomemory.c). The result is then copied to either the internal GstVideoPool and to the downstream pool if any. (vaDeriveImage/vaMapBuffer is used in order to read the surfaces) --- sys/msdk/gstmsdkdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/msdk/gstmsdkdec.c b/sys/msdk/gstmsdkdec.c index 7e456a4923..cb4e15ea0f 100644 --- a/sys/msdk/gstmsdkdec.c +++ b/sys/msdk/gstmsdkdec.c @@ -681,19 +681,19 @@ gst_msdkdec_start (GstVideoDecoder * decoder) { GstMsdkDec *thiz = GST_MSDKDEC (decoder); + /* TODO: Currently d3d allocator is not implemented. + * So decoder uses system memory by default on Windows. + */ +#ifndef _WIN32 + thiz->use_video_memory = TRUE; +#else + thiz->use_video_memory = FALSE; +#endif + if (gst_msdk_context_prepare (GST_ELEMENT_CAST (thiz), &thiz->context)) { GST_INFO_OBJECT (thiz, "Found context %" GST_PTR_FORMAT " from neighbour", thiz->context); - /* TODO: Currently d3d allocator is not implemented. - * So decoder uses system memory by default on Windows. - */ -#ifndef _WIN32 - thiz->use_video_memory = TRUE; -#else - thiz->use_video_memory = FALSE; -#endif - if (gst_msdk_context_get_job_type (thiz->context) & GST_MSDK_JOB_DECODER) { GstMsdkContext *parent_context, *msdk_context;