[Decode] [PDVT-SH] Add AVC decode HW start code support reg control

Add AVC decode HW start code support reg key to control feature on/off

Author: haichund1

media_common/agnostic/common/os/mos_utilities_common.h

@@ -475,6 +475,7 @@ typedef enum _MOS_USER_FEATURE_VALUE_ID
     __MEDIA_USER_FEATURE_VALUE_FINE_GRANULAR_CRC_STREAMOUT_ENABLE_ID,
     __MEDIA_USER_FEATURE_VALUE_FINE_GRANULAR_CRC_STREAMIN_ENABLE_ID,
     __MEDIA_USER_FEATURE_VALUE_FINE_GRANULAR_CRC_OUTPUT_RATE_ID,
+    __MEDIA_USER_FEATURE_VALUE_DECODE_AVC_HW_STARTCODE_SUPPORT_DISABLE_ID,
 #endif
     __MOS_USER_FEATURE_KEY_MAX_ID,
 } MOS_USER_FEATURE_VALUE_ID;

media_driver/agnostic/common/os/mos_utilities.cpp

@@ -3251,5 +3251,14 @@ MOS_USER_FEATURE_VALUE MosUtilities::m_mosUserFeatureDescFields[__MOS_USER_FEATU
             MOS_USER_FEATURE_VALUE_TYPE_UINT32,
             "0",
             "Enable will streamin CRC, used in first pass(passing run)"),
+        MOS_DECLARE_UF_KEY_DBGONLY(__MEDIA_USER_FEATURE_VALUE_DECODE_AVC_HW_STARTCODE_SUPPORT_DISABLE_ID,
+            "DecodeAvcHwStartCodeSupportDisable",
+            __MEDIA_USER_FEATURE_SUBKEY_INTERNAL,
+            __MEDIA_USER_FEATURE_SUBKEY_REPORT,
+            "Decode",
+            MOS_USER_FEATURE_TYPE_USER,
+            MOS_USER_FEATURE_VALUE_TYPE_UINT32,
+            "0",
+            "Disable Decode AVC HW start code support. (0: Enable decode AVC HW start code support. 1: Disable decode AVC HW start code support)"),
 #endif
 };

media_softlet/agnostic/common/codec/hal/dec/avc/features/decode_avc_basic_feature.cpp

@@ -54,6 +54,34 @@ namespace decode {
         DECODE_CHK_STATUS(m_refFrames.Init(this, *m_allocator));
         DECODE_CHK_STATUS(m_mvBuffers.Init(m_hwInterface, *m_allocator, *this, CODEC_AVC_NUM_INIT_DMV_BUFFERS));
 
+        // Initialize m_hwStartCodeSupportEnabled based on hardware capability and user feature setting
+        if (m_osInterface != nullptr)
+        {
+            MEDIA_FEATURE_TABLE *skuTable = m_osInterface->pfnGetSkuTable(m_osInterface);
+            if (skuTable != nullptr && MEDIA_IS_SKU(skuTable, FtrAVCd4ByteNALStartCodeSupport))
+            {
+                // Hardware supports the feature, enable by default
+                m_hwStartCodeSupportEnabled = true;
+
+#if (_DEBUG || _RELEASE_INTERNAL)
+                // Check user feature setting to potentially disable the feature
+                MOS_USER_FEATURE_VALUE_DATA userFeatureData;
+                MOS_ZeroMemory(&userFeatureData, sizeof(userFeatureData));
+                MOS_UserFeature_ReadValue_ID(
+                    nullptr,
+                    __MEDIA_USER_FEATURE_VALUE_DECODE_AVC_HW_STARTCODE_SUPPORT_DISABLE_ID,
+                    &userFeatureData,
+                    (MOS_CONTEXT_HANDLE) nullptr);
+
+                // If feature key is set to 1 (disable), override to false
+                if (userFeatureData.bData)
+                {
+                    m_hwStartCodeSupportEnabled = false;
+                }
+#endif
+            }
+        }
+
         return MOS_STATUS_SUCCESS;
     }
 

media_softlet/agnostic/common/codec/hal/dec/avc/features/decode_avc_basic_feature.h

@@ -168,6 +168,8 @@ class AvcBasicFeature : public DecodeBasicFeature
     std::vector<uint32_t>           m_refFrameIndexList;                      //!< Reference frame index list
     RefrenceAssociatedBuffer<MOS_BUFFER, AvcMvBufferOpInf, AvcBasicFeature> m_mvBuffers; //!< Reference associated buffers
 
+    bool m_hwStartCodeSupportEnabled = false;  //!< Controls AVC hardware start code support based on both hardware capability and user feature setting
+
 protected:
     virtual MOS_STATUS SetRequiredBitstreamSize(uint32_t requiredSize) override;
     MOS_STATUS SetPictureStructs();

media_softlet/agnostic/common/codec/hal/dec/avc/packet/decode_avc_slice_packet.cpp

