Ticket #485: deblocking_parameter.patch

source/Lib/TLibCommon/TComLoopFilter.cpp

@@ -75 +75 @@
 // ====================================================================================================================
 
 TComLoopFilter::TComLoopFilter()
-: m_disableDeblockingFilterFlag(false)
-, m_betaOffsetDiv2(0)
-, m_tcOffsetDiv2(0)
-, m_uiNumPartitions(0)
+: m_uiNumPartitions(0)
 , m_bLFCrossTileBoundary(true)
 {
   for( UInt uiDir = 0; uiDir < 2; uiDir++ )
@@ -98 +95 @@
 // ====================================================================================================================
 // Public member functions
 // ====================================================================================================================
-Void TComLoopFilter::setCfg( Bool deblockingFilterControlPresentFlag, Bool disableDeblockingFilterFlag, Int betaOffsetDiv2, Int tcOffsetDiv2, Bool bLFCrossTileBoundary )
+Void TComLoopFilter::setCfg( Bool bLFCrossTileBoundary )
 {
   m_bLFCrossTileBoundary = bLFCrossTileBoundary;
-
-  if (deblockingFilterControlPresentFlag)
-  {
-    m_disableDeblockingFilterFlag  = disableDeblockingFilterFlag;
-    m_betaOffsetDiv2 = betaOffsetDiv2;
-    m_tcOffsetDiv2 = tcOffsetDiv2;
-  } 
-  else // use default values
-  {
-    m_disableDeblockingFilterFlag = false;
-    m_betaOffsetDiv2 = 0;
-    m_tcOffsetDiv2 = 0;
-  }
 }
 
 Void TComLoopFilter::create( UInt uiMaxCUDepth )
@@ -157 +141 @@
  */
 Void TComLoopFilter::loopFilterPic( TComPic* pcPic )
 {
-  if ( m_disableDeblockingFilterFlag )
-  {
-    return;
-  }
-  
   // Horizontal filtering
   for ( UInt uiCUAddr = 0; uiCUAddr < pcPic->getNumCUsInFrame(); uiCUAddr++ )
   {
@@ -389 +368 @@
   TComDataCU* pcTempCU;
   UInt        uiTempPartIdx;
 
-  m_stLFCUParam.bInternalEdge = !m_disableDeblockingFilterFlag;
+  m_stLFCUParam.bInternalEdge = ! pcCU->getSlice()->getDeblockingFilterDisable();
   
-  if ( (uiX == 0) || m_disableDeblockingFilterFlag )
+  if ( (uiX == 0) || pcCU->getSlice()->getDeblockingFilterDisable() )
   {
     m_stLFCUParam.bLeftEdge = false;
   }
@@ -412 +391 @@
     }
   }
   
-  if ( (uiY == 0 ) || m_disableDeblockingFilterFlag )
+  if ( (uiY == 0 ) || pcCU->getSlice()->getDeblockingFilterDisable() )
   {
     m_stLFCUParam.bTopEdge = false;
   }
@@ -587 +566 @@
   UInt  uiPartQIdx = 0;
   TComDataCU* pcCUP = pcCU; 
   TComDataCU* pcCUQ = pcCU;
-  
+  Int  betaOffsetDiv2 = pcCUQ->getSlice()->getDeblockingFilterBetaOffsetDiv2();
+  Int  tcOffsetDiv2 = pcCUQ->getSlice()->getDeblockingFilterTcOffsetDiv2();
+
   if (iDir == EDGE_VER)
   {
     iOffset = 1;
@@ -627 +608 @@
       iQP = (iQP_P + iQP_Q + 1) >> 1;
       Int iBitdepthScale = 1 << (g_bitDepthY-8);
       
-      Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, Int(iQP + DEFAULT_INTRA_TC_OFFSET*(uiBs-1) + (m_tcOffsetDiv2 << 1)));
-      Int iIndexB = Clip3(0, MAX_QP, iQP + (m_betaOffsetDiv2 << 1));
+      Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, Int(iQP + DEFAULT_INTRA_TC_OFFSET*(uiBs-1) + (tcOffsetDiv2 << 1)));
+      Int iIndexB = Clip3(0, MAX_QP, iQP + (betaOffsetDiv2 << 1));
       
       Int iTc =  tctable_8x8[iIndexTC]*iBitdepthScale;
       Int iBeta = betatable_8x8[iIndexB]*iBitdepthScale;
@@ -702 +683 @@
   UInt  uiPartQIdx;
   TComDataCU* pcCUP; 
   TComDataCU* pcCUQ = pcCU;
+  Int tcOffsetDiv2 = pcCU->getSlice()->getDeblockingFilterTcOffsetDiv2();
   
   // Vertical Position
   UInt uiEdgeNumInLCUVert = g_auiZscanToRaster[uiAbsZorderIdx]%uiLCUWidthInBaseUnits + iEdge;
@@ -766 +748 @@
       iQP = QpUV((iQP_P + iQP_Q + 1) >> 1);
       Int iBitdepthScale = 1 << (g_bitDepth-8);
       
