Changeset 1305 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

21 Jul 2015, 00:37:39 (10 years ago)

Author:

seregin

Message:

port rev 4352

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncSbac.cpp (modified) (2 diffs)
• TEncSbac.h (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -337 +337 @@
  * \param rParam                  reference to Rice parameter
  * \param useLimitedPrefixLength
- * \param channelType             plane type (luma/chroma)
- */
-Void TEncSbac::xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const ChannelType channelType, const Int maxLog2TrDynamicRange )
+ * \param maxLog2TrDynamicRange 
+ */
+Void TEncSbac::xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange )
 {
   Int codeNumber  = (Int)symbol;
@@ -1507 +1507 @@
             const UInt escapeCodeValue = absCoeff[idx] - baseLevel;
 
-            xWriteCoefRemainExGolomb( escapeCodeValue, uiGoRiceParam, extendedPrecision, channelType, maxLog2TrDynamicRange );
+            xWriteCoefRemainExGolomb( escapeCodeValue, uiGoRiceParam, extendedPrecision, maxLog2TrDynamicRange );
 
             if (absCoeff[idx] > (3 << uiGoRiceParam))

branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.h

@@ -119 +119 @@
   Void  xWriteUnaryMaxSymbol ( UInt uiSymbol, ContextModel* pcSCModel, Int iOffset, UInt uiMaxSymbol );
   Void  xWriteEpExGolomb     ( UInt uiSymbol, UInt uiCount );
-  Void  xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const ChannelType channelType, const Int maxLog2TrDynamicRange );
+  Void  xWriteCoefRemainExGolomb ( UInt symbol, UInt &rParam, const Bool useLimitedPrefixLength, const Int maxLog2TrDynamicRange );
 
   Void  xCopyFrom            ( const TEncSbac* pSrc );

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1330 +1330 @@
  * \param [out] startCtuTsAddr
  * \param [out] boundingCtuTsAddr
- * \param [in] pcPic
- * \param encodingSlice Identifies, if the calling function is compressSlice() [false] or encodeSlice() [true]
+ * \param [in]  pcPic
 
  * Updates startCtuTsAddr, boundingCtuTsAddr with appropriate CTU address