Changeset 858 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

1 Mar 2014, 00:45:51 (10 years ago)

Author:

qualcomm

Message:

JCTVC-P0306: Coding some fixed-length coded elements in VPS extn as ue(v) and other minor modifications (Macro: H_MV_HLS_7_VPS_P0306_22)

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1329 +1329 @@
 #endif
 
-#if !H_MV_HLS7_GEN
+#if !H_MV_HLS_7_VPS_P0306_22
   READ_CODE( 6,  uiCode, "vps_num_profile_tier_level_minus1" );  pcVPS->setVpsNumProfileTierLevelMinus1( uiCode );
 #else
@@ -1457 +1457 @@
   if ( pcVPS->getRepFormatIdxPresentFlag() )
   {
-#if H_MV_HLS7_GEN
-    READ_UVLC( 4, uiCode, "vps_num_rep_formats_minus1" ); pcVPS->setVpsNumRepFormatsMinus1( uiCode );
+#if H_MV_HLS_7_VPS_P0306_22
+    READ_UVLC( uiCode, "vps_num_rep_formats_minus1" ); pcVPS->setVpsNumRepFormatsMinus1( uiCode );
 #else
     READ_CODE( 4, uiCode, "vps_num_rep_formats_minus1" ); pcVPS->setVpsNumRepFormatsMinus1( uiCode );
@@ -1479 +1479 @@
       if( pcVPS->getVpsNumRepFormatsMinus1() > 0 )
       {
+#if H_MV_HLS_7_VPS_P0306_22
+        Int numBits = 1;
+        while ((1 << numBits) < (pcVPS->getVpsNumRepFormatsMinus1() + 1))
+        {
+          numBits++;
+        }
+        READ_CODE( numBits, uiCode, "vps_rep_format_idx[i]" ); pcVPS->setVpsRepFormatIdx( i, uiCode );
+#else
         READ_CODE( 8, uiCode, "vps_rep_format_idx" ); pcVPS->setVpsRepFormatIdx( i, uiCode );
+#endif
       }
     }