Changeset 1049 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder

Timestamp:

3 Mar 2015, 23:36:18 (10 years ago)

Author:

seregin

Message:

fix the index for m_ppcTEncTop to be layerId

File:

• branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1545 +1545 @@
     for( Int dpbLayerCtr = 0; dpbLayerCtr < dpbStatus.m_numLayers; dpbLayerCtr++)
     {
-      Int layerIdx  = dpbStatus.m_targetDecLayerIdList[dpbLayerCtr];
+      Int layerId = dpbStatus.m_targetDecLayerIdList[dpbLayerCtr];
       // Output all picutres "decoded" in that layer that have POC less than the current picture
-      std::vector<TComPic> *layerBuffer = (m_acTDecTop->getLayerDec(layerIdx))->getConfListPic();
+      std::vector<TComPic> *layerBuffer = (m_acTDecTop->getLayerDec(layerId))->getConfListPic();
       // Write all pictures to the file.
-      if( this->getDecodedYuvLayerRefresh(layerIdx) )
-      {
-        m_outputBitDepth[CHANNEL_TYPE_LUMA]   = g_bitDepth[CHANNEL_TYPE_LUMA]   = g_bitDepthLayer[CHANNEL_TYPE_LUMA][layerIdx];
-        m_outputBitDepth[CHANNEL_TYPE_CHROMA] = g_bitDepth[CHANNEL_TYPE_CHROMA] = g_bitDepthLayer[CHANNEL_TYPE_CHROMA][layerIdx];
+      if( this->getDecodedYuvLayerRefresh(layerId) )
+      {
+        m_outputBitDepth[CHANNEL_TYPE_LUMA]   = g_bitDepth[CHANNEL_TYPE_LUMA]   = g_bitDepthLayer[CHANNEL_TYPE_LUMA][layerId];
+        m_outputBitDepth[CHANNEL_TYPE_CHROMA] = g_bitDepth[CHANNEL_TYPE_CHROMA] = g_bitDepthLayer[CHANNEL_TYPE_CHROMA][layerId];
 
         char tempFileName[256];
-        strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerIdx ).c_str());
-        m_confReconFile[layerIdx].open(tempFileName, true, m_outputBitDepth, m_outputBitDepth, g_bitDepth ); // write mode
-        this->setDecodedYuvLayerRefresh( layerIdx, false );
+        strcpy(tempFileName, this->getDecodedYuvLayerFileName( layerId ).c_str());
+        m_confReconFile[layerId].open(tempFileName, true, m_outputBitDepth, m_outputBitDepth, g_bitDepth ); // write mode
+        this->setDecodedYuvLayerRefresh( layerId, false );
       }
 
@@ -1575 +1575 @@
         {
           TComPicYuv* pPicCYuvRec = checkPic.getPicYuvRec();
-          m_confReconFile[layerIdx].write( pPicCYuvRec, m_outputColourSpaceConvert,
+          m_confReconFile[layerId].write( pPicCYuvRec, m_outputColourSpaceConvert,
             conf.getWindowLeftOffset()  * xScal + defDisp.getWindowLeftOffset(),
             conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),