diff --git a/source/Lib/DecoderLib/AnnexBread.cpp b/source/Lib/DecoderLib/AnnexBread.cpp
index ee4801f0551839926de45e7e34f617a0d2dbeb0d..3d488d9fe2ad5760a0316426cb4b9ab298f2b725 100644
--- a/source/Lib/DecoderLib/AnnexBread.cpp
+++ b/source/Lib/DecoderLib/AnnexBread.cpp
@@ -125,7 +125,10 @@ _byteStreamNALUnit(
statBits.bits+=24; statBits.count+=3;
#endif
#endif
- if(start_code_prefix_one_3bytes != 0x000001) { THROW( "Invalid code prefix" );}
+ if (start_code_prefix_one_3bytes != 0x000001)
+ {
+ THROW("Invalid code prefix");
+ }
stats.m_numStartCodePrefixBytes += 3;
/* 3. NumBytesInNALunit is set equal to the number of bytes starting with
diff --git a/source/Lib/DecoderLib/NALread.cpp b/source/Lib/DecoderLib/NALread.cpp
index 526b275def7b62245b7a192cacd04f0017abb491..36e601d6b2ffaac7565ca9e27ae5f134a8f34ea0 100644
--- a/source/Lib/DecoderLib/NALread.cpp
+++ b/source/Lib/DecoderLib/NALread.cpp
@@ -111,7 +111,8 @@ static void xTraceNalUnitHeader(InputNALUnit& nalu)
{
DTRACE( g_trace_ctx, D_NALUNITHEADER, "*********** NAL UNIT (%s) ***********\n", nalUnitTypeToString(nalu.m_nalUnitType) );
bool zeroTidRequiredFlag = 0;
- if((nalu.m_nalUnitType >= 16) && (nalu.m_nalUnitType <= 31)) {
+ if ((nalu.m_nalUnitType >= 16) && (nalu.m_nalUnitType <= 31))
+ {
zeroTidRequiredFlag = 1;
}
DTRACE( g_trace_ctx, D_NALUNITHEADER, "%-50s u(%d) : %u\n", "zero_tid_required_flag", 1, zeroTidRequiredFlag );
@@ -167,6 +168,7 @@ void read(InputNALUnit& nalu)
bitstream.resetToStart();
readNalUnitHeader(nalu);
}
+
bool checkPictureHeaderInSliceHeaderFlag(InputNALUnit& nalu)
{
InputBitstream& bitstream = nalu.getBitstream();
diff --git a/source/Lib/EncoderLib/NALwrite.cpp b/source/Lib/EncoderLib/NALwrite.cpp
index bc897f766404b115de97a3cfa5bc6f4479a4f3ce..799e5c6c54bc10270059385c412423cb2466a7ce 100644
--- a/source/Lib/EncoderLib/NALwrite.cpp
+++ b/source/Lib/EncoderLib/NALwrite.cpp
@@ -48,7 +48,7 @@ static const uint8_t emulation_prevention_three_byte = 3;
void writeNalUnitHeader(ostream& out, OutputNALUnit& nalu) // nal_unit_header()
{
-OutputBitstream bsNALUHeader;
+ OutputBitstream bsNALUHeader;
int forbiddenZero = 0;
bsNALUHeader.write(forbiddenZero, 1); // forbidden_zero_bit
int nuhReservedZeroBit = 0;
diff --git a/source/Lib/EncoderLib/RateCtrl.cpp b/source/Lib/EncoderLib/RateCtrl.cpp
index 1717ede87d7199d4770392a363150cdd6cf61898..0e33acb633a8223f5ee920a26770bf68fd5106b0 100644
--- a/source/Lib/EncoderLib/RateCtrl.cpp
+++ b/source/Lib/EncoderLib/RateCtrl.cpp
@@ -402,120 +402,117 @@ void EncRCGOP::create( EncRCSeq* encRCSeq, int numPic )
}
else if (encRCSeq->getAdaptiveBits() == 2 && encRCSeq->getGOPSize() == 16 ) // for GOP size = 16, random access case
{
- {
- const double qdfParaLev2A = 0.5847;
- const double qdfParaLev2B = -0.0782;
- const double qdfParaLev3A = 0.5468;
- const double qdfParaLev3B = -0.1364;
- const double qdfParaLev4A = 0.6539;
- const double qdfParaLev4B = -0.203;
- const double qdfParaLev5A = 0.8623;
- const double qdfParaLev5B = -0.4676;
- double qdfLev1Lev2 = Clip3(0.12, 0.9, qdfParaLev2A * encRCSeq->getPicPara(2).m_skipRatio + qdfParaLev2B);
- double qdfLev1Lev3 = Clip3(0.13, 0.9, qdfParaLev3A * encRCSeq->getPicPara(3).m_skipRatio + qdfParaLev3B);
- double qdfLev1Lev4 = Clip3(0.15, 0.9, qdfParaLev4A * encRCSeq->getPicPara(4).m_skipRatio + qdfParaLev4B);
- double qdfLev1Lev5 = Clip3(0.20, 0.9, qdfParaLev5A * encRCSeq->getPicPara(5).m_skipRatio + qdfParaLev5B);
- double qdfLev2Lev3 = Clip3(0.09, 0.9, qdfLev1Lev3 * (1 - qdfLev1Lev2));
- double qdfLev2Lev4 = Clip3(0.12, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev2));
- double qdfLev2Lev5 = Clip3(0.14, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev2));
- double qdfLev3Lev4 = Clip3(0.06, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev3));
- double qdfLev3Lev5 = Clip3(0.09, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev3));
- double qdfLev4Lev5 = Clip3(0.10, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev4));
-
- double lambdaLev1 = 1 / (1 + 2 * (qdfLev1Lev2 + 2 * qdfLev1Lev3 + 4 * qdfLev1Lev4 + 8 * qdfLev1Lev5));
- double lambdaLev2 = 1 / (1 + (3 * qdfLev2Lev3 + 5 * qdfLev2Lev4 + 8 * qdfLev2Lev5));
- double lambdaLev3 = 1 / (1 + 2 * qdfLev3Lev4 + 4 * qdfLev3Lev5);
- double lambdaLev4 = 1 / (1 + 2 * qdfLev4Lev5);
- double lambdaLev5 = 1 / (1.0);
-
- lambdaRatio[0] = 1.0;
- lambdaRatio[1] = lambdaLev2 / lambdaLev1;
- lambdaRatio[2] = lambdaLev3 / lambdaLev1;
- lambdaRatio[3] = lambdaLev4 / lambdaLev1;
- lambdaRatio[4] = lambdaLev5 / lambdaLev1;
- lambdaRatio[5] = lambdaLev5 / lambdaLev1;
- lambdaRatio[6] = lambdaLev4 / lambdaLev1;
- lambdaRatio[7] = lambdaLev5 / lambdaLev1;
- lambdaRatio[8] = lambdaLev5 / lambdaLev1;
- lambdaRatio[9] = lambdaLev3 / lambdaLev1;
- lambdaRatio[10] = lambdaLev4 / lambdaLev1;
- lambdaRatio[11] = lambdaLev5 / lambdaLev1;
- lambdaRatio[12] = lambdaLev5 / lambdaLev1;
- lambdaRatio[13] = lambdaLev4 / lambdaLev1;
- lambdaRatio[14] = lambdaLev5 / lambdaLev1;
- lambdaRatio[15] = lambdaLev5 / lambdaLev1;
- }
+ const double qdfParaLev2A = 0.5847;
+ const double qdfParaLev2B = -0.0782;
+ const double qdfParaLev3A = 0.5468;
+ const double qdfParaLev3B = -0.1364;
+ const double qdfParaLev4A = 0.6539;
+ const double qdfParaLev4B = -0.203;
+ const double qdfParaLev5A = 0.8623;
+ const double qdfParaLev5B = -0.4676;
+ double qdfLev1Lev2 = Clip3(0.12, 0.9, qdfParaLev2A * encRCSeq->getPicPara(2).m_skipRatio + qdfParaLev2B);
+ double qdfLev1Lev3 = Clip3(0.13, 0.9, qdfParaLev3A * encRCSeq->getPicPara(3).m_skipRatio + qdfParaLev3B);
+ double qdfLev1Lev4 = Clip3(0.15, 0.9, qdfParaLev4A * encRCSeq->getPicPara(4).m_skipRatio + qdfParaLev4B);
+ double qdfLev1Lev5 = Clip3(0.20, 0.9, qdfParaLev5A * encRCSeq->getPicPara(5).m_skipRatio + qdfParaLev5B);
+ double qdfLev2Lev3 = Clip3(0.09, 0.9, qdfLev1Lev3 * (1 - qdfLev1Lev2));
+ double qdfLev2Lev4 = Clip3(0.12, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev2));
+ double qdfLev2Lev5 = Clip3(0.14, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev2));
+ double qdfLev3Lev4 = Clip3(0.06, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev3));
+ double qdfLev3Lev5 = Clip3(0.09, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev3));
+ double qdfLev4Lev5 = Clip3(0.10, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev4));
+
+ double lambdaLev1 = 1 / (1 + 2 * (qdfLev1Lev2 + 2 * qdfLev1Lev3 + 4 * qdfLev1Lev4 + 8 * qdfLev1Lev5));
+ double lambdaLev2 = 1 / (1 + (3 * qdfLev2Lev3 + 5 * qdfLev2Lev4 + 8 * qdfLev2Lev5));
+ double lambdaLev3 = 1 / (1 + 2 * qdfLev3Lev4 + 4 * qdfLev3Lev5);
+ double lambdaLev4 = 1 / (1 + 2 * qdfLev4Lev5);
+ double lambdaLev5 = 1 / (1.0);
+
+ lambdaRatio[0] = 1.0;
+ lambdaRatio[1] = lambdaLev2 / lambdaLev1;
+ lambdaRatio[2] = lambdaLev3 / lambdaLev1;
+ lambdaRatio[3] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[4] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[5] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[6] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[7] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[8] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[9] = lambdaLev3 / lambdaLev1;
+ lambdaRatio[10] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[11] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[12] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[13] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[14] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[15] = lambdaLev5 / lambdaLev1;
}
else if (encRCSeq->getAdaptiveBits() == 2 && encRCSeq->getGOPSize() == 32 ) // for GOP size = 32, random access case
{
- {
- const double qdfParaLev2A = 0.7534;
- const double qdfParaLev2B = -0.0303;
- const double qdfParaLev3A = 0.7044;
- const double qdfParaLev3B = -0.0445;
- const double qdfParaLev4A = 0.7084;
- const double qdfParaLev4B = -0.1401;
- const double qdfParaLev5A = 0.8844;
- const double qdfParaLev5B = -0.3676;
- const double qdfParaLev6A = 1.2336;
- const double qdfParaLev6B = -0.7511;
-
- double qdfLev1Lev2 = Clip3(0.12, 0.9, qdfParaLev2A * encRCSeq->getPicPara(2).m_skipRatio + qdfParaLev2B);
- double qdfLev1Lev3 = Clip3(0.13, 0.9, qdfParaLev3A * encRCSeq->getPicPara(3).m_skipRatio + qdfParaLev3B);
- double qdfLev1Lev4 = Clip3(0.15, 0.9, qdfParaLev4A * encRCSeq->getPicPara(4).m_skipRatio + qdfParaLev4B);
- double qdfLev1Lev5 = Clip3(0.20, 0.9, qdfParaLev5A * encRCSeq->getPicPara(5).m_skipRatio + qdfParaLev5B);
- double qdfLev1Lev6 = Clip3(0.25, 0.9, qdfParaLev6A * encRCSeq->getPicPara(6).m_skipRatio + qdfParaLev6B);
- double qdfLev2Lev3 = Clip3(0.09, 0.9, qdfLev1Lev3 * (1 - qdfLev1Lev2));
- double qdfLev2Lev4 = Clip3(0.12, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev2));
- double qdfLev2Lev5 = Clip3(0.14, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev2));
- double qdfLev2Lev6 = Clip3(0.16, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev2));
- double qdfLev3Lev4 = Clip3(0.06, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev3));
- double qdfLev3Lev5 = Clip3(0.09, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev3));
- double qdfLev3Lev6 = Clip3(0.10, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev3));
- double qdfLev4Lev5 = Clip3(0.10, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev4));
- double qdfLev4Lev6 = Clip3(0.10, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev4));
- double qdfLev5Lev6 = Clip3(0.12, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev5));
-
- double lambdaLev1 = 1 / (1 + 2 * qdfLev1Lev2 + 4 * qdfLev1Lev3 + 6 * qdfLev1Lev4 + 8 * qdfLev1Lev5 + 10 * qdfLev1Lev6);
- double lambdaLev2 = 1 / (1 + 3 * qdfLev2Lev3 + 5 * qdfLev2Lev4 + 8 * qdfLev2Lev5 + 9 * qdfLev2Lev6);
- double lambdaLev3 = 1 / (1 + 2 * qdfLev3Lev4 + 4 * qdfLev3Lev5 + 6 * qdfLev3Lev6);
- double lambdaLev4 = 1 / (1 + 2 * qdfLev4Lev5 + 4 * qdfLev4Lev6);
- double lambdaLev5 = 1 / (1 + 2 * qdfLev5Lev6);
- double lambdaLev6 = 1 / (1.0);
-
- lambdaRatio[0] = 1.0;
- lambdaRatio[1] = lambdaLev2 / lambdaLev1;
- lambdaRatio[2] = lambdaLev3 / lambdaLev1;
- lambdaRatio[3] = lambdaLev4 / lambdaLev1;
- lambdaRatio[4] = lambdaLev5 / lambdaLev1;
- lambdaRatio[5] = lambdaLev6 / lambdaLev1;
- lambdaRatio[6] = lambdaLev6 / lambdaLev1;
- lambdaRatio[7] = lambdaLev5 / lambdaLev1;
- lambdaRatio[8] = lambdaLev6 / lambdaLev1;
- lambdaRatio[9] = lambdaLev6 / lambdaLev1;
- lambdaRatio[10] = lambdaLev4 / lambdaLev1;
- lambdaRatio[11] = lambdaLev5 / lambdaLev1;
- lambdaRatio[12] = lambdaLev6 / lambdaLev1;
- lambdaRatio[13] = lambdaLev6 / lambdaLev1;
- lambdaRatio[14] = lambdaLev5 / lambdaLev1;
- lambdaRatio[15] = lambdaLev6 / lambdaLev1;
- lambdaRatio[16] = lambdaLev6 / lambdaLev1;
- lambdaRatio[17] = lambdaLev3 / lambdaLev1;
- lambdaRatio[18] = lambdaLev4 / lambdaLev1;
- lambdaRatio[19] = lambdaLev5 / lambdaLev1;
- lambdaRatio[20] = lambdaLev6 / lambdaLev1;
- lambdaRatio[21] = lambdaLev6 / lambdaLev1;
- lambdaRatio[22] = lambdaLev5 / lambdaLev1;
- lambdaRatio[23] = lambdaLev6 / lambdaLev1;
- lambdaRatio[24] = lambdaLev6 / lambdaLev1;
- lambdaRatio[25] = lambdaLev4 / lambdaLev1;
- lambdaRatio[26] = lambdaLev5 / lambdaLev1;
- lambdaRatio[27] = lambdaLev6 / lambdaLev1;
- lambdaRatio[28] = lambdaLev6 / lambdaLev1;
- lambdaRatio[29] = lambdaLev5 / lambdaLev1;
- lambdaRatio[30] = lambdaLev6 / lambdaLev1;
- lambdaRatio[31] = lambdaLev6 / lambdaLev1;
- }
+ const double qdfParaLev2A = 0.7534;
+ const double qdfParaLev2B = -0.0303;
+ const double qdfParaLev3A = 0.7044;
+ const double qdfParaLev3B = -0.0445;
+ const double qdfParaLev4A = 0.7084;
+ const double qdfParaLev4B = -0.1401;
+ const double qdfParaLev5A = 0.8844;
+ const double qdfParaLev5B = -0.3676;
+ const double qdfParaLev6A = 1.2336;
+ const double qdfParaLev6B = -0.7511;
+
+ double qdfLev1Lev2 = Clip3(0.12, 0.9, qdfParaLev2A * encRCSeq->getPicPara(2).m_skipRatio + qdfParaLev2B);
+ double qdfLev1Lev3 = Clip3(0.13, 0.9, qdfParaLev3A * encRCSeq->getPicPara(3).m_skipRatio + qdfParaLev3B);
+ double qdfLev1Lev4 = Clip3(0.15, 0.9, qdfParaLev4A * encRCSeq->getPicPara(4).m_skipRatio + qdfParaLev4B);
+ double qdfLev1Lev5 = Clip3(0.20, 0.9, qdfParaLev5A * encRCSeq->getPicPara(5).m_skipRatio + qdfParaLev5B);
+ double qdfLev1Lev6 = Clip3(0.25, 0.9, qdfParaLev6A * encRCSeq->getPicPara(6).m_skipRatio + qdfParaLev6B);
+ double qdfLev2Lev3 = Clip3(0.09, 0.9, qdfLev1Lev3 * (1 - qdfLev1Lev2));
+ double qdfLev2Lev4 = Clip3(0.12, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev2));
+ double qdfLev2Lev5 = Clip3(0.14, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev2));
+ double qdfLev2Lev6 = Clip3(0.16, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev2));
+ double qdfLev3Lev4 = Clip3(0.06, 0.9, qdfLev1Lev4 * (1 - qdfLev1Lev3));
+ double qdfLev3Lev5 = Clip3(0.09, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev3));
+ double qdfLev3Lev6 = Clip3(0.10, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev3));
+ double qdfLev4Lev5 = Clip3(0.10, 0.9, qdfLev1Lev5 * (1 - qdfLev1Lev4));
+ double qdfLev4Lev6 = Clip3(0.10, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev4));
+ double qdfLev5Lev6 = Clip3(0.12, 0.9, qdfLev1Lev6 * (1 - qdfLev1Lev5));
+
+ double lambdaLev1 =
+ 1 / (1 + 2 * qdfLev1Lev2 + 4 * qdfLev1Lev3 + 6 * qdfLev1Lev4 + 8 * qdfLev1Lev5 + 10 * qdfLev1Lev6);
+ double lambdaLev2 = 1 / (1 + 3 * qdfLev2Lev3 + 5 * qdfLev2Lev4 + 8 * qdfLev2Lev5 + 9 * qdfLev2Lev6);
+ double lambdaLev3 = 1 / (1 + 2 * qdfLev3Lev4 + 4 * qdfLev3Lev5 + 6 * qdfLev3Lev6);
+ double lambdaLev4 = 1 / (1 + 2 * qdfLev4Lev5 + 4 * qdfLev4Lev6);
+ double lambdaLev5 = 1 / (1 + 2 * qdfLev5Lev6);
+ double lambdaLev6 = 1 / (1.0);
+
+ lambdaRatio[0] = 1.0;
+ lambdaRatio[1] = lambdaLev2 / lambdaLev1;
+ lambdaRatio[2] = lambdaLev3 / lambdaLev1;
+ lambdaRatio[3] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[4] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[5] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[6] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[7] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[8] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[9] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[10] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[11] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[12] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[13] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[14] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[15] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[16] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[17] = lambdaLev3 / lambdaLev1;
+ lambdaRatio[18] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[19] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[20] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[21] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[22] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[23] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[24] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[25] = lambdaLev4 / lambdaLev1;
+ lambdaRatio[26] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[27] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[28] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[29] = lambdaLev5 / lambdaLev1;
+ lambdaRatio[30] = lambdaLev6 / lambdaLev1;
+ lambdaRatio[31] = lambdaLev6 / lambdaLev1;
}
else
{
@@ -1235,7 +1232,7 @@ double EncRCPic::calAverageLambda()
{
totalSSE += m_LCUs[i].m_actualSSE;
totalPixels += m_LCUs[i].m_numberOfPixel;
- }
+ }
}
}