@@ -205,7 +205,6 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_BSD_OBJECT(MOS_COMMAND_BUFFER &cmdBuffer,
     DECODE_FUNC_CALL();
     auto &parSlice    = m_mfxItf->MHW_GETPAR_F(MFX_AVC_SLICE_STATE)();
     auto sliceParams  = m_avcSliceParams + slcIdx;
-    MEDIA_FEATURE_TABLE *skuTable = m_osInterface->pfnGetSkuTable(m_osInterface);
     m_LastsliceFlag   = parSlice.isLastSlice;
     if (parSlice.shortFormatInUse)
     {
@@ -216,7 +215,7 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_BSD_OBJECT(MOS_COMMAND_BUFFER &cmdBuffer,
         }
         else
         {
-            if (MEDIA_IS_SKU(skuTable, FtrAVCd4ByteNALStartCodeSupport))
+            if (m_avcBasicFeature && m_avcBasicFeature->m_hwStartCodeSupportEnabled)
             {
                 m_IndirectBsdDataLength       = parSlice.Length;
                 m_IndirectBsdDataStartAddress = sliceParams->slice_data_offset;
@@ -226,8 +225,8 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_BSD_OBJECT(MOS_COMMAND_BUFFER &cmdBuffer,
                 m_IndirectBsdDataLength       = parSlice.Length + 1 - m_osInterface->dwNumNalUnitBytesIncluded;
                 m_IndirectBsdDataStartAddress = sliceParams->slice_data_offset - 1 + m_osInterface->dwNumNalUnitBytesIncluded;
             }
-            DECODE_VERBOSEMESSAGE("AVCd4ByteNALStartCodeSupport %d, slice_data_offset %d, parSlice Length %d, IndirectBsdDataStartAddress %d, IndirectBsdDataLength %d",
-                MEDIA_IS_SKU(skuTable, FtrAVCd4ByteNALStartCodeSupport),
+            DECODE_VERBOSEMESSAGE("HwStartCodeSupportEnabled %d, slice_data_offset %d, parSlice Length %d, IndirectBsdDataStartAddress %d, IndirectBsdDataLength %d",
+                (m_avcBasicFeature ? m_avcBasicFeature->m_hwStartCodeSupportEnabled : false),
                 sliceParams->slice_data_offset,
                 parSlice.Length,
                 m_IndirectBsdDataStartAddress,
@@ -424,7 +423,6 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_SLICE_Addr(MOS_COMMAND_BUFFER &cmdBuffer,
     SET_AVC_SLICE_STATE(cmdBuffer, slcIdx);
     auto &parSlice           = m_mfxItf->MHW_GETPAR_F(MFX_AVC_SLICE_STATE)();
     auto &parSliceAddr       = m_mfxItf->MHW_GETPAR_F(MFD_AVC_SLICEADDR)();
-    MEDIA_FEATURE_TABLE *skuTable = m_osInterface->pfnGetSkuTable(m_osInterface);
     parSliceAddr.decodeInUse = true;
     if (parSlice.fullFrameData)
     {
@@ -433,7 +431,7 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_SLICE_Addr(MOS_COMMAND_BUFFER &cmdBuffer,
     }
     else
     {
-        if (MEDIA_IS_SKU(skuTable, FtrAVCd4ByteNALStartCodeSupport))
+        if (m_avcBasicFeature && m_avcBasicFeature->m_hwStartCodeSupportEnabled)
         {
             parSliceAddr.IndirectBsdDataLength       = parSlice.nextLength;
             parSliceAddr.IndirectBsdDataStartAddress = parSlice.nextOffset;
@@ -443,8 +441,8 @@ MOS_STATUS AvcDecodeSlcPkt::AddCmd_AVC_SLICE_Addr(MOS_COMMAND_BUFFER &cmdBuffer,
             parSliceAddr.IndirectBsdDataLength       = parSlice.nextLength + 1 - m_osInterface->dwNumNalUnitBytesIncluded;
             parSliceAddr.IndirectBsdDataStartAddress = parSlice.nextOffset - 1 + m_osInterface->dwNumNalUnitBytesIncluded;
         }
-        DECODE_VERBOSEMESSAGE("AVCd4ByteNALStartCodeSupport %d, parSlice nextOffset %d, parSlice nextLength %d, IndirectBsdDataStartAddress %d, IndirectBsdDataLength %d",
-            MEDIA_IS_SKU(skuTable, FtrAVCd4ByteNALStartCodeSupport),
+        DECODE_VERBOSEMESSAGE("HwStartCodeSupportEnabled %d, parSlice nextOffset %d, parSlice nextLength %d, IndirectBsdDataStartAddress %d, IndirectBsdDataLength %d",
+            (m_avcBasicFeature ? m_avcBasicFeature->m_hwStartCodeSupportEnabled : false),
             parSlice.nextOffset,
             parSlice.nextLength,
             parSliceAddr.IndirectBsdDataStartAddress,