Changeset 839 in 3DVCSoftware for branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder

Timestamp:

8 Feb 2014, 01:30:30 (11 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder

Files:

• TDecSbac.h (modified) (1 diff)
• TDecSlice.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -94 +94 @@
   Void  parseSaoTypeIdx           ( UInt&  ruiVal  );
   Void  parseSaoUflc              ( UInt uiLength, UInt& ruiVal     );
+  Void parseSAOBlkParam (SAOBlkParam& saoBlkParam, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail);
+  Void parseSaoSign(UInt& val);
 private:
   Void  xReadUnarySymbol    ( UInt& ruiSymbol, ContextModel* pcSCModel, Int iOffset );

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -336 +336 @@
         if(ry > 0)
         {
+          aboveMergeAvail = rpcPic->getSAOMergeAvailability(iCUAddr, iCUAddr-uiWidthInLCUs);
       }
 
@@ -342 +343 @@
       else 
         {
+        saoblkParam[SAO_Y ].modeIdc = SAO_MODE_OFF;
+        saoblkParam[SAO_Cb].modeIdc = SAO_MODE_OFF;
+        saoblkParam[SAO_Cr].modeIdc = SAO_MODE_OFF;
       }
     }

branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -679 +679 @@
     m_uiSliceIdx     = 0;
   }
+  else
   {
     m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );