Changeset 363 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib

Timestamp:

3 May 2013, 15:59:14 (12 years ago)

Author:

tech

Message:

Fixed wrongly merged parts.

Location:

branches/HTM-DEV-0.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncCfg.h (modified) (1 diff)
• TLibEncoder/TEncGOP.h (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -421 +421 @@
 
 #if H_MV
-Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr,std::vector<TComPic*>& refPicSetInterLayer )
+Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& refPicSetInterLayer , Bool checkNumPocTotalCurr)
 #else
 #if FIX1071

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1584 +1584 @@
 #endif
 #if H_MV
-  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false , std::vector<TComPic*>& interLayerRefPicSet );
+  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& interLayerRefPicSet , Bool checkNumPocTotalCurr = false );
 #else
 #if FIX1071

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -591 +591 @@
     // Set reference list
 #if H_MV    
-    pcSlice->setRefPicList( m_cListPic, true, m_refPicSetInterLayer );    
+    pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );    
 #else
 #if FIX1071
@@ -782 +782 @@
     case NAL_UNIT_CODED_SLICE_RASL_N:
     case NAL_UNIT_CODED_SLICE_RASL_R:
+#if H_MV
+      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag);
+#else
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
+#endif
       break;
     default:

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -97 +97 @@
 #if H_MV
     ::memset( m_interViewRefs,   0, sizeof(m_interViewRefs) );
-    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );#endif
+    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );
+#endif
   }
 };

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h

@@ -211 +211 @@
   }
 #endif
+#endif
 #if H_MV
    Void  xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid );