[Encode] update Xe2 encode caps

update Xe2 encode caps.
intel · Sep 18, 2024 · a3b3781 · a3b3781
1 parent 3606407
commit a3b3781
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 339 deletions.
diff --git a/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h b/media_softlet/linux/xe2_hpm_r0/ddi/capstable_data_xe2_hpm_r0_specific.h
@@ -358,7 +358,7 @@ static const ProfileMap profileMap_Xe2_Hpm_r0
     {VAProfileJPEGBaseline, &entrypointMap_VAProfileJPEGBaseline_Xe2_Hpm_r0},
 #endif
 
-#if defined(_AV1_DECODE_SUPPORTED)
+#if defined(_AV1_ENCODE_VDENC_SUPPORTED) || defined(_AV1_DECODE_SUPPORTED)
     {VAProfileAV1Profile0, &entrypointMap_VAProfileAV1Profile0_Xe2_Hpm_r0},
 #endif
 

diff --git a/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h b/media_softlet/linux/xe2_lpm_r0/ddi/capstable_data_xe2_lpm_r0_specific.h
@@ -40,7 +40,7 @@
 #if defined(_AV1_ENCODE_VDENC_SUPPORTED)
 #include "capstable_data_av1_encode_xe2_lpm_r0_specific.h"
 #endif
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED)
+#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)
 #include "capstable_data_vp9_encode_xe2_lpm_r0_specific.h"
 #endif
 
@@ -295,7 +295,7 @@ static const EntrypointMap entrypointMap_VAProfileAV1Profile0_Xe2_Lpm_r0
 
 static const EntrypointMap entrypointMap_VAProfileVP9Profile0_Xe2_Lpm_r0
 {
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED)
+#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)
     {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile0_Data_Xe2_Lpm_r0},
 #endif
 
@@ -306,7 +306,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile0_Xe2_Lpm_r0
 
 static const EntrypointMap entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0
 {
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED)
+#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)
     {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile1_Data_Xe2_Lpm_r0},
 #endif
 
@@ -317,7 +317,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0
 
 static const EntrypointMap entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0
 {
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED)
+#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)
     {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile2_Data_Xe2_Lpm_r0},
 #endif
 
@@ -328,7 +328,7 @@ static const EntrypointMap entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0
 
 static const EntrypointMap entrypointMap_VAProfileVP9Profile3_Xe2_Lpm_r0
 {
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED)
+#if defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)
     {VAEntrypointEncSlice, &entrypointMap_VAProfileVP9Profile3_Data_Xe2_Lpm_r0},
 #endif
 
@@ -412,7 +412,7 @@ static const ProfileMap profileMap_Xe2_Lpm_r0
     {VAProfileAV1Profile0, &entrypointMap_VAProfileAV1Profile0_Xe2_Lpm_r0},
 #endif
 
-#if defined(_VP9_ENCODE_VDENC_SUPPORTED) || defined(_VP9_DECODE_SUPPORTED)
+#if (defined(_VP9_ENCODE_VDENC_SUPPORTED) && defined(_MEDIA_RESERVED)) || defined(_VP9_DECODE_SUPPORTED)
     {VAProfileVP9Profile3, &entrypointMap_VAProfileVP9Profile3_Xe2_Lpm_r0},
     {VAProfileVP9Profile2, &entrypointMap_VAProfileVP9Profile2_Xe2_Lpm_r0},
     {VAProfileVP9Profile1, &entrypointMap_VAProfileVP9Profile1_Xe2_Lpm_r0},

diff --git a/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake b/media_softlet/linux/xe2_lpm_r0/encode/media_srcs.cmake
@@ -22,4 +22,3 @@ media_include_subdirectory(hevc)
 media_include_subdirectory(avc)
 media_include_subdirectory(jpeg)
 media_include_subdirectory(av1)
-media_include_subdirectory(vp9)
diff --git a/...a_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h b/...a_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/capstable_data_vp9_encode_xe2_lpm_r0_specific.h
diff --git a/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake b/media_softlet/linux/xe2_lpm_r0/encode/vp9/ddi/media_srcs.cmake