commit 0370d503455c0e782b626dbf01d5e48287a8ad4f
author JayYang <jay.yang@intel.com> Mon Jan 25 10:06:17 2021 +0800
committer intel-mediadev <mediadev@intel.com> Tue Jan 26 02:12:09 2021 +0800
tree d3f87684e126bc629099d3706546d189930808ff
parent 5c7f8c009b3692b1a33909232df7ed7dd9fbad45

[VP] Fix interlaced scaling regression issue

Fix regression caused by pr 8069 and re-fix SFC NV12 interlaced scaling issue.

media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.cpp

diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.cpp b/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.cpp
index 1cef998..71e8a6b 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.cpp
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.cpp
@@ -901,7 +901,8 @@
 void VphalSfcState::GetOutputWidthHeightAlignUnit(
     MOS_FORMAT              outputFormat,
     uint16_t                &widthAlignUnit,
-    uint16_t                &heightAlignUnit)
+    uint16_t                &heightAlignUnit,
+    bool                    isInterlacedScaling)
 {
     widthAlignUnit  = 1;
     heightAlignUnit = 1;
@@ -1074,7 +1075,8 @@
     GetOutputWidthHeightAlignUnit(
         pSfcStateParams->OutputFrameFormat,
         wOutputWidthAlignUnit,
-        wOutputHeightAlignUnit);
+        wOutputHeightAlignUnit,
+        pSrcSurface->bInterlacedScaling);
 
     // Apply alignment restriction to Region of the input frame.
     GetInputWidthHeightAlignUnit(

media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.h

diff --git a/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.h b/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.h
index db87c02..f7639b7 100644
--- a/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.h
+++ b/media_driver/agnostic/common/vp/hal/vphal_render_sfc_base.h
@@ -405,7 +405,8 @@
     virtual void GetOutputWidthHeightAlignUnit(
         MOS_FORMAT              outputFormat,
         uint16_t                &widthAlignUnit,
-        uint16_t                &heightAlignUnit);
+        uint16_t                &heightAlignUnit,
+        bool                    isInterlacedScaling = false);
 
     //!
     //! \brief    Setup SFC State related parameters