Changeset 1265 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

14 Jul 2015, 03:43:14 (10 years ago)

Author:

seregin

Message:

port rev 4262

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -385 +385 @@
               UInt tableSizeMinus1 = 0;
               READ_UVLC(tableSizeMinus1, "chroma_qp_offset_list_len_minus1");
-              /* skip zero index */
-              for (Int chromaQpAdjustmentIndex = 1; chromaQpAdjustmentIndex <= (tableSizeMinus1 + 1); chromaQpAdjustmentIndex++)
+              assert(tableSizeMinus1 < MAX_QP_OFFSET_LIST_SIZE);
+
+              for (Int cuChromaQpOffsetIdx = 0; cuChromaQpOffsetIdx <= (tableSizeMinus1); cuChromaQpOffsetIdx++)
               {
                 Int cbOffset;
@@ -394 +395 @@
                 READ_SVLC(crOffset, "cr_qp_offset_list[i]");
                 assert(crOffset >= -12 && crOffset <= 12);
-                pcPPS->setChromaQpAdjTableAt(chromaQpAdjustmentIndex, cbOffset, crOffset);
+                // table uses +1 for index (see comment inside the function)
+                pcPPS->setChromaQpAdjTableAt(cuChromaQpOffsetIdx+1, cbOffset, crOffset);
               }
               assert(pcPPS->getChromaQpAdjTableSize() == tableSizeMinus1 + 1);