Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncRateCtrl.cpp

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncRateCtrl.cpp (modified) (7 diffs)

branches/HTM-16.2-dev/source/Lib/TLibEncoder/TEncRateCtrl.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -554 +554 @@
 }
 
-#if V0078_ADAPTIVE_LOWER_BOUND
 Int TEncRCPic::xEstPicLowerBound(TEncRCSeq* encRCSeq, TEncRCGOP* encRCGOP)
 {
@@ -592 +591 @@
   return lowerBound;
 }
-#endif
-
 
 Void TEncRCPic::addToPictureLsit( list<TEncRCPic*>& listPreviousPictures )
@@ -652 +649 @@
   Int picWidthInLCU  = ( picWidth  % LCUWidth  ) == 0 ? picWidth  / LCUWidth  : picWidth  / LCUWidth  + 1;
   Int picHeightInLCU = ( picHeight % LCUHeight ) == 0 ? picHeight / LCUHeight : picHeight / LCUHeight + 1;
-#if V0078_ADAPTIVE_LOWER_BOUND
   m_lowerBound       = xEstPicLowerBound( encRCSeq, encRCGOP );
-#endif
 
   m_LCULeft         = m_numberOfLCU;
@@ -1683 +1678 @@
     m_encRCSeq->initLCUPara();
   }
-#if U0132_TARGET_BITS_SATURATION
   m_CpbSaturationEnabled = false;
   m_cpbSize              = targetBitrate;
   m_cpbState             = (UInt)(m_cpbSize*0.5f);
   m_bufferingRate        = (Int)(targetBitrate / frameRate);
-#endif
 
 #if KWU_RC_MADPRED_E0227
@@ -1714 +1707 @@
 }
 
-#if U0132_TARGET_BITS_SATURATION
 Int  TEncRateCtrl::updateCpbState(Int actualBits)
 {
@@ -1742 +1734 @@
   printf("\nHRD - [Initial CPB state %6d] [CPB Size %6d] [Buffering Rate %6d]\n", m_cpbState, m_cpbSize, m_bufferingRate);
 }
-#endif
 
 Void TEncRateCtrl::destroyRCGOP()