Changeset 1089 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

25 Jun 2015, 16:19:05 (10 years ago)

Author:

seregin

Message:

Patch provided by Hiron Franck <franck.hiron@…> to complete implementation of the CRI (Colour remapping info) with the following features:

• Management of SEI-CRI messages per picture
• Management of the persistence of the colour remapping information (parameter “colour_remap_persistence_flag”)
• Output the remapping picture in display order
• Maintains the HM like mode (#define SVC_EXTENSION 0)

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• SEI.cpp (modified) (1 diff)
• SEI.h (modified) (1 diff)
• TComPicYuv.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp

@@ -169 +169 @@
   }
 }
+
+#if Q0074_COLOUR_REMAPPING_SEI
+Void  SEIColourRemappingInfo::copyFrom( SEIColourRemappingInfo const * SeiCriInput)
+{
+  m_colourRemapId                         = SeiCriInput->m_colourRemapId;
+  m_colourRemapCancelFlag                 = SeiCriInput->m_colourRemapCancelFlag;
+  m_colourRemapPersistenceFlag            = SeiCriInput->m_colourRemapPersistenceFlag;
+  m_colourRemapVideoSignalInfoPresentFlag = SeiCriInput->m_colourRemapVideoSignalInfoPresentFlag;
+  m_colourRemapFullRangeFlag              = SeiCriInput->m_colourRemapFullRangeFlag;
+  m_colourRemapPrimaries                  = SeiCriInput->m_colourRemapPrimaries;
+  m_colourRemapTransferFunction           = SeiCriInput->m_colourRemapTransferFunction;
+  m_colourRemapMatrixCoefficients         = SeiCriInput->m_colourRemapMatrixCoefficients;
+  m_colourRemapInputBitDepth              = SeiCriInput->m_colourRemapInputBitDepth;
+  m_colourRemapBitDepth                   = SeiCriInput->m_colourRemapBitDepth;
+
+  for( Int c=0 ; c<3 ; c++ )
+  {
+    m_preLutNumValMinus1[c] = SeiCriInput->m_preLutNumValMinus1[c];
+    m_preLutCodedValue[c].resize(m_preLutNumValMinus1[c]+1);
+    m_preLutTargetValue[c].resize(m_preLutNumValMinus1[c]+1);
+    for ( Int i=0 ; i <= SeiCriInput->m_preLutNumValMinus1[c] ; i++ )
+    {
+        m_preLutCodedValue[c][i]   = SeiCriInput->m_preLutCodedValue[c][i];
+        m_preLutTargetValue[c][i]  = SeiCriInput->m_preLutTargetValue[c][i];
+    } 
+  }
+    
+  m_colourRemapMatrixPresentFlag  = SeiCriInput->m_colourRemapMatrixPresentFlag;
+  m_log2MatrixDenom               = SeiCriInput->m_log2MatrixDenom;
+
+  for ( Int c=0 ; c<3 ; c++ )
+    for ( Int i=0 ; i<3 ; i++ )
+      m_colourRemapCoeffs[c][i] = SeiCriInput->m_colourRemapCoeffs[c][i];
+
+  for( Int c=0 ; c<3 ; c++ )
+  {
+    m_postLutNumValMinus1[c] = SeiCriInput->m_postLutNumValMinus1[c];
+    m_postLutCodedValue[c].resize(m_postLutNumValMinus1[c]+1);
+    m_postLutTargetValue[c].resize(m_postLutNumValMinus1[c]+1);
+    for ( Int i=0 ; i <= m_postLutNumValMinus1[c] ; i++ )
+    {
+        m_postLutCodedValue[c][i]  = SeiCriInput->m_postLutCodedValue[c][i];
+        m_postLutTargetValue[c][i] = SeiCriInput->m_postLutTargetValue[c][i];
+    } 
+  }
+}
+#endif

branches/SHM-dev/source/Lib/TLibCommon/SEI.h

@@ -766 +766 @@
   SEIColourRemappingInfo() {}
   ~SEIColourRemappingInfo() {}
+
+  Void  copyFrom( SEIColourRemappingInfo const * SeiCriInput);
  
   Int   m_colourRemapId;

branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -313 +313 @@
       for (Int x = 0; x < width; x++ )
       {
-        Pel pix  = Clip3<Pel>(0, (1 << bitDepth)-1, (pi[x]+offset)>>shift);
+        Pel pix = pi[x];
 
         UChar uc = pix & 0xff;