Changeset 869 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibEncoder

Timestamp:

25 Mar 2014, 17:20:55 (11 years ago)

Author:

tech

Message:

Minor fixes.

Location:

branches/HTM-10.0-dev0/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (1 diff)

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

@@ -270 +270 @@
   WRITE_FLAG( pcPPS->getListsModificationPresentFlag(), "lists_modification_present_flag");
   WRITE_UVLC( pcPPS->getLog2ParallelMergeLevelMinus2(), "log2_parallel_merge_level_minus2");
-#if PPS_FIX_DEPTH
-  if( pcPPS->getSPS()->getVPS()->getDepthId(pcPPS->getSPS()->getLayerId()) )
-  {
-    WRITE_FLAG( 1, "slice_segment_header_extension_present_flag" );
-  }
-  else
-#endif
   WRITE_FLAG( pcPPS->getSliceHeaderExtensionPresentFlag() ? 1 : 0, "slice_segment_header_extension_present_flag");
 
@@ -1277 +1270 @@
       {
 #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]" );
+        WRITE_CODE( pcVPS->getVpsRepFormatIdx(i), pcVPS->getVpsRepFormatIdxLen(), "vps_rep_format_idx[i]" );
 #else
         WRITE_CODE( pcVPS->getVpsRepFormatIdx( i ), 8, "vps_rep_format_idx" );

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

@@ -942 +942 @@
     }
   }
-#if H_3D
-  if( m_cVPS->hasCamParInSliceHeader( getViewIndex() ) )
-  {
-    m_cPPS.setSliceHeaderExtensionPresentFlag( true ); 
-  }
-#endif
 }