Changeset 1311 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder

Timestamp:

11 Aug 2015, 17:07:56 (10 years ago)

Author:

tech

Message:

NH_3D_FIX_TICKET_101 Camera parameters for depth layers.

Location:

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (5 diffs)
• TDecTop.h (modified) (1 diff)

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2898 +2898 @@
     {
       Int voiInVps = vps->getVoiInVps( pcSlice->getViewIndex() ); 
+#if NH_3D_FIX_TICKET_101
+      if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) )
+#else
       if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) && !pcSlice->getIsDepth() )
+#endif
       {
         for( Int m = 0; m < vps->getNumCp( voiInVps ); m++ )

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.cpp

@@ -220 +220 @@
 }
 
-Void
-CamParsCollector::setSlice( TComSlice* pcSlice )
+Void CamParsCollector::setSlice( const TComSlice* pcSlice )
 {
   if( pcSlice == 0 )
@@ -292 +291 @@
 
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
 Void
@@ -301 +301 @@
   }
 }
+#endif
 #endif
 
@@ -1258 +1259 @@
   }
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
 #if H_3D_FCO
@@ -1267 +1269 @@
     m_pcCamParsCollector->copyCamParamForSlice( pcSlice );
   }
+#endif
 #endif
   //  Decode a picture

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.h

@@ -76 +76 @@
 
   Void  uninit      ();
-  Void  setSlice    ( TComSlice* pcSlice );
+  Void setSlice ( const TComSlice* pcSlice );
 
   Bool  isInitialized() const     { return m_bInitialized; }
   Int**** getBaseViewShiftLUTI()  { return m_aiBaseViewShiftLUT;   }
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
   Void  copyCamParamForSlice( TComSlice* pcSlice );
 #endif
-
+#endif
 
 private: