Changeset 250 in SHVCSoftware

Timestamp:

31 May 2013, 09:48:43 (12 years ago)

Author:

seregin

Message:

use refLayerIdc for getting reference layer encoder and decoder

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibDecoder/TDecTop.cpp (modified) (4 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (4 diffs)
• TLibEncoder/TEncTop.h (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -249 +249 @@
     {
 #if VPS_EXTN_DIRECT_REF_LAYERS
-      TDecTop *pcTDecTopBase = (TDecTop *)getRefLayerDec( m_layerId );
+      TDecTop *pcTDecTopBase = (TDecTop *)getRefLayerDec( m_layerId - 1 );
 #else
       TDecTop *pcTDecTopBase = (TDecTop *)getLayerDec( m_layerId-1 );
@@ -832 +832 @@
       {
 #if VPS_EXTN_DIRECT_REF_LAYERS
-        TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( m_layerId );
+        TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( m_layerId - 1 );
 #else
         TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
@@ -1281 +1281 @@
 
 #if VPS_EXTN_DIRECT_REF_LAYERS
-TDecTop* TDecTop::getRefLayerDec( UInt layerId )
+TDecTop* TDecTop::getRefLayerDec( UInt refLayerIdc )
 {
   TComVPS* vps = m_parameterSetManagerDecoder[0].getActiveVPS();
@@ -1299 +1299 @@
 #endif 
   
-  return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, 0 ) );
+  return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, refLayerIdc ) );
 }
 #endif

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -157 +157 @@
   TDecTop*  getLayerDec(UInt layer)     { return m_ppcTDecTop[layer]; }
 #if VPS_EXTN_DIRECT_REF_LAYERS
-  TDecTop*  getRefLayerDec(UInt layerId);
+  TDecTop*  getRefLayerDec(UInt refLayerIdc);
 #endif
 #if AVC_BASE

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -536 +536 @@
     {
 #if VPS_EXTN_DIRECT_REF_LAYERS
-      TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(m_layerId)->getListPic();
+      TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(m_layerId-1)->getListPic();
 #else
       TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId-1]->getListPic();

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -508 +508 @@
       {
 #if VPS_EXTN_DIRECT_REF_LAYERS
-        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
+        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId - 1 );
 #else
         TEncTop *pcEncTopBase = (TEncTop *)getLayerEnc( m_layerId-1 );
@@ -539 +539 @@
       {
 #if VPS_EXTN_DIRECT_REF_LAYERS
-        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
+        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId - 1 );
 #else
         TEncTop *pcEncTopBase = (TEncTop *)getLayerEnc( m_layerId-1 );
@@ -1199 +1199 @@
 #if SVC_EXTENSION
 #if VPS_EXTN_DIRECT_REF_LAYERS
-TEncTop* TEncTop::getRefLayerEnc( UInt layerId )
+TEncTop* TEncTop::getRefLayerEnc( UInt refLayerIdc )
 {
   if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 )
@@ -1213 +1213 @@
   assert( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() == 1 );
 
-  return (TEncTop *)getLayerEnc( getVPS()->getRefLayerId( m_layerId, 0 ) );
+  return (TEncTop *)getLayerEnc( getVPS()->getRefLayerId( m_layerId, refLayerIdc ) );
 }
 #endif

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -231 +231 @@
   Void      encodePrep( TComPicYuv* pcPicYuvOrg );
 #if VPS_EXTN_DIRECT_REF_LAYERS
-  TEncTop*  getRefLayerEnc(UInt layerId);
+  TEncTop*  getRefLayerEnc(UInt refLayerIdc);
 #endif
 #else