Changeset 1035 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

27 Feb 2015, 19:52:41 (10 years ago)

Author:

seregin

Message:

fix for the ticket #69

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (3 diffs)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TComUpsampleFilter.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -3235 +3235 @@
   static Window win;
 
-  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
-  {
-    if (layerId == m_refLocationOffsetLayerId[i])
+  for( Int i = m_numRefLayerLocationOffsets; i > 0; i-- )
+  {
+    if( layerId == m_refLocationOffsetLayerId[i] )
     {
       return m_scaledRefLayerWindow[i];
@@ -3252 +3252 @@
   static Window win;
 
-  for (Int i = 0; i < m_numRefLayerLocationOffsets; i++)
-  {
-    if (layerId == m_refLocationOffsetLayerId[i])
+  for( Int i = m_numRefLayerLocationOffsets; i > 0; i-- )
+  {
+    if( layerId == m_refLocationOffsetLayerId[i] )
     {
       return m_refLayerWindow[i];
@@ -3267 +3267 @@
 #if RESAMPLING_FIX
 #if R0209_GENERIC_PHASE
-Bool TComPPS::hasZeroResamplingPhase(Int refLayerIdc)
-{
-  Int phaseHorLuma   = this->getPhaseHorLuma(refLayerIdc);
-  Int phaseVerLuma   = this->getPhaseVerLuma(refLayerIdc);
-  Int phaseHorChroma = this->getPhaseHorChroma(refLayerIdc);
-  Int phaseVerChroma = this->getPhaseVerChroma(refLayerIdc);
+Bool TComPPS::hasZeroResamplingPhase(Int refLayerId)
+{
+  Bool phaseSetPresentFlag;
+  Int phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma;
+
+  getResamplingPhase(refLayerId, phaseSetPresentFlag, phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma);
+
   return ( phaseHorLuma == 0 && phaseHorChroma == 0 && phaseVerLuma == 0 && phaseVerChroma == 0);
+}
+
+Void TComPPS::getResamplingPhase(Int refLayerId, Bool& phaseSetPresentFlag, Int& phaseHorLuma, Int& phaseVerLuma, Int& phaseHorChroma, Int& phaseVerChroma)
+{
+  phaseSetPresentFlag = false;
+  phaseHorLuma = 0, phaseVerLuma = 0, phaseHorChroma = 0, phaseVerChroma = 0;
+
+  for( Int i = m_numRefLayerLocationOffsets; i > 0; i-- )
+  {
+    if( refLayerId == m_refLocationOffsetLayerId[i] )
+    {
+      phaseSetPresentFlag = m_resamplePhaseSetPresentFlag[i];
+      phaseHorLuma        = m_phaseHorLuma[i];
+      phaseVerLuma        = m_phaseVerLuma[i];
+      phaseHorChroma      = m_phaseHorChroma[i];
+      phaseVerChroma      = m_phaseVerChroma[i];
+
+      return;
+    }
+  }
 }
 #endif

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

@@ -2249 +2249 @@
   Void setResamplePhaseSetPresentFlag(Int x, Bool b) { m_resamplePhaseSetPresentFlag[x] = b; }
 #if RESAMPLING_FIX
-  Bool hasZeroResamplingPhase(Int layerId);
+  Bool hasZeroResamplingPhase(Int refLayerId);
+  Void getResamplingPhase(Int refLayerId, Bool& phaseSetPresentFlag, Int& phaseHorLuma, Int& phaseVerLuma, Int& phaseHorChroma, Int& phaseVerChroma);
 #endif
 #endif

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

@@ -118 +118 @@
 #endif
 #if R0209_GENERIC_PHASE
-  Int phaseHorLuma   = currSlice->getPPS()->getPhaseHorLuma(refLayerIdc);
-  Int phaseVerLuma   = currSlice->getPPS()->getPhaseVerLuma(refLayerIdc);
-  Int phaseHorChroma = currSlice->getPPS()->getPhaseHorChroma(refLayerIdc);
-  Int phaseVerChroma;
-  if (currSlice->getPPS()->getResamplePhaseSetPresentFlag(refLayerIdc))
-  {
-    phaseVerChroma = currSlice->getPPS()->getPhaseVerChroma(refLayerIdc);
-  }
-  else
+  Bool phaseSetPresentFlag;
+  Int phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma;  
+  currSlice->getPPS()->getResamplingPhase( refLayerId, phaseSetPresentFlag, phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma );
+
+  if( !phaseSetPresentFlag )
   {
     Int refRegionHeight = heightBL - windowRL.getWindowTopOffset() - windowRL.getWindowBottomOffset();

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

@@ -2038 +2038 @@
 #if R0209_GENERIC_PHASE
         // conformance check: when ScaledRefRegionWidthInSamplesY is equal to RefLayerRegionWidthInSamplesY, PhaseHorY shall be equal to 0, when ScaledRefRegionWidthInSamplesC is equal to RefLayerRegionWidthInSamplesC, PhaseHorC shall be equal to 0, when ScaledRefRegionHeightInSamplesY is equal to RefLayerRegionHeightInSamplesY, PhaseVerY shall be equal to 0, and when ScaledRefRegionHeightInSamplesC is equal to RefLayerRegionHeightInSamplesC, PhaseVerC shall be equal to 0.
-        Int phaseHorLuma   = pcSlice->getPPS()->getPhaseHorLuma(refLayerIdc);
-        Int phaseVerLuma   = pcSlice->getPPS()->getPhaseVerLuma(refLayerIdc);
-        Int phaseHorChroma = pcSlice->getPPS()->getPhaseHorChroma(refLayerIdc);
-        Int phaseVerChroma = pcSlice->getPPS()->getPhaseVerChroma(refLayerIdc);
+        Bool phaseSetPresentFlag;
+        Int phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma;
+        pcSlice->getPPS()->getResamplingPhase( refLayerId, phaseSetPresentFlag, phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma );
+
         assert( ( (widthEL  != widthBL)  || (phaseHorLuma == 0 && phaseHorChroma == 0) )
              && ( (heightEL != heightBL) || (phaseVerLuma == 0 && phaseVerChroma == 0) ) );

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

@@ -1346 +1346 @@
 #if R0209_GENERIC_PHASE
         // conformance check: when ScaledRefRegionWidthInSamplesY is equal to RefLayerRegionWidthInSamplesY, PhaseHorY shall be equal to 0, when ScaledRefRegionWidthInSamplesC is equal to RefLayerRegionWidthInSamplesC, PhaseHorC shall be equal to 0, when ScaledRefRegionHeightInSamplesY is equal to RefLayerRegionHeightInSamplesY, PhaseVerY shall be equal to 0, and when ScaledRefRegionHeightInSamplesC is equal to RefLayerRegionHeightInSamplesC, PhaseVerC shall be equal to 0.
-        Int phaseHorLuma   = pcSlice->getPPS()->getPhaseHorLuma(refLayerIdc);
-        Int phaseVerLuma   = pcSlice->getPPS()->getPhaseVerLuma(refLayerIdc);
-        Int phaseHorChroma = pcSlice->getPPS()->getPhaseHorChroma(refLayerIdc);
-        Int phaseVerChroma = pcSlice->getPPS()->getPhaseVerChroma(refLayerIdc);
+        Bool phaseSetPresentFlag;
+        Int phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma;
+        pcSlice->getPPS()->getResamplingPhase( refLayerId, phaseSetPresentFlag, phaseHorLuma, phaseVerLuma, phaseHorChroma, phaseVerChroma );
+
         assert( ( (widthEL  != widthBL)  || (phaseHorLuma == 0 && phaseHorChroma == 0) )
              && ( (heightEL != heightBL) || (phaseVerLuma == 0 && phaseVerChroma == 0) ) );