Imported Upstream version 1.4+222+hg5f9f7194267b

[deb_x265.git] / source / encoder / ratecontrol.h

diff --git a/source/encoder/ratecontrol.h b/source/encoder/ratecontrol.h
index 5b861473a4e156c5d0785540c395a0d667fcfcf3..13e1701e9bde86af245399601bbf7aeb56ef4ced 100644 (file)
--- a/source/encoder/ratecontrol.h
+++ b/source/encoder/ratecontrol.h
@@ -233,11 +233,10 @@ public:
     void initHRD(SPS* sps);
     int rateControlSliceType(int frameNum);
     bool cuTreeReadFor2Pass(Frame* curFrame);
+    double tuneAbrQScaleFromFeedback(double qScale);
 
 protected:
 
-    static const double s_amortizeFraction;
-    static const int    s_amortizeFrames;
     static const int    s_slidingWindowFrames;
     static const char  *s_defaultStatFileName;
 
@@ -245,6 +244,8 @@ protected:
     int m_partialResidualFrames;
     int m_residualCost;
     int m_partialResidualCost;
+    int m_amortizeFrames;
+    double m_amortizeFraction;
 
     double getQScale(RateControlEntry *rce, double rateFactor);
     double rateEstimateQscale(Frame* pic, RateControlEntry *rce); // main logic for calculating QP based on ABR