Changeset 1030 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

26 Feb 2015, 23:22:07 (11 years ago)

Author:

seregin

Message:

fix for the ticket #70

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.cpp (modified) (4 diffs)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (5 diffs)
• TLibEncoder/TEncTop.h (modified) (2 diffs)

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

@@ -3430 +3430 @@
 #if MOVE_SCALED_OFFSET_TO_PPS
 #if O0098_SCALED_REF_LAYER_ID
-  Int leftStartL = baseColPic->getSlice(0)->getPPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowLeftOffset();
-  Int topStartL  = baseColPic->getSlice(0)->getPPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowTopOffset();
+  Int leftStartL = m_pcSlice->getPPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowLeftOffset();
+  Int topStartL  = m_pcSlice->getPPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowTopOffset();
 #else
   Int leftStartL = baseColPic->getSlice(0)->getPPS()->getScaledRefLayerWindow(refLayerIdc).getWindowLeftOffset();
@@ -3447 +3447 @@
 
 #if REF_REGION_OFFSET
-  const Window &windowRL = baseColPic->getSlice(0)->getPPS()->getRefLayerWindow(refLayerIdc);
+  const Window &windowRL = m_pcSlice->getPPS()->getRefLayerWindow(refLayerIdc);
   Int iBX = (((uiPelX - leftStartL)*g_posScalingFactor[refLayerIdc][0] + (1<<15)) >> 16) + windowRL.getWindowLeftOffset();
   Int iBY = (((uiPelY - topStartL )*g_posScalingFactor[refLayerIdc][1] + (1<<15)) >> 16) + windowRL.getWindowTopOffset();

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

@@ -2538 +2538 @@
 #endif
 #if MOVE_SCALED_OFFSET_TO_PPS
-, m_numScaledRefLayerOffsets  ( 0 )
+, m_numRefLayerLocationOffsets  ( 0 )
 #endif
 #if Q0048_CGS_3D_ASYMLUT
@@ -3234 +3234 @@
   static Window win;
 
