[Encode] softlet include file code clean
This commit clean softlet in softlet/ddi.
diff --git a/media_common/agnostic/common/codec/media_srcs.cmake b/media_common/agnostic/common/codec/media_srcs.cmake
index 717d14b..09bbe3a 100644
--- a/media_common/agnostic/common/codec/media_srcs.cmake
+++ b/media_common/agnostic/common/codec/media_srcs.cmake
@@ -18,4 +18,4 @@
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
-media_include_subdirectory(shared)
+media_include_subdirectory(shared)
\ No newline at end of file
diff --git a/media_driver/agnostic/common/codec/shared/codec_def_encode_hevc.h b/media_common/agnostic/common/codec/shared/codec_def_encode_hevc.h
similarity index 99%
rename from media_driver/agnostic/common/codec/shared/codec_def_encode_hevc.h
rename to media_common/agnostic/common/codec/shared/codec_def_encode_hevc.h
index ec970f0..331ddb6 100644
--- a/media_driver/agnostic/common/codec/shared/codec_def_encode_hevc.h
+++ b/media_common/agnostic/common/codec/shared/codec_def_encode_hevc.h
@@ -40,6 +40,7 @@
#define CODECHAL_MAX_CUR_NUM_REF_FRAME_HEVC 8
#define CODECHAL_NUM_INTERNAL_NV12_RT_HEVC 16
#define CODECHAL_ENCODE_HEVC_MAX_NUM_ROI 16
+#define CODECHAL_HEVC_FRAME_HEADER_SIZE 8192
// HEVC VDENC
#define ENCODE_HEVC_VDENC_NUM_MAX_SLICES 70
@@ -50,7 +51,7 @@
#define ENCODE_VDENC_HEVC_MIN_ROI_DELTA_QP_G10 -8
#define ENCODE_VDENC_HEVC_MAX_ROI_DELTA_QP_G10 7 // Max delta QP for VDEnc ROI
#define ENCODE_VDENC_HEVC_PADDING_DW_SIZE 8
-#define CODECHAL_ENCODE_HEVC_MAX_NUM_DIRTYRECT 16
+#define CODECHAL_ENCODE_HEVC_MAX_NUM_DIRTYRECT 16
// HEVC DP
#define ENCODE_DP_HEVC_NUM_MAX_VME_L0_REF_G9 3
diff --git a/media_common/agnostic/common/codec/shared/media_srcs.cmake b/media_common/agnostic/common/codec/shared/media_srcs.cmake
index cae518c..dc6f2ee 100644
--- a/media_common/agnostic/common/codec/shared/media_srcs.cmake
+++ b/media_common/agnostic/common/codec/shared/media_srcs.cmake
@@ -40,6 +40,7 @@
${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_jpeg.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_mpeg2.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_vp9.h
+ ${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_hevc.h
)
set(HEADERS_
diff --git a/media_driver/agnostic/common/media_interfaces/media_interfaces_codechal.h b/media_common/agnostic/common/media_interfaces/media_interfaces_codechal.h
similarity index 100%
rename from media_driver/agnostic/common/media_interfaces/media_interfaces_codechal.h
rename to media_common/agnostic/common/media_interfaces/media_interfaces_codechal.h
diff --git a/media_driver/agnostic/common/media_interfaces/media_interfaces_hwinfo.h b/media_common/agnostic/common/media_interfaces/media_interfaces_hwinfo.h
similarity index 100%
rename from media_driver/agnostic/common/media_interfaces/media_interfaces_hwinfo.h
rename to media_common/agnostic/common/media_interfaces/media_interfaces_hwinfo.h
diff --git a/media_common/agnostic/common/media_interfaces/media_srcs.cmake b/media_common/agnostic/common/media_interfaces/media_srcs.cmake
new file mode 100644
index 0000000..3264381
--- /dev/null
+++ b/media_common/agnostic/common/media_interfaces/media_srcs.cmake
@@ -0,0 +1,37 @@
+# Copyright (c) 2021, Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+
+set(TMP_HEADERS_
+ ${CMAKE_CURRENT_LIST_DIR}/media_interfaces_hwinfo.h
+)
+
+
+set(HEADERS_
+ ${HEADERS_}
+ ${TMP_HEADERS_}
+)
+
+set(COMMON_HEADERS_
+ ${COMMON_HEADERS_}
+ ${TMP_HEADERS_}
+)
+
+media_add_curr_to_include_path()
diff --git a/media_common/agnostic/common/media_srcs.cmake b/media_common/agnostic/common/media_srcs.cmake
index 934f5b6..6d95c70 100644
--- a/media_common/agnostic/common/media_srcs.cmake
+++ b/media_common/agnostic/common/media_srcs.cmake
@@ -21,4 +21,5 @@
media_include_subdirectory(os)
media_include_subdirectory(codec)
media_include_subdirectory(hw)
-media_include_subdirectory(shared)
\ No newline at end of file
+media_include_subdirectory(shared)
+media_include_subdirectory(media_interfaces)
diff --git a/media_driver/agnostic/common/codec/hal/codechal_encode_hevc_base.h b/media_driver/agnostic/common/codec/hal/codechal_encode_hevc_base.h
index 5c3aa1c..499f0a6 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_encode_hevc_base.h
+++ b/media_driver/agnostic/common/codec/hal/codechal_encode_hevc_base.h
@@ -28,9 +28,11 @@
#define __CODECHAL_ENCODE_HEVC_BASE_H__
#include "codechal_encoder_base.h"
+
#if USE_CODECHAL_DEBUG_TOOL
#include "codechal_debug_encode_par.h"
#endif
+
//*------------------------------------------------------------------------------
//* Codec Definitions
//*------------------------------------------------------------------------------
@@ -128,8 +130,6 @@
#define CODECHAL_HEVC_PAK_STREAMOUT_SIZE 0x500000 //size is accounted for 4Kx4K with all 8x8 CU,based on streamout0 and streamout1 requirements
//(4096*4096)/64 *16 (streamout0) + 1MB(streamout 1). there is scope to reduce streamout1 size. Need to check with HW team.
// 8K is just an estimation
-#define CODECHAL_HEVC_FRAME_HEADER_SIZE 8192
-
#define CODECHAL_HEVC_BRC_QP_ADJUST_SIZE 576
#define CODECHAL_ENCODE_HEVC_NUM_MAX_VDENC_L0_REF_G10 3 // multiref, hevc vdenc
diff --git a/media_driver/agnostic/common/codec/shared/media_srcs.cmake b/media_driver/agnostic/common/codec/shared/media_srcs.cmake
index 5714e23..dcfc0aa 100644
--- a/media_driver/agnostic/common/codec/shared/media_srcs.cmake
+++ b/media_driver/agnostic/common/codec/shared/media_srcs.cmake
@@ -25,10 +25,9 @@
${CMAKE_CURRENT_LIST_DIR}/codec_def_decode_jpeg.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_decode_mpeg2.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_decode_vp8.h
- ${CMAKE_CURRENT_LIST_DIR}/codec_def_decode.h
- ${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_hevc.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_encode_vp8.h
${CMAKE_CURRENT_LIST_DIR}/codec_def_cenc_decode.h
+ ${CMAKE_CURRENT_LIST_DIR}/codec_def_decode.h
)
set(HEADERS_
diff --git a/media_driver/agnostic/common/media_interfaces/media_srcs.cmake b/media_driver/agnostic/common/media_interfaces/media_srcs.cmake
index 04a690a..af9795d 100644
--- a/media_driver/agnostic/common/media_interfaces/media_srcs.cmake
+++ b/media_driver/agnostic/common/media_interfaces/media_srcs.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Intel Corporation
+# Copyright (c) 2020-2021, Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -23,7 +23,6 @@
set(TMP_HEADERS_
${CMAKE_CURRENT_LIST_DIR}/media_interfaces.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_cmhal.h
- ${CMAKE_CURRENT_LIST_DIR}/media_interfaces_codechal.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_mhw.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_nv12top010.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_mosutil.h
@@ -33,7 +32,6 @@
${CMAKE_CURRENT_LIST_DIR}/skuwa_factory.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_mcpy.h
${CMAKE_CURRENT_LIST_DIR}/media_interfaces_hwinfo_device.h
- ${CMAKE_CURRENT_LIST_DIR}/media_interfaces_hwinfo.h
)
if(${MMC_Supported} STREQUAL "yes")
@@ -43,13 +41,6 @@
)
endif()
-
-# no sources for now
-#set(SOURCES_
-# ${SOURCES_}
-# ${TMP_SOURCES_}
-#)
-
set(HEADERS_
${HEADERS_}
${TMP_HEADERS_}
