Changeset 858 in 3DVCSoftware

Timestamp:

1 Mar 2014, 00:45:51 (11 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@…>

Location:

branches/HTM-10.0-dev0/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -333 +333 @@
 // #define H_MV_HLS_7_ED_FIX_P0130_34        0 // (ED.FIX/P0130/il ref pic set no reference pic) #34 For proposal 5, delegated to editors
 // #define H_MV_HLS_7_OTHER_P0187_1          0 // (OTHER/P0187/NoOutputOfPriorPicsFlag) #1 Inference of NoOutputOfPriorPicsFlag and proposes to take into account colour format and bit depth for the inference in addition to spatial resolution 
-// #define H_MV_HLS_7_VPS_P0306_22           0 // (VPS/P0306/ue(v) coded syntax elements) #22 Several minor modifications to the VPS syntax, consistent with eliminating the previous intention to avoid ue(v) parsing in the VPS 
+#define H_MV_HLS_7_VPS_P0306_22           0 // (VPS/P0306/ue(v) coded syntax elements) #22 Several minor modifications to the VPS syntax, consistent with eliminating the previous intention to avoid ue(v) parsing in the VPS 
 // #define H_MV_HLS_7_SEI_P0133_28           0 // (SEI/P0133/Recovery point SEI) #28 Decision: Adopt change to recover point semantics only (-v3)
 #define H_MV_HLS_7_VPS_P0125_24           1 // (VPS/P0125/VPS extension offset ) #24 Decision: Keep it as a reserved FFFF value. 

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
       }
     }

branches/HTM-10.0-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1133 +1133 @@
 #endif
 
-#if !H_MV_HLS7_GEN
+#if !H_MV_HLS_7_VPS_P0306_22
   WRITE_CODE( pcVPS->getVpsNumProfileTierLevelMinus1( ), 6,     "vps_num_profile_tier_level_minus1" );
 #else
@@ -1256 +1256 @@
   if ( pcVPS->getRepFormatIdxPresentFlag() )
   {
-#if H_MV_HLS7_GEN
+#if H_MV_HLS_7_VPS_P0306_22
     WRITE_UVLC( pcVPS->getVpsNumRepFormatsMinus1( ), "vps_num_rep_formats_minus1" );
 #else
@@ -1276 +1276 @@
       if( pcVPS->getVpsNumRepFormatsMinus1() > 0 )
       {
+#if H_MV_HLS_7_VPS_P0306_22
+        Int numBits = 1;
+        while ((1 << numBits) < (pcVPS->getVpsNumRepFormatsMinus1() + 1))
+        {
+          numBits++;
+        }
+        WRITE_CODE( pcVPS->getVpsRepFormatIdx(i), numBits, "vps_rep_format_idx[i]" );
+#else
         WRITE_CODE( pcVPS->getVpsRepFormatIdx( i ), 8, "vps_rep_format_idx" );
+#endif
       }
     }