commit 681944d798080c1e5913676cf9b560bfabb8b9a4
author YuliyaBakhanova <yuliya.bakhanova@intel.com> Fri Jul 23 18:18:27 2021 +0800
committer intel-mediadev <mediadev@intel.com> Fri Jul 23 18:31:38 2021 +0800
tree 255f35534f8bd94513081e2bde75a5d2e8917c3d
parent b523777389d9cf1e63b57ff7efb84b877a3c82f7

[Encode] Rewrite raw surface color/tile format check

Rewrite raw surface color/tile format check
Add DisableCopy() method

media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp

diff --git a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
index ecb3481..1f80620 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
+++ b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.cpp
@@ -1116,8 +1116,9 @@
     m_threadTraverseSizeY = 2;    // for NV12, thread space is 32x4
 
     // check raw surface's color/tile format
-    if (m_cscEnableColor && !m_encoder->CheckSupportedFormat(&details))
+    if (!m_encoder->CheckSupportedFormat(&details))
     {
+        CODECHAL_ENCODE_CHK_COND_RETURN(!m_cscEnableColor && !m_cscEnableSfc, "Input color format = %d is not supported!", details.Format);
         CODECHAL_ENCODE_CHK_STATUS_RETURN(CheckRawColorFormat(details.Format, details.TileType));
     }
 

media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.h

diff --git a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.h b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.h
index 39f1dd4..c16afa3 100644
--- a/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.h
+++ b/media_driver/agnostic/common/codec/hal/codechal_encode_csc_ds.h
@@ -366,6 +366,7 @@
 
     void DisableCsc() { m_cscDsConvEnable = 0; }
     void EnableCopy() { m_cscEnableCopy = 1; }
+    void DisableCopy() { m_cscEnableCopy = 0; }
     void EnableColor() { m_cscEnableColor = 1; }
     void EnableMmc() { m_cscEnableMmc = 1; }
     void EnableSfc() { m_cscEnableSfc = 1; }