mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 14:08:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

msdk: remove libva check before 1.12

Browse source 
Since gstmsdk depends on gstva library it also bumps the required version.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4781>
This commit is contained in:
Víctor Manuel Jáquez Leal 2023-06-06 13:27:39 +02:00 committed by GStreamer Marge Bot
parent 53860147c6
commit 94250e8c31
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/sys/msdk/gstmsdkallocator_libva.c
View file

@ -331,7 +331,6 @@ gst_msdk_frame_lock (mfxHDL pthis, mfxMemId mid, mfxFrameData * data)
data->Y = data->V + 2; data->Y = data->V + 2;
data->A = data->V + 3; data->A = data->V + 3;
break; break;
#if VA_CHECK_VERSION(1, 4, 1)
case VA_FOURCC_A2R10G10B10: case VA_FOURCC_A2R10G10B10:
data->Pitch = mem_id->image.pitches[0]; data->Pitch = mem_id->image.pitches[0];
data->R = buf + mem_id->image.offsets[0]; data->R = buf + mem_id->image.offsets[0];
@ -339,8 +338,6 @@ gst_msdk_frame_lock (mfxHDL pthis, mfxMemId mid, mfxFrameData * data)
data->B = data->R; data->B = data->R;
data->A = data->R; data->A = data->R;
break; break;
#endif
#if VA_CHECK_VERSION(1, 2, 0)
case VA_FOURCC_Y210: case VA_FOURCC_Y210:
case VA_FOURCC_Y216: case VA_FOURCC_Y216:
data->Pitch = mem_id->image.pitches[0]; data->Pitch = mem_id->image.pitches[0];
@ -359,7 +356,6 @@ gst_msdk_frame_lock (mfxHDL pthis, mfxMemId mid, mfxFrameData * data)
data->V = data->U + 4; data->V = data->U + 4;
data->A = data->U + 6; data->A = data->U + 6;
break; break;
#endif
case VA_FOURCC_ABGR: case VA_FOURCC_ABGR:
data->Pitch = mem_id->image.pitches[0]; data->Pitch = mem_id->image.pitches[0];
data->R = buf + mem_id->image.offsets[0]; data->R = buf + mem_id->image.offsets[0];
@ -517,11 +513,7 @@ gst_msdk_export_dmabuf_to_vasurface (GstMsdkContext * context,
va_fourcc = VA_FOURCC_YUY2; va_fourcc = VA_FOURCC_YUY2;
break; break;
case GST_VIDEO_FORMAT_P010_10LE: case GST_VIDEO_FORMAT_P010_10LE:
#if VA_CHECK_VERSION(1, 2, 0)
va_chroma = VA_RT_FORMAT_YUV420_10; va_chroma = VA_RT_FORMAT_YUV420_10;
#else
va_chroma = VA_RT_FORMAT_YUV420_10BPP;
#endif
va_fourcc = VA_FOURCC_P010; va_fourcc = VA_FOURCC_P010;
break; break;
case GST_VIDEO_FORMAT_UYVY: case GST_VIDEO_FORMAT_UYVY:
@ -538,13 +530,10 @@ gst_msdk_export_dmabuf_to_vasurface (GstMsdkContext * context,
va_chroma = VA_RT_FORMAT_YUV444; va_chroma = VA_RT_FORMAT_YUV444;
va_fourcc = VA_FOURCC_AYUV; va_fourcc = VA_FOURCC_AYUV;
break; break;
#if VA_CHECK_VERSION(1, 4, 1)
case GST_VIDEO_FORMAT_BGR10A2_LE: case GST_VIDEO_FORMAT_BGR10A2_LE:
va_chroma = VA_RT_FORMAT_RGB32_10; va_chroma = VA_RT_FORMAT_RGB32_10;
va_fourcc = VA_FOURCC_A2R10G10B10; va_fourcc = VA_FOURCC_A2R10G10B10;
break; break;
#endif
#if VA_CHECK_VERSION(1, 2, 0)
case GST_VIDEO_FORMAT_Y210: case GST_VIDEO_FORMAT_Y210:
va_chroma = VA_RT_FORMAT_YUV422_10; va_chroma = VA_RT_FORMAT_YUV422_10;
va_fourcc = VA_FOURCC_Y210; va_fourcc = VA_FOURCC_Y210;
@ -565,7 +554,6 @@ gst_msdk_export_dmabuf_to_vasurface (GstMsdkContext * context,
va_chroma = VA_RT_FORMAT_YUV444_12; va_chroma = VA_RT_FORMAT_YUV444_12;
va_fourcc = VA_FOURCC_Y416; va_fourcc = VA_FOURCC_Y416;
break; break;
#endif
#if (MFX_VERSION >= 2004) #if (MFX_VERSION >= 2004)
case GST_VIDEO_FORMAT_RGBP: case GST_VIDEO_FORMAT_RGBP:
va_chroma = VA_RT_FORMAT_RGBP; va_chroma = VA_RT_FORMAT_RGBP;

6
subprojects/gst-plugins-bad/sys/msdk/gstmsdkvpp.c
View file

@ -59,15 +59,9 @@
#include "gstmsdkvpputil.h" #include "gstmsdkvpputil.h"
#include "gstmsdkallocator.h" #include "gstmsdkallocator.h"
#define EXT_FORMATS ""
#ifndef _WIN32 #ifndef _WIN32
#include "gstmsdkallocator_libva.h" #include "gstmsdkallocator_libva.h"
#include <gst/va/gstvaallocator.h> #include <gst/va/gstvaallocator.h>
#if VA_CHECK_VERSION(1, 4, 1)
#undef EXT_FORMATS
#define EXT_FORMATS ", BGR10A2_LE"
#endif
#else #else
#include <gst/d3d11/gstd3d11.h> #include <gst/d3d11/gstd3d11.h>
#endif #endif

4
subprojects/gst-plugins-bad/sys/msdk/msdk_libva.c
View file

@ -71,10 +71,8 @@ static const struct fourcc_map gst_msdk_fourcc_mfx_to_va[] = {
FOURCC_MFX_TO_VA (RGB565, RGB565), FOURCC_MFX_TO_VA (RGB565, RGB565),
#endif #endif
FOURCC_MFX_TO_VA (AYUV, AYUV), FOURCC_MFX_TO_VA (AYUV, AYUV),
#if VA_CHECK_VERSION(1, 4, 1)
FOURCC_MFX_TO_VA (A2RGB10, A2R10G10B10), FOURCC_MFX_TO_VA (A2RGB10, A2R10G10B10),
#endif #if (MFX_VERSION >= 1027)
#if ((MFX_VERSION >= 1027) && VA_CHECK_VERSION(1, 2, 0))
FOURCC_MFX_TO_VA (Y210, Y210), FOURCC_MFX_TO_VA (Y210, Y210),
FOURCC_MFX_TO_VA (Y410, Y410), FOURCC_MFX_TO_VA (Y410, Y410),
#endif #endif