Changeset 1109 in 3DVCSoftware for branches/HTM-12.2-dev2-HHI/source

Timestamp:

6 Nov 2014, 21:11:53 (10 years ago)

Author:

tech

Message:

HHI_VPS_3D_EXTENSION_I3_J0107: Vps3dExtension

Location:

branches/HTM-12.2-dev2-HHI/source/Lib

Files:

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

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TypeDef.h

@@ -297 +297 @@
 #define HHI_DEPENDENCY_SIGNALLING_I1_J0107     1
 #define HHI_TOOL_PARAMETERS_I2_J0107           1
+#define HHI_VPS_3D_EXTENSION_I3_J0107          1
 #endif
 #define H_MV_FIX_REF_LAYER_PIC_FLAG            1

branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1194 +1194 @@
     {
 #if H_3D
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+      READ_FLAG( uiCode,  "vps_3d_extension_flag" );
+      if ( uiCode )
+      {
+        m_pcBitstream->readOutTrailingBits();
+        pcVPS->createCamPars(pcVPS->getNumViews());
+        parseVPS3dExtension( pcVPS );   
+      }
+      READ_FLAG( uiCode,  "vps_extension3_flag" );
+      if (uiCode)
+      {      
+#else
       m_pcBitstream->readOutTrailingBits();
       pcVPS->createCamPars(pcVPS->getNumViews());
@@ -1200 +1212 @@
       if (uiCode)
       {      
+#endif
 #endif
 #endif  
@@ -1877 +1890 @@
 
 #if H_3D
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+Void TDecCavlc::parseVPS3dExtension( TComVPS* pcVPS )
+#else
 Void TDecCavlc::parseVPSExtension2( TComVPS* pcVPS )
+#endif
 {
   UInt uiCode; 

branches/HTM-12.2-dev2-HHI/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -90 +90 @@
 #endif
 #if H_3D
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+  Void  parseVPS3dExtension  ( TComVPS* pcVPS ); 
+#else
   Void  parseVPSExtension2  ( TComVPS* pcVPS ); 
+#endif
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Void  parseSPS3dExtension ( TComSPS* pcSPS );

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1007 +1007 @@
   codeVPSExtension( pcVPS );                           
 #if H_3D
-  WRITE_FLAG( 1,                     "vps_extension2_flag" );
+  WRITE_FLAG( 1,                     "vps_extension2_flag" );  
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+  WRITE_FLAG( 1,                     "vps_3d_extension_flag" );
+  m_pcBitIf->writeAlignOne();      
+  codeVPS3dExtension( pcVPS ); 
+#else
   m_pcBitIf->writeAlignOne();      
   codeVPSExtension2( pcVPS ); 
+#endif
   WRITE_FLAG( 0,                     "vps_extension3_flag" );
 #else
@@ -1613 +1619 @@
 
 #if H_3D
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+Void TEncCavlc::codeVPS3dExtension( TComVPS* pcVPS )
+#else
 Void TEncCavlc::codeVPSExtension2( TComVPS* pcVPS )
+#endif
 { 
 #if !HHI_TOOL_PARAMETERS_I2_J0107

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncCavlc.h

@@ -99 +99 @@
 #endif
 #if H_3D
+#if HHI_VPS_3D_EXTENSION_I3_J0107
+  Void  codeVPS3dExtension       ( TComVPS* pcVPS ); 
+#else
   Void  codeVPSExtension2       ( TComVPS* pcVPS ); 
+#endif
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Void  codeSPS3dExtension      ( TComSPS* pcSPS );