Changeset 77 in 3DVCSoftware for trunk/source/Lib/TLibRenderer

Timestamp:

14 Jun 2012, 16:38:29 (13 years ago)

Author:

tech

Message:

Merged with branch/HTM-3.0Samsung REV74 including:

• restricted residual prediction m24766
• Inter-view residual prediction m24938
• VPS concept m24714,m24878, m24945,m24896, m2491
• reference list modification, restriction on IDR m24876, m24874
• depth based motion parameter prediction m24829

Fixed bugs:

• interview prediction
• VSO

Added:

• xcode project

File:

• trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp (modified) (2 diffs)

trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp

@@ -214 +214 @@
   AOT( (ppiShiftLutLeft  == NULL) && (m_iMode == 0 || m_iMode == 2) );
   AOT( (ppiShiftLutRight == NULL) && (m_iMode == 1 || m_iMode == 2) );
+#if HHI_FIX
+#else
   AOT( pcOrgVideo != NULL && bKeepReference );
+#endif
 
   m_appiShiftLut[0] = ppiShiftLutLeft;
@@ -222 +225 @@
   m_pcPicYuvRef = pcOrgVideo;
 
+#if HHI_FIX
+  if ( pcOrgVideo && !bKeepReference )
+#else
   if ( pcOrgVideo )
+#endif
   {
     TRenFilter::copy(             pcOrgVideo->getLumaAddr(), pcOrgVideo->getStride() , m_iWidth,      m_iHeight,      m_aapiRefVideoPel[0], m_aiRefVideoStrides[0]);