Changeset 1466 in SHVCSoftware for branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

26 Aug 2015, 19:24:11 (9 years ago)

Author:

seregin

Message:

initialization for CRI. Patch-by: Hiron Franck <franck.hiron@…>

File:

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

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

@@ -1379 +1379 @@
   if ( m_pcPicYuvColourRemapped == NULL )
   {
-    const ChromaFormat chromaFormatIDC = activeSPS.getChromaFormatIdc();
-    const Int          iWidth          = activeSPS.getPicWidthInLumaSamples();
-    const Int          iHeight         = activeSPS.getPicHeightInLumaSamples();
+    const ChromaFormat chromaFormatIDC = pic.getChromaFormat(); 
+    const Int          iWidth          = pic.getWidth(COMPONENT_Y);
+    const Int          iHeight         = pic.getHeight(COMPONENT_Y);
     const UInt         uiMaxCuWidth    = activeSPS.getMaxCUWidth();
     const UInt         uiMaxCuHeight   = activeSPS.getMaxCUHeight();
@@ -1416 +1416 @@
     YUVOut[COMPONENT_Cr] = m_pcPicYuvColourRemapped->getAddr(COMPONENT_Cr);
 
-    Int bitDepthY = activeSPS.getBitDepth(CHANNEL_TYPE_LUMA);
-    assert(bitDepthY == activeSPS.getBitDepth(CHANNEL_TYPE_CHROMA)); // Different bitdepth is not implemented
+    Int bitDepth = criSEI.m_colourRemapBitDepth;
+    BitDepths bitDepthsCriFile;
+    bitDepthsCriFile.recon[CHANNEL_TYPE_LUMA] = bitDepth;
+    bitDepthsCriFile.recon[CHANNEL_TYPE_CHROMA] = bitDepth; // Different bitdepth is not implemented
 
     const Int postOffsetShift = criSEI.m_log2MatrixDenom;
@@ -1447 +1449 @@
 
     // rescaling output: include CRI/output frame difference
-    const Int scaleShiftOut_neg = abs(bitDepthY - maxBitDepth);
+    const Int scaleShiftOut_neg = abs(bitDepth - maxBitDepth);
     const Int scaleOut_round = 1 << (scaleShiftOut_neg-1);
 
@@ -1493 +1495 @@
     }
     //Write remapped picture in display order
-    m_pcPicYuvColourRemapped->dump( m_colourRemapSEIFileName, activeSPS.getBitDepths(), !firstPicture );
+    m_pcPicYuvColourRemapped->dump( m_colourRemapSEIFileName, bitDepthsCriFile, !firstPicture );
   }
 }