Changeset 443 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecSlice.cpp

Timestamp:

26 May 2013, 15:41:34 (12 years ago)

Author:

tech

Message:

• Reintegrated branch 6.2-dev0 rev. 442.
• Changed version number.
• Added coding results.

File:

• trunk/source/Lib/TLibDecoder/TDecSlice.cpp (modified) (2 diffs)

trunk/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -286 +286 @@
     g_bJustDoIt = g_bEncDecTraceEnable;
 #endif
+#if LGE_SAO_MIGRATION_D0091
+    if ( pcSlice->getSPS()->getUseSAO() && (pcSlice->getSaoEnabledFlag()||pcSlice->getSaoEnabledFlagChroma()) )
+    {
+        SAOParam *saoParam =  pcSlice->getAPS()->getSaoParam();
+        saoParam->bSaoFlag[0] = pcSlice->getSaoEnabledFlag();
+    if (iCUAddr == iStartCUAddr)
+    {
+        saoParam->bSaoFlag[1] = pcSlice->getSaoEnabledFlagChroma();
+    }
+    Int numCuInWidth     = saoParam->numCuInWidth;
+    Int cuAddrInSlice = iCUAddr - rpcPic->getPicSym()->getCUOrderMap(pcSlice->getSliceCurStartCUAddr()/rpcPic->getNumPartInCU());
+    Int cuAddrUpInSlice  = cuAddrInSlice - numCuInWidth;
+    Int rx = iCUAddr % numCuInWidth;
+    Int ry = iCUAddr / numCuInWidth;
+    Int allowMergeLeft = 1;
+    Int allowMergeUp   = 1;
+    if (rx!=0)
+    {
+        if (rpcPic->getPicSym()->getTileIdxMap(iCUAddr-1) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr))
+        {
+            allowMergeLeft = 0;
+        }
+    }
+    if (ry!=0)
+    {
+        if (rpcPic->getPicSym()->getTileIdxMap(iCUAddr-numCuInWidth) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr))
+        {
+        allowMergeUp = 0;
+        }
+    }
+    pcSbacDecoder->parseSaoOneLcuInterleaving(rx, ry, saoParam,pcCU, cuAddrInSlice, cuAddrUpInSlice, allowMergeLeft, allowMergeUp);
+    }
+#else
     if ( pcSlice->getSPS()->getUseSAO() && pcSlice->getSaoInterleavingFlag() && pcSlice->getSaoEnabledFlag() )
     {
@@ -301 +334 @@
       pcSbacDecoder->parseSaoOneLcuInterleaving(rx, ry, pcSlice->getAPS()->getSaoParam(),pcCU, cuAddrInSlice, cuAddrUpInSlice, pcSlice->getSPS()->getLFCrossSliceBoundaryFlag() );
     }
+#endif
 
     m_pcCuDecoder->decodeCU     ( pcCU, uiIsLast );