Changeset 71 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder

Timestamp:

5 Jun 2012, 04:47:14 (13 years ago)

Author:

vidyo

Message:

additional changes to make decoder use VPS parameters

Location:

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (2 diffs)
• TEncSlice.h (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -395 +395 @@
     WRITE_UVLC( pcVPS->getExtensionType(),                        "extension_type" );
     
-    if( pcVPS->getExtensionType() == 0)
-      WRITE_SVLC( pcVPS->getViewOrderIdx(0),                      "view_order_idx[0]" );
-    
-    for(UInt i=0; i <= pcVPS->getMaxLayers()-1; i++)
+    for(UInt i=1; i <= pcVPS->getMaxLayers()-1; i++)
     {
       WRITE_FLAG( pcVPS->getDependentFlag(i),                     "dependent_flag[i]" );

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -246 +246 @@
 
       std::vector<TComAPS>& vAPS = m_pcEncTop->getAPS();
+#if VIDYO_VPS_INTEGRATION
+    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
+#else
       m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
+#endif
       pcSlice->setLastIDR(m_iLastIDR);
       pcSlice->setSliceIdx(0);

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -161 +161 @@
  \param pPPS          PPS associated with the slice
  */
+#if VIDYO_VPS_INTEGRATION
+Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS )
+#else
 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS )
+#endif
 {
   Double dQP;
@@ -167 +171 @@
   
   rpcSlice = pcPic->getSlice(0);
+#if VIDYO_VPS_INTEGRATION
+  rpcSlice->setVPS( pVPS );
+#endif
   rpcSlice->setSPS( pSPS );
   rpcSlice->setPPS( pPPS );

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncSlice.h

@@ -110 +110 @@
   
   /// preparation of slice encoding (reference marking, QP and lambda)
+#if VIDYO_VPS_INTEGRATION
+  Void    initEncSlice        ( TComPic*  pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS );
+#else
   Void    initEncSlice        ( TComPic*  pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS );
-
+#endif
   // compress and encode slice
   Void    precompressSlice    ( TComPic*& rpcPic                                );      ///< precompress slice for multi-loop opt.

branches/HTM-3.0-Vidyo/source/Lib/TLibEncoder/TEncTop.cpp

@@ -348 +348 @@
 
 #if DEPTH_MAP_GENERATION
-  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
+#if VIDYO_VPS_INTEGRATION
+  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
+#else
+  m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
+#endif
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED