Changeset 688 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.h

Timestamp:

17 Apr 2014, 04:52:55 (11 years ago)

Author:

samsung

Message:

JCTVC-Q0200 is integrated. Related macro "Q0200_CONFORMANCE_BL_SIZE"

File:

• branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibCommon/TComPrediction.h

@@ -121 +121 @@
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT
-  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );
+  Void upsampleBasePic( TComSlice* currSlice, UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window
+#if Q0200_CONFORMANCE_BL_SIZE
+, const Window confBL
+#endif
+, Bool phaseAlignFlag );
 #else
   Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, Bool phaseAlignFlag );