Fixed the LA sliding window works with BPyramid

Author: hongbolv

_studio/mfx_lib/encode_hw/h264/src/mfx_h264_encode_hw_utils_new.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Intel Corporation
+// Copyright (c) 2019 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
@@ -2477,22 +2477,20 @@ mfxStatus MfxHwH264Encode::CodeAsSkipFrame(     VideoCORE &            core,
                 return MFX_ERR_UNDEFINED_BEHAVIOR;
         }
     }
-    if (task.GetFrameType() & MFX_FRAMETYPE_P)
+    else
     {
-        DpbFrame& refFrame = task.m_dpb[0][task.m_list0[0][0] & 127];
+        mfxI32 fid = task.m_fid[0];
+        MFX_CHECK(task.m_list0[fid].Size(), MFX_ERR_UNDEFINED_BEHAVIOR);
+        DpbFrame& refFrame = task.m_dpb[0][task.m_list0[fid][0] & 127];
         mfxFrameData curr = {};
         mfxFrameData ref  = {};
         curr.MemId = task.m_midRaw;
         ref.MemId  = refFrame.m_midRec;
 
         mfxFrameSurface1 surfSrc = { {0,}, video.mfx.FrameInfo, ref  };
         mfxFrameSurface1 surfDst = { {0,}, video.mfx.FrameInfo, curr };
-        sts = core.DoFastCopyWrapper(&surfDst,MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE, &surfSrc, MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE);
-
-    }
-    if (task.GetFrameType() & MFX_FRAMETYPE_B)
-    {
-        task.m_ctrl.SkipFrame = 1;
+        sts = core.DoFastCopyWrapper(&surfDst,MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE,
+                                     &surfSrc, MFX_MEMTYPE_INTERNAL_FRAME|MFX_MEMTYPE_DXVA2_DECODER_TARGET|MFX_MEMTYPE_FROM_ENCODE);
     }
 
     return sts;

_studio/mfx_lib/shared/src/mfx_h264_enc_common_hw.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018 Intel Corporation
+// Copyright (c) 2019 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
@@ -4392,7 +4392,7 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
 
     if (!CheckRangeDflt(extOpt2->SkipFrame, 0, 3, 0)) changed = true;
 
-    if ( extOpt2->SkipFrame && hwCaps.SkipFrame == 0 && par.mfx.RateControlMethod != MFX_RATECONTROL_CQP && par.mfx.RateControlMethod != MFX_RATECONTROL_LA_HRD)
+    if ( extOpt2->SkipFrame && hwCaps.SkipFrame == 0 && par.mfx.RateControlMethod != MFX_RATECONTROL_CQP)
     {
         extOpt2->SkipFrame = 0;
         changed = true;
@@ -4499,19 +4499,6 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
         if (!CheckRangeDflt(extOpt2->MinQPP, 0, (extOpt2->MaxQPP ? extOpt2->MaxQPP : 51), 0)) changed = true;
         if (!CheckRangeDflt(extOpt2->MinQPB, 0, (extOpt2->MaxQPB ? extOpt2->MaxQPB : 51), 0)) changed = true;
     }
-    if ((extOpt3->WinBRCSize > 0 && (par.mfx.RateControlMethod != MFX_RATECONTROL_VBR && par.mfx.RateControlMethod != MFX_RATECONTROL_QVBR)) || (par.mfx.RateControlMethod == MFX_RATECONTROL_LA_HRD))
-    {
-        if (extOpt2->SkipFrame!=0 && extOpt2->SkipFrame != MFX_SKIPFRAME_INSERT_DUMMY)
-        {
-            extOpt2->SkipFrame = MFX_SKIPFRAME_INSERT_DUMMY;
-            changed = true;
-        }
-        if (extOpt2->BRefType != MFX_B_REF_OFF && extOpt2->BRefType != 0)
-        {
-            extOpt2->BRefType  = MFX_B_REF_OFF;
-            changed = true;
-        }
-    }
     if (!CheckTriStateOption(extOpt3->BRCPanicMode)) changed = true;
     if (IsOff(extOpt3->BRCPanicMode)
      && (bRateControlLA(par.mfx.RateControlMethod)
@@ -5215,11 +5202,6 @@ namespace
                     return false;
         return true;
     }
-
-    bool IsPowerOf2(mfxU32 n)
-    {
-        return (n & (n - 1)) == 0;
-    }
 };
 
 bool IsHRDBasedBRCMethod(mfxU16  RateControlMethod)
@@ -5426,11 +5408,6 @@ void MfxHwH264Encode::SetDefaults(
         }
     }
 
-    if ((!extOpt2->SkipFrame) && ((extOpt3->WinBRCSize > 0 && (par.mfx.RateControlMethod != MFX_RATECONTROL_VBR && par.mfx.RateControlMethod != MFX_RATECONTROL_QVBR)) || par.mfx.RateControlMethod == MFX_RATECONTROL_LA_HRD))
-    {
-        extOpt2->SkipFrame = MFX_SKIPFRAME_INSERT_DUMMY;
-    }
-
     //WA for MVC quality problem on progressive content.
     if (IsMvcProfile(par.mfx.CodecProfile)) {
         extDdi->NumActiveRefP = extDdi->NumActiveRefBL0 = extDdi->NumActiveRefBL1 = 1;
@@ -5509,9 +5486,7 @@ void MfxHwH264Encode::SetDefaults(
         if (platform >= MFX_HW_HSW && platform != MFX_HW_VLV &&
             IsDyadic(par.calcParam.scale, par.calcParam.numTemporalLayer) &&
             par.mfx.GopRefDist >= 4 &&
-            IsPowerOf2(par.mfx.GopRefDist) &&
-            par.mfx.GopPicSize % par.mfx.GopRefDist == 0 &&
-            !bRateControlLA(par.mfx.RateControlMethod) &&
+            par.mfx.RateControlMethod != MFX_RATECONTROL_LA_EXT &&
             (!par.mfx.NumRefFrame || par.mfx.NumRefFrame >= GetMinNumRefFrameForPyramid(par)))
         {
             extOpt2->BRefType = mfxU16(par.mfx.FrameInfo.PicStruct == MFX_PICSTRUCT_PROGRESSIVE ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF);