[hevce] Add check for intra refresh with B-frames

Intra refresh isn't supported with B-frames. Fixes #2571
Intel-Media-SDK · Apr 16, 2021 · f547205 · f547205
1 parent e418206
commit f547205
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy.cpp
@@ -3728,6 +3728,13 @@ mfxStatus Legacy::CheckIntraRefresh(
             || !CheckOrZero<mfxU16>(pCO3->IntRefCycleDist, 0)
             , sts, MFX_ERR_UNSUPPORTED);
 
+        // B-Frames should be disabled for intra refresh
+        if (pCO2->IntRefType && par.mfx.GopRefDist > 1)
+        {
+            pCO2->IntRefType = MFX_REFRESH_NO;
+            ++changed;
+        }
+
         // refresh cycle length shouldn't be greater or equal to GOP size
         bool bInvalidCycle =
             pCO2->IntRefCycleSize != 0

diff --git a/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp b/_studio/mfx_lib/encode_hw/hevc/agnostic/base/hevcehw_base_legacy_defaults.cpp
@@ -186,8 +186,10 @@ class GetDefault
             return par.mvp.mfx.GopRefDist;
         }
         auto GopPicSize = par.base.GetGopPicSize(par);
+        const mfxExtCodingOption2* pCO2 = ExtBuffer::Get(par.mvp);
         bool bNoB =
-            par.base.GetNumTemporalLayers(par) > 1
+            (pCO2 && pCO2->IntRefType)
+            || par.base.GetNumTemporalLayers(par) > 1
             || par.caps.SliceIPOnly
             || GopPicSize < 3
             || par.mvp.mfx.NumRefFrame == 1;