Changeset 408 in 3DVCSoftware for branches/HTM-6.2-dev1-LG/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

16 May 2013, 09:23:44 (13 years ago)

Author:

lg

Message:

D0135->D0092->D0091

File:

• branches/HTM-6.2-dev1-LG/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)

branches/HTM-6.2-dev1-LG/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -972 +972 @@
       if (pcSlice->getSPS()->getUseSAO())
       {
+#if LGE_SAO_MIGRATION_D0091
+        WRITE_FLAG( pcSlice->getSaoEnabledFlag(), "slice_sao_luma_flag" );
+        {
+            SAOParam *saoParam = pcSlice->getAPS()->getSaoParam();
+            WRITE_FLAG( saoParam->bSaoFlag[1], "slice_sao_chroma_flag" );
+        }
+#else
         WRITE_FLAG( pcSlice->getSaoInterleavingFlag(), "SAO interleaving flag" );
          assert (pcSlice->getSaoEnabledFlag() == pcSlice->getAPS()->getSaoEnabled());
@@ -980 +987 @@
            WRITE_FLAG( pcSlice->getAPS()->getSaoParam()->bSaoFlag[2], "SAO on/off flag for Cr in slice header" );
          }
+#endif
       }
       WRITE_UVLC( pcSlice->getAPS()->getAPSID(), "aps_id");
@@ -1506 +1514 @@
   }
 }
-
+#if !LGE_SAO_MIGRATION_D0091
 Void TEncCavlc::codeSaoFlag( UInt uiCode )
 {
@@ -1544 +1552 @@
   WRITE_CODE( uiCode, uiLength, "sao_run_diff");
 }
+#endif
 
 Void TEncCavlc::estBit( estBitsSbacStruct* pcEstBitsCabac, Int width, Int height, TextType eTType )