Changeset 662 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder

Timestamp:

10 Apr 2014, 02:02:07 (11 years ago)

Author:

sony

Message:

Following two macros are introduced
Q0195_REP_FORMAT_CLEANUP : JCTVC-Q0195 restructureing of rep_format() signaling
REP_FORMAT_FIX : update_rep_format_flag should be inferred to be equal to 0
by ohji.nakagami@…

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1072 +1072 @@
 
 #if REPN_FORMAT_IN_VPS
+#if Q0195_REP_FORMAT_CLEANUP
+  WRITE_UVLC( vps->getVpsNumRepFormats() - 1, "vps_num_rep_formats_minus1" );
+  for(i = 0; i < vps->getVpsNumRepFormats(); i++)
+  {
+    // Write rep_format_structures
+    codeRepFormat( vps->getVpsRepFormat(i) );
+  }
+
+  if ( vps->getVpsNumRepFormats() > 1 )
+    WRITE_FLAG( vps->getRepFormatIdxPresentFlag(), "rep_format_idx_present_flag"); 
+
+  if( vps->getRepFormatIdxPresentFlag() )
+  {
+    for(i = 1; i < vps->getMaxLayers(); i++)
+    {
+      Int numBits = 1;
+      while ((1 << numBits) < (vps->getVpsNumRepFormats()))
+      {
+        numBits++;
+      }
+      WRITE_CODE( vps->getVpsRepFormatIdx(i), numBits, "vps_rep_format_idx[i]" );
+    }
+  }
+#else
   WRITE_FLAG( vps->getRepFormatIdxPresentFlag(), "rep_format_idx_present_flag"); 
 
@@ -1118 +1142 @@
     }
   }
+#endif
 #endif