Changeset 1365 in 3DVCSoftware for branches/HTM-15.2-dev

Timestamp:

28 Oct 2015, 19:50:26 (9 years ago)

Author:

tech

Message:

Align macros

Location:

branches/HTM-15.2-dev/source/Lib

Files:

• TLibCommon/TComPrediction.cpp (modified) (1 diff)
• TLibDecoder/SEIread.cpp (modified) (2 diffs)
• TLibDecoder/SEIread.h (modified) (2 diffs)
• TLibDecoder/SyntaxElementParser.h (modified) (3 diffs)

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComPrediction.cpp

@@ -1969 +1969 @@
 }
 
-Void TComPrediction::xWeightedAverage( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, Int iRefIdx0, Int iRefIdx1, UInt uiPartIdx, Int iWidth, Int iHeight, TComYuv* pcYuvDst, const BitDepths &clipBitDepths
- )
+Void TComPrediction::xWeightedAverage( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, Int iRefIdx0, Int iRefIdx1, UInt uiPartIdx, Int iWidth, Int iHeight, TComYuv* pcYuvDst, const BitDepths &clipBitDepths )
 {
   if( iRefIdx0 >= 0 && iRefIdx1 >= 0 )

branches/HTM-15.2-dev/source/Lib/TLibDecoder/SEIread.cpp

@@ -311 +311 @@
       xParseSEIMasteringDisplayColourVolume((SEIMasteringDisplayColourVolume&) *sei, payloadSize, pDecodedMessageOutputStream);
       break;
+#if NH_MV
 #if !NH_MV_SEI
     case SEI::SUB_BITSTREAM_PROPERTY:
@@ -395 +396 @@
       xParseSEIAlternativeDepthInfo((SEIAlternativeDepthInfo&) *sei, payloadSize, pDecodedMessageOutputStream );
       break;
+#endif
 #endif
 #endif

branches/HTM-15.2-dev/source/Lib/TLibDecoder/SEIread.h

@@ -102 +102 @@
   Void  xResizeSubBitstreamPropertySeiArrays  (SEISubBitstreamProperty &sei);
 #endif
-#endif
 #if NH_MV_LAYERS_NOT_PRESENT_SEI
   Void xParseSEILayersNotPresent              (SEILayersNotPresent &sei, UInt payloadSize, const TComVPS *vps ,std::ostream *pDecodedMessageOutputStream);
@@ -133 +132 @@
   Void xParseSEIAlternativeDepthInfo          (SEIAlternativeDepthInfo& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);
 #endif
-
+#endif
   Void sei_read_code(std::ostream *pOS, UInt uiLength, UInt& ruiCode, const TChar *pSymbolName);
   Void sei_read_uvlc(std::ostream *pOS,                UInt& ruiCode, const TChar *pSymbolName);

branches/HTM-15.2-dev/source/Lib/TLibDecoder/SyntaxElementParser.h

@@ -49 +49 @@
 #define READ_SVLC(        code, name)     xReadSvlcTr (         code, name )
 #define READ_FLAG(        code, name)     xReadFlagTr (         code, name )
+#if NH_MV
 #define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
-
+#endif
 #else
 
@@ -59 +60 @@
 #define READ_SVLC(        code, name)     xReadSvlc (         code, name )
 #define READ_FLAG(        code, name)     xReadFlag (         code, name )
+#if NH_MV
 #define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length, name )
-
+#endif
 #else
 
@@ -67 +69 @@
 #define READ_SVLC(        code, name)     xReadSvlc (         code )
 #define READ_FLAG(        code, name)     xReadFlag (         code )
+#if NH_MV
 #define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length )
+#endif
 
 #endif