-  for (Int i = 0; i < m_numScaledRefLayerOffsets; i++)
-  {
-    if (layerId == m_scaledRefLayerId[i])
+  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
+  {
+    if (layerId == m_refLocationOffsetLayerId[i])
     {
       return m_scaledRefLayerWindow[i];
@@ -3251 +3251 @@
   static Window win;
 
-  for (Int i = 0; i < m_numScaledRefLayerOffsets; i++)
-  {
-    if (layerId == m_scaledRefLayerId[i])
+  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
+  {
+    if (layerId == m_refLocationOffsetLayerId[i])
     {
       return m_refLayerWindow[i];
@@ -4277 +4277 @@
       pcIlpPic[refLayerIdc]->setIsLongTerm(1);
 
+      // assign PPS to IRLP to be used for reference location offsets
+      pcIlpPic[refLayerIdc]->getSlice(0)->setPPS( m_pcPic->getSlice(0)->getPPS() );
+
 #if REF_IDX_MFM
       if( m_bMFMEnabledFlag && !(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) )

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

@@ -2053 +2053 @@
 #endif
 #if MOVE_SCALED_OFFSET_TO_PPS
-  UInt     m_numScaledRefLayerOffsets;
+  UInt     m_numRefLayerLocationOffsets;
 #if O0098_SCALED_REF_LAYER_ID
-  UInt     m_scaledRefLayerId[MAX_LAYERS];
+  UInt     m_refLocationOffsetLayerId[MAX_LAYERS];
 #endif
   Window   m_scaledRefLayerWindow[MAX_LAYERS];
@@ -2221 +2221 @@
 #endif
 #if MOVE_SCALED_OFFSET_TO_PPS
-  UInt     getNumScaledRefLayerOffsets()       { return m_numScaledRefLayerOffsets; }
-  Void     setNumScaledRefLayerOffsets(Int x)  { m_numScaledRefLayerOffsets = x;    }
+  UInt     getNumRefLayerLocationOffsets()       { return m_numRefLayerLocationOffsets; }
+  Void     setNumRefLayerLocationOffsets(Int x)  { m_numRefLayerLocationOffsets = x;    }
 #if O0098_SCALED_REF_LAYER_ID
-  UInt     getScaledRefLayerId(Int x)          { return m_scaledRefLayerId[x]; }
-  Void     setScaledRefLayerId(Int x, UInt id) { m_scaledRefLayerId[x] = id;   }
+  UInt     getRefLocationOffsetLayerId(Int x)          { return m_refLocationOffsetLayerId[x]; }
+  Void     setRefLocationOffsetLayerId(Int x, UInt id) { m_refLocationOffsetLayerId[x] = id;   }
   Window&  getScaledRefLayerWindowForLayer( Int layerId );
 #endif

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -412 +412 @@
 
 #if REF_REGION_OFFSET
-            READ_UVLC( uiCode,      "num_ref_loc_offsets" ); pcPPS->setNumScaledRefLayerOffsets(uiCode);
-            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
+            READ_UVLC( uiCode,      "num_ref_loc_offsets" ); pcPPS->setNumRefLayerLocationOffsets(uiCode);
+            for(Int k = 0; k < pcPPS->getNumRefLayerLocationOffsets(); k++)
             {
-              READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setScaledRefLayerId( k, uiCode );
+              READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setRefLocationOffsetLayerId( k, uiCode );
               READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );   pcPPS->setScaledRefLayerOffsetPresentFlag( k, uiCode );
               if (uiCode)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -317 +317 @@
 
 #if REF_REGION_OFFSET
-            WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_ref_loc_offsets" );
-            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
+            WRITE_UVLC( pcPPS->getNumRefLayerLocationOffsets(),      "num_ref_loc_offsets" );
+            for(Int k = 0; k < pcPPS->getNumRefLayerLocationOffsets(); k++)
             {
-              WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6, "ref_loc_offset_layer_id" );
+              WRITE_CODE( pcPPS->getRefLocationOffsetLayerId(k), 6, "ref_loc_offset_layer_id" );
               WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(k) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
               if (pcPPS->getScaledRefLayerOffsetPresentFlag(k))

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

@@ -84 +84 @@
   m_bMFMEnabledFlag = false;
 #endif
-  m_numScaledRefLayerOffsets = 0;
+  m_numRefLayerLocationOffsets = 0;
 #if POC_RESET_FLAG || POC_RESET_IDC_ENCODER
   m_pocAdjustmentValue     = 0;
@@ -1151 +1151 @@
 #endif
 #if MOVE_SCALED_OFFSET_TO_PPS
-  m_cPPS.setNumScaledRefLayerOffsets(m_numScaledRefLayerOffsets);
-  for(Int i = 0; i < m_cPPS.getNumScaledRefLayerOffsets(); i++)
+  m_cPPS.setNumRefLayerLocationOffsets(m_numRefLayerLocationOffsets);
+  for(Int i = 0; i < m_cPPS.getNumRefLayerLocationOffsets(); i++)
   {
 #if O0098_SCALED_REF_LAYER_ID
-    m_cPPS.setScaledRefLayerId(i, m_scaledRefLayerId[i]);
+    m_cPPS.setRefLocationOffsetLayerId(i, m_refLocationOffsetLayerId[i]);
 #endif
     m_cPPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i];
@@ -1165 +1165 @@
 #if R0209_GENERIC_PHASE
     m_cPPS.setResamplePhaseSetPresentFlag( i, m_resamplePhaseSetPresentFlag[i] );
-    m_cPPS.setPhaseHorLuma( m_scaledRefLayerId[i], m_phaseHorLuma[i] );
-    m_cPPS.setPhaseVerLuma( m_scaledRefLayerId[i], m_phaseVerLuma[i] );
-    m_cPPS.setPhaseHorChroma( m_scaledRefLayerId[i], m_phaseHorChroma[i] );
-    m_cPPS.setPhaseVerChroma( m_scaledRefLayerId[i], m_phaseVerChroma[i] );
+    m_cPPS.setPhaseHorLuma( m_refLocationOffsetLayerId[i], m_phaseHorLuma[i] );
+    m_cPPS.setPhaseVerLuma( m_refLocationOffsetLayerId[i], m_phaseVerLuma[i] );
+    m_cPPS.setPhaseHorChroma( m_refLocationOffsetLayerId[i], m_phaseHorChroma[i] );
+    m_cPPS.setPhaseVerChroma( m_refLocationOffsetLayerId[i], m_phaseVerChroma[i] );
 #endif
 #if P0312_VERT_PHASE_ADJ
@@ -1678 +1678 @@
   static Window win;
 
-  for (Int i = 0; i < m_numScaledRefLayerOffsets; i++)
-  {
-    if (layerId == m_scaledRefLayerId[i])
+  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
+  {
+    if (layerId == m_refLocationOffsetLayerId[i])
     {
       return m_scaledRefLayerWindow[i];
@@ -1694 +1694 @@
   static Window win;
 
-  for (Int i = 0; i < m_numScaledRefLayerOffsets; i++)
+  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
   {
     if (layerId == m_refLayerId[i])

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

@@ -122 +122 @@
   Bool                    m_bMFMEnabledFlag;
 #endif
-  UInt                    m_numScaledRefLayerOffsets;
+  UInt                    m_numRefLayerLocationOffsets;
 #if O0098_SCALED_REF_LAYER_ID
-  UInt                    m_scaledRefLayerId[MAX_LAYERS];
+  UInt                    m_refLocationOffsetLayerId[MAX_LAYERS];
 #endif
   Window                  m_scaledRefLayerWindow[MAX_LAYERS];
@@ -224 +224 @@
   Int       getNumPicRcvd         ()            { return m_iNumPicRcvd;              }
   Void      setNumPicRcvd         ( Int num )   { m_iNumPicRcvd = num;               }
-  Void      setNumScaledRefLayerOffsets(Int x)  { m_numScaledRefLayerOffsets = x;    }
-  UInt      getNumScaledRefLayerOffsets()       { return m_numScaledRefLayerOffsets; }
+  Void      setNumRefLayerLocationOffsets(Int x)  { m_numRefLayerLocationOffsets = x;    }
+  UInt      getNumRefLayerLocationOffsets()       { return m_numRefLayerLocationOffsets; }
 #if O0098_SCALED_REF_LAYER_ID
-  Void      setScaledRefLayerId(Int x, UInt id) { m_scaledRefLayerId[x] = id;   }
-  UInt      getScaledRefLayerId(Int x)          { return m_scaledRefLayerId[x]; }
+  Void      setRefLocationOffsetLayerId(Int x, UInt id) { m_refLocationOffsetLayerId[x] = id;   }
+  UInt      getRefLocationOffsetLayerId(Int x)          { return m_refLocationOffsetLayerId[x]; }
   Window&   getScaledRefLayerWindowForLayer(Int layerId);
 #endif