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

Timestamp:

6 Jun 2014, 19:53:43 (11 years ago)

Author:

seregin

Message:

remove VPS_EXTNS

Location:

branches/SHM-6-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncCavlc.h (modified) (1 diff)

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

@@ -799 +799 @@
     }
   }
-#if VPS_EXTNS
+#if SVC_EXTENSION
   // When MaxLayersMinus1 is greater than 0, vps_extension_flag shall be equal to 1.
   if( pcVPS->getMaxLayers() > 1 )
@@ -833 +833 @@
 
 #if SVC_EXTENSION
-#if VPS_EXTNS
 Void TEncCavlc::codeVPSExtension (TComVPS *vps)
 {
@@ -1326 +1325 @@
 #endif // 0109_MOVE_VPS_FLAG
 }
-#endif
+
 #if REPN_FORMAT_IN_VPS
 Void  TEncCavlc::codeRepFormat( RepFormat *repFormat )

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

@@ -160 +160 @@
 
 #if SPS_EXTENSION
-  Void codeSPSExtension         ( TComSPS* pcSPS );
-#if VPS_EXTNS
-  Void  codeVPSExtension        ( TComVPS* pcVPS );
-#endif
+  Void codeSPSExtension        ( TComSPS* pcSPS );
+  Void codeVPSExtension        ( TComVPS* pcVPS );
 #if VPS_VUI
-  Void codeVPSVUI               (TComVPS *vps);
+  Void codeVPSVUI              (TComVPS *vps);
 #endif
 #if REPN_FORMAT_IN_VPS
-  Void  codeRepFormat           ( RepFormat *repFormat );
+  Void  codeRepFormat          ( RepFormat *repFormat );
 #endif
 #if VPS_DPB_SIZE_TABLE
-  Void  codeVpsDpbSizeTable      (TComVPS *vps);
+  Void  codeVpsDpbSizeTable    (TComVPS *vps);
 #endif
 #if Q0048_CGS_3D_ASYMLUT