Ticket #456: fix_ticket456.patch

Lib/TLibCommon/TypeDef.h

@@ -40 +40 @@
 
 //! \ingroup TLibCommon
 //! \{
+
+
 #define FAST_DECISION_FOR_MRG_RD_COST  1 ////< H0178: Fast Decision for Merge 2Nx2N RDCost
 
 #define REMOVE_DIV_OPERATION      1 ///< H0238: Simplified intra horizontal and vertical filtering

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1671 +1671 @@
         pcRPS->setNumberOfPictures(offset);        
       }  
     }
-    if(sps->getUseSAO() || sps->getUseALF() || sps->getScalingListFlag() || sps->getUseDF())
-    {
-      //!!!KS: order is different in WD5! 
-      if (sps->getUseALF())
-      {
-        READ_FLAG(uiCode, "slice_adaptive_loop_filter_flag");
-        rpcSlice->setAlfEnabledFlag((Bool)uiCode);
-      }
       if (sps->getUseSAO())
       {
 #if SAO_UNIT_INTERLEAVING
@@ -1698 +1690 @@
         }
 #endif
       }
+#if SAO_UNIT_INTERLEAVING
+    if( (sps->getUseSAO()&& !rpcSlice->getSaoInterleavingFlag() ) || sps->getUseALF() || sps->getScalingListFlag() || sps->getUseDF())
+#else
+    if( sps->getUseSAO() || sps->getUseALF() || sps->getScalingListFlag() || sps->getUseDF())
+#endif
+    {
       READ_UVLC (    uiCode, "aps_id" );  rpcSlice->setAPSId(uiCode);
     }
     if (!rpcSlice->isIntra())
@@ -1929 +1927 @@
 #if PARAMSET_VLC_CLEANUP
   if (!bEntropySlice)
   {
+    if (sps->getUseALF())
+    {
+      READ_FLAG(uiCode, "slice_adaptive_loop_filter_flag");
+      rpcSlice->setAlfEnabledFlag((Bool)uiCode);
+    }
+
     if(sps->getUseALF() && rpcSlice->getAlfEnabledFlag())
     {
       UInt uiNumLCUsInWidth   = sps->getWidth()  / g_uiMaxCUWidth;

Lib/TLibEncoder/TEncCavlc.cpp

@@ -608 +608 @@
         }
       }
     }
-    if(pcSlice->getSPS()->getUseSAO() || pcSlice->getSPS()->getUseALF()|| pcSlice->getSPS()->getScalingListFlag() || pcSlice->getSPS()->getUseDF())
-    {
-      if (pcSlice->getSPS()->getUseALF())
-      {
-#if !LCU_SYNTAX_ALF
-         if (pcSlice->getAlfEnabledFlag())
-         {
-           assert (pcSlice->getAPS()->getAlfEnabled());
-         }
-#endif
-         WRITE_FLAG( pcSlice->getAlfEnabledFlag(), "ALF on/off flag in slice header" );
-      }
       if (pcSlice->getSPS()->getUseSAO())
       {
 #if SAO_UNIT_INTERLEAVING
@@ -635 +623 @@
          }
 #endif
       }
+#if SAO_UNIT_INTERLEAVING
+    if((pcSlice->getSPS()->getUseSAO() && !pcSlice->getSaoInterleavingFlag() ) || pcSlice->getSPS()->getUseALF()|| pcSlice->getSPS()->getScalingListFlag() || pcSlice->getSPS()->getUseDF())
+#else
+    if(pcSlice->getSPS()->getUseSAO() || pcSlice->getSPS()->getUseALF()|| pcSlice->getSPS()->getScalingListFlag() || pcSlice->getSPS()->getUseDF())
+#endif
+    {
       WRITE_UVLC( pcSlice->getAPS()->getAPSID(), "aps_id");
     }
 
@@ -770 +764 @@
   assert(pcSlice->getMaxNumMergeCand()<=MRG_MAX_NUM_CANDS_SIGNALED);
   assert(MRG_MAX_NUM_CANDS_SIGNALED<=MRG_MAX_NUM_CANDS);
   WRITE_UVLC(MRG_MAX_NUM_CANDS - pcSlice->getMaxNumMergeCand(), "maxNumMergeCand");
+
+  if (!bEntropySlice)
+  {
+    if (pcSlice->getSPS()->getUseALF())
+    {
+      WRITE_FLAG( pcSlice->getAlfEnabledFlag(), "slice_adaptive_loop_filter_flag" );
+    }
+  }
+
+
 }