Changeset 946 in SHVCSoftware for branches/SHM-upgrade/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

31 Dec 2014, 07:41:23 (10 years ago)

Author:

seregin

Message:

fix to the ticket #40

File:

• branches/SHM-upgrade/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1378 +1378 @@
             }
 #endif
+#if O0215_PHASE_ALIGNMENT_REMOVAL
+            m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pBaseColRec, pcPic->getPicYuvRec() );
+#else
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT
@@ -1408 +1411 @@
 #else
             m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), scalEL );
+#endif
 #endif
 #endif