Changeset 1390 in 3DVCSoftware for branches/HTM-16.0-MV-draft-5/source/Lib/TLibEncoder/TEncRateCtrl.h

Timestamp:

13 Nov 2015, 17:00:20 (9 years ago)

Author:

tech

Message:

Removed 3D.

File:

• branches/HTM-16.0-MV-draft-5/source/Lib/TLibEncoder/TEncRateCtrl.h (modified) (10 diffs)

branches/HTM-16.0-MV-draft-5/source/Lib/TLibEncoder/TEncRateCtrl.h

@@ -87 +87 @@
   Double m_costIntra;
   Int m_targetBitsLeft;
-#if KWU_RC_MADPRED_E0227
-  Double m_MAD;
-  Int m_CUWidth;
-  Int m_CUHeight;
-  Double m_IVMAD;
-#endif
 };
 
@@ -228 +222 @@
 
 public:
-#if KWU_RC_MADPRED_E0227
-  Void create( TEncRCSeq* encRCSeq, TEncRCGOP* encRCGOP, Int frameLevel, list<TEncRCPic*>& listPreviousPictures, Int layerID );
-#else
   Void create( TEncRCSeq* encRCSeq, TEncRCGOP* encRCGOP, Int frameLevel, list<TEncRCPic*>& listPreviousPictures );
-#endif
   Void destroy();
 
-#if KWU_RC_MADPRED_E0227
-  Double estimatePicLambdaIV( list<TEncRCPic*>& listPreviousPictures, Int curPOC );
-#endif
   Int    estimatePicQP    ( Double lambda, list<TEncRCPic*>& listPreviousPictures );
   Int    getRefineBitsForIntra(Int orgBits);
@@ -247 +234 @@
   Double getLCUTargetBpp(SliceType eSliceType);
   Double getLCUEstLambdaAndQP(Double bpp, Int clipPicQP, Int *estQP);
-#if KWU_RC_MADPRED_E0227
-  Double getLCUTargetBppforInterView( list<TEncRCPic*>& listPreviousPictures, TComDataCU* pcCU, Double basePos, Double curPos, Double focalLen, Double znear, Double zfar, Int direction, Int* disparity );
-#endif
   Double getLCUEstLambda( Double bpp );
   Int    getLCUEstQP( Double lambda, Int clipPicQP );
@@ -257 +241 @@
 
   Void addToPictureLsit( list<TEncRCPic*>& listPreviousPictures );
-#if KWU_RC_MADPRED_E0227
-  Void addToPictureLsitIV( list<TEncRCPic*>& listPreviousPictures );
-  Void setIVPic( TEncRCPic* baseRCPic );
-#endif
   Double calAverageQP();
   Double calAverageLambda();
@@ -291 +271 @@
   Void setTotalIntraCost(Double cost)                     { m_totalCostIntra = cost; }
   Void getLCUInitTargetBits();
-#if KWU_RC_MADPRED_E0227
-  Double getTotalMAD()                                    { return m_totalMAD; }
-  Void   setTotalMAD( Double MAD )                        { m_totalMAD = MAD; }
-
-  Double getIVTotalMAD()                                    { return m_IVtotalMAD; }
-  Void   setIVTotalMAD( Double MAD )                        { m_IVtotalMAD = MAD; }
-#endif
 
   Int  getPicActualBits()                                 { return m_picActualBits; }
@@ -307 +280 @@
   Void setPicEstLambda( Double lambda )                   { m_picLambda = lambda; }
 
-#if KWU_RC_MADPRED_E0227
-  Int getLayerID()                                         { return m_LayerID; }
-  Void setLayerID(Int layerid)                              { m_LayerID = layerid; }
-#endif
 private:
   TEncRCSeq* m_encRCSeq;
@@ -334 +303 @@
   Int m_picQP;                  // in integer form
   Double m_picLambda;
-#if KWU_RC_MADPRED_E0227
-  Double m_totalMAD;
-  TEncRCPic* m_lastPicture;
-  Int m_LayerID;
-  TEncRCPic* m_lastIVPicture;
-  Double m_IVtotalMAD;
-#endif
 };
 
@@ -350 +312 @@
 
 public:
-#if KWU_RC_MADPRED_E0227
-  Void init( Int totalFrames, Int targetBitrate, Int frameRate, Int GOPSize, Int picWidth, Int picHeight, Int LCUWidth, Int LCUHeight, Bool keepHierBits, Bool useLCUSeparateModel, GOPEntry GOPList[MAX_GOP], Int layerID );
-#else
   Void init( Int totalFrames, Int targetBitrate, Int frameRate, Int GOPSize, Int picWidth, Int picHeight, Int LCUWidth, Int LCUHeight, Int keepHierBits, Bool useLCUSeparateModel, GOPEntry GOPList[MAX_GOP] );
-#endif
   Void destroy();
   Void initRCPic( Int frameLevel );
@@ -368 +326 @@
   list<TEncRCPic*>& getPicList() { return m_listRCPictures; }
 
-#if KWU_RC_MADPRED_E0227
-  Int getLayerID()                { return m_LayerID; }
-  Void setLayerID(Int layerid)     { m_LayerID = layerid; }
-#endif
 #if U0132_TARGET_BITS_SATURATION
   Bool       getCpbSaturationEnabled()  { return m_CpbSaturationEnabled;  }
@@ -394 +348 @@
 #endif
 
-#if KWU_RC_MADPRED_E0227
-  Int m_LayerID;
+};
+
 #endif
-};
-
-#endif
-
-
+
+