-      Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, iQP + DEFAULT_INTRA_TC_OFFSET*(ucBs - 1) + (m_tcOffsetDiv2 << 1));
+      Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, iQP + DEFAULT_INTRA_TC_OFFSET*(ucBs - 1) + (tcOffsetDiv2 << 1));
       Int iTc =  tctable_8x8[iIndexTC]*iBitdepthScale;
 #endif
       
@@ -790 +772 @@
         iQP = QpUV( ((iQP_P + iQP_Q + 1) >> 1) + chromaQPOffset );
         Int iBitdepthScale = 1 << (g_bitDepthC-8);
 
-        Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, iQP + DEFAULT_INTRA_TC_OFFSET*(ucBs - 1) + (m_tcOffsetDiv2 << 1));
+        Int iIndexTC = Clip3(0, MAX_QP+DEFAULT_INTRA_TC_OFFSET, iQP + DEFAULT_INTRA_TC_OFFSET*(ucBs - 1) + (tcOffsetDiv2 << 1));
         Int iTc =  tctable_8x8[iIndexTC]*iBitdepthScale;
 
         for ( UInt uiStep = 0; uiStep < uiPelsInPartChroma; uiStep++ )

source/Lib/TLibCommon/TComLoopFilter.h

@@ -110 +110 @@
   Void  destroy                   ();
   
   /// set configuration
-  Void setCfg( Bool deblockingFilterControlPresentFlag, Bool disableDeblockingFilterFlag, Int betaOffsetDiv2, Int tcOffsetDiv2, Bool bLFCrossTileBoundary );
+  Void setCfg( Bool bLFCrossTileBoundary );
   
   /// picture-level deblocking filter
   Void loopFilterPic( TComPic* pcPic );

source/Lib/TLibCommon/TComSlice.h

@@ -958 +958 @@
   UInt     m_encCABACTableIdx;           // Used to transmit table selection across slices
 
   Bool     m_sliceHeaderExtensionPresentFlag;
-  Bool        m_loopFilterAcrossSlicesEnabledFlag;
+  Bool     m_loopFilterAcrossSlicesEnabledFlag;
   Bool     m_deblockingFilterControlPresentFlag;
   Bool     m_deblockingFilterOverrideEnabledFlag;
   Bool     m_picDisableDeblockingFilterFlag;

source/Lib/TLibDecoder/TDecGop.cpp

@@ -177 +177 @@
 
   // deblocking filter
   Bool bLFCrossTileBoundary = pcSlice->getPPS()->getLoopFilterAcrossTilesEnabledFlag();
-  m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresentFlag(), pcSlice->getDeblockingFilterDisable(), pcSlice->getDeblockingFilterBetaOffsetDiv2(), pcSlice->getDeblockingFilterTcOffsetDiv2(), bLFCrossTileBoundary);
+  m_pcLoopFilter->setCfg(bLFCrossTileBoundary);
   m_pcLoopFilter->loopFilterPic( rpcPic );
 
   pcSlice = rpcPic->getSlice(0);

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -743 +743 @@
 
     //-- Loop filter
     Bool bLFCrossTileBoundary = pcSlice->getPPS()->getLoopFilterAcrossTilesEnabledFlag();
-    m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresentFlag(), pcSlice->getDeblockingFilterDisable(), pcSlice->getDeblockingFilterBetaOffsetDiv2(), pcSlice->getDeblockingFilterTcOffsetDiv2(), bLFCrossTileBoundary);
+    m_pcLoopFilter->setCfg(bLFCrossTileBoundary);
     m_pcLoopFilter->loopFilterPic( pcPic );
 
     pcSlice = pcPic->getSlice(0);
@@ -1518 +1518 @@
   TComSlice* pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
   Bool bCalcDist = false;
 #if VARYING_DBL_PARAMS
-  m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresentFlag(), pcSlice->getDeblockingFilterDisable(), pcSlice->getDeblockingFilterBetaOffsetDiv2(), pcSlice->getDeblockingFilterTcOffsetDiv2(), m_pcCfg->getLFCrossTileBoundaryFlag());
+  m_pcLoopFilter->setCfg(m_pcCfg->getLFCrossTileBoundaryFlag());
 #else
-  m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresentFlag(), pcSlice->getDeblockingFilterDisable(), m_pcCfg->getLoopFilterBetaOffset(), m_pcCfg->getLoopFilterTcOffset(), m_pcCfg->getLFCrossTileBoundaryFlag());
+  m_pcLoopFilter->setCfg(m_pcCfg->getLFCrossTileBoundaryFlag());
 #endif
   m_pcLoopFilter->loopFilterPic( pcPic );
   

source/Lib/TLibEncoder/TEncSlice.cpp

@@ -412 +412 @@
 #endif
     }
   }
+  else
+  {
+    rpcSlice->setDeblockingFilterOverrideFlag( false );
+    rpcSlice->setDeblockingFilterDisable( false );
+    rpcSlice->setDeblockingFilterBetaOffsetDiv2( 0 );
+    rpcSlice->setDeblockingFilterTcOffsetDiv2( 0 );
+  }
 
   rpcSlice->setDepth            ( depth );