Changeset 627 in SHVCSoftware for branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

12 Mar 2014, 22:06:13 (11 years ago)

Author:

qualcomm

Message:

JCTVC-P312: vertical phase adjustment for interlace-to-progressive scalability, from Jianle Chen (cjianle@…)

File:

• branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1467 +1467 @@
 #endif
 
+#if P0312_VERT_PHASE_ADJ
+#if O0098_SCALED_REF_LAYER_ID
+        Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc));
+#else
+        Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
+#endif
+#else
 #if O0098_SCALED_REF_LAYER_ID
         const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc));
 #else
         const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
+#endif
 #endif
 
@@ -1493 +1501 @@
           Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
 #endif*/
+#if P0312_VERT_PHASE_ADJ
+          scalEL.setVertPhasePositionFlag (pcSlice->getVertPhasePositionFlag(i));
+#endif
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT