Changeset 1303 in SHVCSoftware

Timestamp:

21 Jul 2015, 00:29:23 (9 years ago)

Author:

seregin

Message:

port rev 4350 and related part for rev 4346

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComTrQuant.cpp (modified) (6 diffs)
• TLibCommon/TComTrQuant.h (modified) (1 diff)
• TLibEncoder/SEIEncoder.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -1303 +1303 @@
 
   // iAdd is different from the iAdd used in normal quantization
-  const Int iAdd   = (compID == COMPONENT_Y ? 171 : 256) << (iQBits-9);  
+  const Int iAdd   = (compID == COMPONENT_Y ? 171 : 256) << (iQBits-9);
 
   for( Int uiBlockPos = 0; uiBlockPos < uiWidth*uiHeight; uiBlockPos++ )
@@ -2320 +2320 @@
           uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ],
                                                   lLevelDouble, uiMaxAbsLevel, significanceMapContextOffset, uiOneCtx, uiAbsCtx, uiGoRiceParam,
-                                                  c1Idx, c2Idx, iQBits, errorScale, 1, extendedPrecision, channelType
+                                                  c1Idx, c2Idx, iQBits, errorScale, 1, extendedPrecision, maxLog2TrDynamicRange
                                                   );
         }
@@ -2329 +2329 @@
           uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ],
                                                   lLevelDouble, uiMaxAbsLevel, uiCtxSig, uiOneCtx, uiAbsCtx, uiGoRiceParam,
-                                                  c1Idx, c2Idx, iQBits, errorScale, 0, extendedPrecision, channelType
+                                                  c1Idx, c2Idx, iQBits, errorScale, 0, extendedPrecision, maxLog2TrDynamicRange
                                                   );
 
@@ -2339 +2339 @@
         if( uiLevel > 0 )
         {
-          Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, channelType );
-          rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, channelType ) - rateNow;
-          rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, channelType ) - rateNow;
+          Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, maxLog2TrDynamicRange );
+          rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, maxLog2TrDynamicRange ) - rateNow;
+          rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, extendedPrecision, maxLog2TrDynamicRange ) - rateNow;
         }
         else // uiLevel == 0
@@ -2879 +2879 @@
                                             Bool             bLast,
                                             Bool             useLimitedPrefixLength,
-                                            ChannelType      channelType
+                                            const Int        maxLog2TrDynamicRange
                                             ) const
 {
@@ -2908 +2908 @@
   {
     Double dErr         = Double( lLevelDouble  - ( Intermediate_Int(uiAbsLevel) << iQBits ) );
-    Double dCurrCost    = dErr * dErr * errorScale + xGetICost( xGetICRate( uiAbsLevel, ui16CtxNumOne, ui16CtxNumAbs, ui16AbsGoRice, c1Idx, c2Idx, useLimitedPrefixLength, channelType ) );
+    Double dCurrCost    = dErr * dErr * errorScale + xGetICost( xGetICRate( uiAbsLevel, ui16CtxNumOne, ui16CtxNumAbs, ui16AbsGoRice, c1Idx, c2Idx, useLimitedPrefixLength, maxLog2TrDynamicRange ) );
     dCurrCost          += dCurrCostSig;
 

branches/SHM-dev/source/Lib/TLibCommon/TComTrQuant.h

@@ -288 +288 @@
                                              Bool             bLast,
                                              Bool             useLimitedPrefixLength,
-                                             ChannelType      channelType
+                                             const Int        maxLog2TrDynamicRange
                                              ) const;
 

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

@@ -710 +710 @@
   seiScalableNesting->m_nestingNumLayersMinus1        = 1 - 1;  //nesting_num_layers_minus1
   seiScalableNesting->m_nestingLayerId[0]             = 0;
-  seiScalableNesting->m_callerOwnsSEIs                = true;
 
   // Bitstream partition nesting SEI
-
   seiBspNesting->m_bspIdx = 0;
-  seiBspNesting->m_callerOwnsSEIs = true;
 
   // Buffering period SEI