[Encode] Support negative QP for AVC

Author: huige0901

_studio/mfx_lib/encode_hw/h264/include/mfx_h264_encode_hw_utils.h

@@ -260,6 +260,7 @@ namespace MfxHwH264Encode
     }
 
     typedef Pair<mfxU8>  PairU8;
+    typedef Pair<mfxI8>  PairI8;
     typedef Pair<mfxU16> PairU16;
     typedef Pair<mfxU32> PairU32;
     typedef Pair<mfxI32> PairI32;
@@ -1250,7 +1251,7 @@ namespace MfxHwH264Encode
         mfxU32  m_idxReconOffset;       // offset for multi-view coding
         mfxU16  m_idrPicId;
         PairU8  m_subMbPartitionAllowed;
-        PairU8  m_cqpValue;
+        PairI8  m_cqpValue;
         PairU8  m_insertAud;
         PairU8  m_insertSps;
         PairU8  m_insertPps;

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

@@ -2321,9 +2321,11 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
         if (par.mfx.RateControlMethod == MFX_RATECONTROL_CQP
             && par.calcParam.cqpHrdMode == 0)
         {
-            if (!CheckRange(par.mfx.QPI, 10, 51)) changed = true;
-            if (!CheckRange(par.mfx.QPP, 10, 51)) changed = true;
-            if (!CheckRange(par.mfx.QPB, 10, 51)) changed = true;
+            mfxU8 minQP = 10;
+            mfxU8 maxQP = 51;
+            if (!CheckRange(par.mfx.QPI, minQP, maxQP)) changed = true;
+            if (!CheckRange(par.mfx.QPP, minQP, maxQP)) changed = true;
+            if (!CheckRange(par.mfx.QPB, minQP, maxQP)) changed = true;
         }
     }
 
@@ -3902,9 +3904,11 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
     if (par.mfx.RateControlMethod == MFX_RATECONTROL_CQP
         && par.calcParam.cqpHrdMode == 0)
     {
-        if (!CheckRange(par.mfx.QPI, 0, 51)) changed = true;
-        if (!CheckRange(par.mfx.QPP, 0, 51)) changed = true;
-        if (!CheckRange(par.mfx.QPB, 0, 51)) changed = true;
+        mfxU8 maxQP = 51;
+        mfxU8 minQP = 0;
+        if (!CheckRange(par.mfx.QPI, minQP, maxQP)) changed = true;
+        if (!CheckRange(par.mfx.QPP, minQP, maxQP)) changed = true;
+        if (!CheckRange(par.mfx.QPB, minQP, maxQP)) changed = true;
     }
 
     if (par.mfx.RateControlMethod == MFX_RATECONTROL_CBR &&
@@ -4038,8 +4042,6 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
                 //Check of weightedPredFlag is actually not needed, as it was read from 1 bit in extBits->PPSBuffer
                 extPps->weightedPredFlag > 1                           ||
                 extPps->weightedBipredIdc > 2                          ||
-                extPps->picInitQpMinus26 < -26                         ||
-                extPps->picInitQpMinus26 > 25                          ||
                 extPps->picInitQsMinus26 != 0                          ||
                 extPps->chromaQpIndexOffset < -12                      ||
                 extPps->chromaQpIndexOffset > 12                       ||
@@ -4724,12 +4726,15 @@ mfxStatus MfxHwH264Encode::CheckVideoParamQueryLike(
         || extOpt2->MinQPP || extOpt2->MaxQPP
         || extOpt2->MinQPB || extOpt2->MaxQPB)
     {
-        if (!CheckRangeDflt(extOpt2->MaxQPI, 0, 51, 0)) changed = true;
-        if (!CheckRangeDflt(extOpt2->MaxQPP, 0, 51, 0)) changed = true;
-        if (!CheckRangeDflt(extOpt2->MaxQPB, 0, 51, 0)) changed = true;
-        if (!CheckRangeDflt(extOpt2->MinQPI, 0, (extOpt2->MaxQPI ? extOpt2->MaxQPI : 51), 0)) changed = true;
-        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;
+        mfxU8 maxQP = 51;
+        mfxU8 minQP = 0;
+        mfxU8 deflt = 0;
+        if (!CheckRangeDflt(extOpt2->MaxQPI, minQP, maxQP, deflt)) changed = true;
+        if (!CheckRangeDflt(extOpt2->MaxQPP, minQP, maxQP, deflt)) changed = true;
+        if (!CheckRangeDflt(extOpt2->MaxQPB, minQP, maxQP, deflt)) changed = true;
+        if (!CheckRangeDflt(extOpt2->MinQPI, minQP, (extOpt2->MaxQPI ? extOpt2->MaxQPI : maxQP), deflt)) changed = true;
+        if (!CheckRangeDflt(extOpt2->MinQPP, minQP, (extOpt2->MaxQPP ? extOpt2->MaxQPP : maxQP), deflt)) changed = true;
+        if (!CheckRangeDflt(extOpt2->MinQPB, minQP, (extOpt2->MaxQPB ? extOpt2->MaxQPB : maxQP), deflt)) changed = true;
     }
 
     if (!CheckTriStateOption(extOpt3->BRCPanicMode)) changed = true;
@@ -9786,7 +9791,8 @@ mfxU32 HeaderPacker::WriteSlice(
     }
     if (pps.entropyCodingModeFlag && sliceType != SLICE_TYPE_I)
         obs.PutUe(m_cabacInitIdc);
-    obs.PutSe(task.m_cqpValue[fieldId] - (pps.picInitQpMinus26 + 26));
+    mfxI8 sliceDeltaQp = task.m_cqpValue[fieldId] - (pps.picInitQpMinus26 + 26);
+    obs.PutSe(sliceDeltaQp);
     if (pps.deblockingFilterControlPresentFlag)
     {
         mfxU32 disableDeblockingFilterIdc = task.m_disableDeblockingIdc[fieldId][sliceId];

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

@@ -329,8 +329,10 @@ namespace MfxHwH264Encode
     {
         const mfxExtCodingOption2& CO2 = GetExtBufferRef(par);
         const mfxExtCodingOption3& CO3 = GetExtBufferRef(par);
-        const mfxU8 minQP = 1;
-        const mfxU8 maxQP = 51;
+        mfxI8 tempMin = 1;
+        mfxI8 tempMax = 51;
+        const mfxI8 minQP = tempMin;
+        const mfxI8 maxQP = tempMax;
         mfxU8 QP = 0;
 
         if (par.mfx.RateControlMethod == MFX_RATECONTROL_CQP /*||