Changeset 1124 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncEntropy.h

Timestamp:

10 Nov 2014, 12:22:20 (9 years ago)

Author:

tech

Message:

Merged branch 12.2-dev0@1123

File:

• trunk/source/Lib/TLibEncoder/TEncEntropy.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncEntropy.h

@@ -69 +69 @@
 
   virtual Void  codeVPS                 ( TComVPS* pcVPS )                                      = 0;
+#if HHI_TOOL_PARAMETERS_I2_J0107
+  virtual Void  codeSPS                 ( TComSPS* pcSPS )                                      = 0;
+#else
 #if !H_3D
   virtual Void  codeSPS                 ( TComSPS* pcSPS )                                      = 0;
 #else
   virtual Void  codeSPS                 ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag )       = 0;
+#endif
 #endif
   virtual Void  codePPS                 ( TComPPS* pcPPS )                                      = 0;
@@ -165 +169 @@
   Void encodeVPS               ( TComVPS* pcVPS);
   // SPS
+#if HHI_TOOL_PARAMETERS_I2_J0107
+  Void encodeSPS               ( TComSPS* pcSPS );
+#else
 #if H_3D
   Void encodeSPS               ( TComSPS* pcSPS, Int viewIndex, Bool depthFlag );
 #else
   Void encodeSPS               ( TComSPS* pcSPS );
+#endif
 #endif
   Void encodePPS               ( TComPPS* pcPPS );