Changeset 481 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

Timestamp:

19 Jun 2013, 14:46:47 (11 years ago)

Author:

tech

Message:

Bug fixes related to not correctly initialized slice at encoder.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -177 +177 @@
  */
 #if H_3D_GEN
-Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS )
+Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, Int layerId )
 #else
 Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS )
@@ -186 +186 @@
   
   rpcSlice = pcPic->getSlice(0);
-#if H_3D_GEN
+#if H_3D_GEN 
+  // GT: Should also be activated for MV-HEVC at some stage
   rpcSlice->setVPS( pVPS );
+  Int vpsLayerId = pVPS->getLayerIdInNuh( layerId ); 
+
+  rpcSlice->setLayerId     ( layerId );
+  rpcSlice->setViewId      ( pVPS->getViewId      ( vpsLayerId ) );    
+  rpcSlice->setViewIndex   ( pVPS->getViewIndex   ( vpsLayerId ) );
+  rpcSlice->setIsDepth     ( pVPS->getDepthId     ( vpsLayerId ) != 0 );    
 #endif
   rpcSlice->setSPS( pSPS );