diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2023-11-24 09:23:01 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2023-11-24 11:56:03 +0800 |
commit | 587dce125d25031b00b2bd3cb67f8ee227bf0977 (patch) | |
tree | 72c139366915d23268497d0aad2a5cee4e58e040 /recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch | |
parent | 2ab87a299a0c544806f6bcbd751eaacac649c144 (diff) | |
download | meta-intel-587dce125d25031b00b2bd3cb67f8ee227bf0977.tar.gz |
intel-media-driver: upgrade 23.2.4 -> 23.3.5
Removed patches already merged:
- 0001-ARGB-force-to-tile4.patch
- 0001-Fix-FC-Corruption-When-Blending-without-Colorfill-in.patch
- 0001-Fix-FC-Corruption-When-Blending-without-Colorfill.patch
- 0001-Force-to-render-path-according-to-app-setting.patch
- 0002-Add-DRM-format-mappings-for-JPEG-decoder-output.patch
Rebased patches:
- 0001-Disable-VP9-padding-on-MTL.patch
- 0004-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch
Added code fixed and new DG2 device id support:
- 0002-Add-VASurfaceAttribMemoryType-for-ACM.patch
- 0003-Force-ARGB-surface-to-tile4-for-ACM.patch
- 0005-XRGB-force-to-do-swizzle-for-AVC-HEVC.patch
- 0006-Add-DG2-DIDs.patch
Release notes:
https://github.com/intel/media-driver/releases/tag/intel-media-23.3.5
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch')
-rw-r--r-- | recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch b/recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch deleted file mode 100644 index 1d62b773..00000000 --- a/recipes-multimedia/libva/files/0001-Set-sRGB-color-space-for-non-video-wall-and-no-backg.patch +++ /dev/null | |||
@@ -1,95 +0,0 @@ | |||
1 | From b2c514337d2bc6015292aac5b57a603f8ad4fed5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lu-Anxiao <anxiao.lu@intel.com> | ||
3 | Date: Mon, 9 Oct 2023 20:47:44 +0800 | ||
4 | Subject: [PATCH] Set sRGB color space for non-video wall and no background | ||
5 | colorfill cases. | ||
6 | |||
7 | * [VP] Set sRGB color space for non-video wall and no background colorfill cases. | ||
8 | |||
9 | This solves the regression caused by | ||
10 | https://github.com/intel/media-driver/commit/a9c2df7b01c2f33775c676f5490ea274410e9db2. | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/intel/media-driver/commit/509ab5f6c6d447575c61e32d323aa4e7aa212fbd] | ||
13 | Signed-off-by: Chan, Xu Pian <xu.pian.chan@intel.com> | ||
14 | --- | ||
15 | .../linux/common/vp/ddi/media_libva_vp.c | 18 +++++++++++++----- | ||
16 | .../linux/common/vp/ddi/ddi_vp_functions.cpp | 19 ++++++++++++++----- | ||
17 | 2 files changed, 27 insertions(+), 10 deletions(-) | ||
18 | |||
19 | diff --git a/media_driver/linux/common/vp/ddi/media_libva_vp.c b/media_driver/linux/common/vp/ddi/media_libva_vp.c | ||
20 | index 2ef610d35..4e10905ff 100644 | ||
21 | --- a/media_driver/linux/common/vp/ddi/media_libva_vp.c | ||
22 | +++ b/media_driver/linux/common/vp/ddi/media_libva_vp.c | ||
23 | @@ -1148,7 +1148,7 @@ DdiVp_SetProcPipelineParams( | ||
24 | |||
25 | // Background Colorfill | ||
26 | // According to libva definition, if alpha in output background color is zero, then colorfill is not needed | ||
27 | - if ((pPipelineParam->output_background_color >> 24) != 0) | ||
28 | + if ((pPipelineParam->output_background_color >> 24) != 0 || pVpHalTgtSurf->ColorSpace == CSpace_sRGB) | ||
29 | { | ||
30 | if (pVpHalRenderParams->pColorFillParams == nullptr) | ||
31 | { | ||
32 | @@ -1157,10 +1157,18 @@ DdiVp_SetProcPipelineParams( | ||
33 | |||
34 | DDI_CHK_NULL(pVpHalRenderParams->pColorFillParams, "Null pColorFillParams.", VA_STATUS_ERROR_UNKNOWN); | ||
35 | |||
36 | - // set background colorfill option | ||
37 | - pVpHalRenderParams->pColorFillParams->Color = pPipelineParam->output_background_color; | ||
38 | - pVpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
39 | - pVpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
40 | + if (pVpHalTgtSurf->ColorSpace == CSpace_sRGB && (pPipelineParam->output_background_color >> 24) == 0) | ||
41 | + { | ||
42 | + // set color space for sRGB output | ||
43 | + pVpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
44 | + } | ||
45 | + else | ||
46 | + { | ||
47 | + // set background colorfill option | ||
48 | + pVpHalRenderParams->pColorFillParams->Color = pPipelineParam->output_background_color; | ||
49 | + pVpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
50 | + pVpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
51 | + } | ||
52 | }else | ||
53 | { | ||
54 | MOS_FreeMemAndSetNull(pVpHalRenderParams->pColorFillParams); | ||
55 | diff --git a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
56 | index fa02bf147..fe64bb8ae 100644 | ||
57 | --- a/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
58 | +++ b/media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp | ||
59 | @@ -2085,8 +2085,9 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
60 | { | ||
61 | DDI_VP_FUNC_ENTER; | ||
62 | DDI_VP_CHK_NULL(vpHalRenderParams, "nullptr vpHalRenderParams.", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
63 | + DDI_VP_CHK_NULL(vpHalRenderParams->pTarget[0],"nullptr pTarget[0].", VA_STATUS_ERROR_INVALID_PARAMETER); | ||
64 | |||
65 | - if ((outBackGroundcolor >> 24) != 0) | ||
66 | + if ((outBackGroundcolor >> 24) != 0 || vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB) | ||
67 | { | ||
68 | if (vpHalRenderParams->pColorFillParams == nullptr) | ||
69 | { | ||
70 | @@ -2095,10 +2096,18 @@ VAStatus DdiVpFunctions::SetBackgroundColorfill( | ||
71 | |||
72 | DDI_VP_CHK_NULL(vpHalRenderParams->pColorFillParams, "nullptr pColorFillParams.", VA_STATUS_ERROR_UNKNOWN); | ||
73 | |||
74 | - // set background colorfill option | ||
75 | - vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
76 | - vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
77 | - vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
78 | + if (vpHalRenderParams->pTarget[0]->ColorSpace == CSpace_sRGB && (outBackGroundcolor >> 24) == 0) | ||
79 | + { | ||
80 | + // set color space for sRGB output | ||
81 | + vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
82 | + } | ||
83 | + else | ||
84 | + { | ||
85 | + // set background colorfill option | ||
86 | + vpHalRenderParams->pColorFillParams->Color = outBackGroundcolor; | ||
87 | + vpHalRenderParams->pColorFillParams->bYCbCr = false; | ||
88 | + vpHalRenderParams->pColorFillParams->CSpace = CSpace_sRGB; | ||
89 | + } | ||
90 | } | ||
91 | else | ||
92 | { | ||
93 | -- | ||
94 | 2.25.1 | ||
95 | |||