Changeset 443 in 3DVCSoftware for trunk/source/App/TAppDecoder

Timestamp:

26 May 2013, 15:41:34 (11 years ago)

Author:

tech

Message:

• Reintegrated branch 6.2-dev0 rev. 442.
• Changed version number.
• Added coding results.

Location:

trunk/source/App/TAppDecoder

Files:

• TAppDecTop.cpp (modified) (2 diffs)
• TAppDecTop.h (modified) (1 diff)

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -735 +735 @@
 
 #if MERL_VSP_C0152
-Void TAppDecTop::setBWVSPLUT(TComSlice* pcSlice,  Int iCodedViewIdx,  Int iCurPoc)
+Void TAppDecTop::setBWVSPLUT(
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+    Int iNeighborViewId,
+#endif
+    TComSlice* pcSlice,  Int iCodedViewIdx,  Int iCurPoc)
+
 {
   //first view does not have VSP 
@@ -742 +747 @@
   AOT( iCodedViewIdx <= 0);
   //AOT( iCodedViewIdx >= m_iNumberOfViews );
+#if !MERL_VSP_NBDV_RefVId_Fix_D0166
   Int iNeighborViewId = 0;
+#endif
   //  Int* piShiftLUT = bRenderFromLeft ? m_cCamParsCollector.getBaseViewShiftLUTI()[iCodedViewIdx][iNeighborViewId][0] : m_cCamParsCollector.getBaseViewShiftLUTI()[iNeighborViewId][iCodedViewIdx][0];
   Int* piShiftLUT = m_cCamParsCollector.getBaseViewShiftLUTI()[iNeighborViewId][iCodedViewIdx][0];
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+  pcSlice->setBWVSPLUTParam(piShiftLUT, 2-LOG2_DISP_PREC_LUT, iNeighborViewId );
+#else
   pcSlice->setBWVSPLUTParam(piShiftLUT, 2-LOG2_DISP_PREC_LUT );
+#endif
 }
 #endif

trunk/source/App/TAppDecoder/TAppDecTop.h

@@ -113 +113 @@
 
 #if MERL_VSP_C0152
+#if MERL_VSP_NBDV_RefVId_Fix_D0166
+  Void  setBWVSPLUT( Int iNeighborViewId, TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc );
+#else
   Void  setBWVSPLUT( TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc   );
+#endif
 #endif