Experimental implementation of gain control.

1 files changed, 15 insertions, 5 deletions

diff --git a/src/atrac3denc.h b/src/atrac3denc.h
index 5984728..4b0980c 100644
--- a/src/atrac3denc.h
+++ b/src/atrac3denc.h
@@ -30,8 +30,13 @@ public:
     using TGainDemodulator = TAtrac3GainProcessor::TGainDemodulator;
     typedef std::array<TGainDemodulator, 4> TGainDemodulatorArray;
     typedef std::array<TGainModulator, 4> TGainModulatorArray;
-    void Mdct(TFloat specs[1024], TFloat* bands[4], TGainModulatorArray gainModulators = TGainModulatorArray());
-    void Midct(TFloat specs[1024], TFloat* bands[4], TGainDemodulatorArray gainDemodulators = TGainDemodulatorArray());
+    void Mdct(TFloat specs[1024],
+              TFloat* bands[4],
+              TFloat maxLevels[4],
+              TGainModulatorArray gainModulators = TGainModulatorArray());
+    void Midct(TFloat specs[1024],
+               TFloat* bands[4],
+               TGainDemodulatorArray gainDemodulators = TGainDemodulatorArray());
 protected:
     TAtrac3MDCT::TGainModulatorArray MakeGainModulatorArray(const TAtrac3Data::SubbandInfo& si);
 };
@@ -43,6 +48,11 @@ class TAtrac3Processor : public IProcessor<TFloat>, public TAtrac3MDCT, public v
     TCompressedIOPtr Oma;
     const NAtrac3::TAtrac3EncoderSettings Params;
     TFloat PcmBuffer[2][4][256 + 256]; //2 channel, 4 band, 256 sample + 256 for overlap buffer
+
+    TFloat LastLevels[2][4]; //2 channel, 4 band - level of last subblock, used to create curve
+    TFloat LastHPLevels[2][4]; //2 channel, 4 band - level of last HP filtered subblock, used for transient detection
+    TFloat PrevPeak[2][4]; //2 channel, 4 band - peak level (after windowing), used to check overflow during scalling
+
     Atrac3SplitFilterBank<TFloat> SplitFilterBank[2];
     TScaler<TAtrac3Data> Scaler;
     std::vector<TTransientDetector> TransientDetectors;
@@ -50,11 +60,11 @@ class TAtrac3Processor : public IProcessor<TFloat>, public TAtrac3MDCT, public v
 #ifdef ATRAC_UT_PUBLIC
 public:
 #endif
-    uint32_t CheckLevelOverflow(const std::vector<TFloat>& gain, const TAtrac3Data::SubbandInfo::TGainPoint& point);
-    std::vector<SubbandInfo::TGainPoint> FilterCurve(const std::vector<TFloat>& gain,
-                                                     const std::vector<SubbandInfo::TGainPoint>& curve,
+    uint32_t CheckLevelOverflow(TFloat max, uint32_t levelIdx);
+    std::vector<SubbandInfo::TGainPoint> FilterCurve(const std::vector<SubbandInfo::TGainPoint>& curve,
                                                      const int threshold);
     TFloat LimitRel(TFloat x);
+    std::vector<TFloat> CalcBaseLevel(TFloat prev, const std::vector<TFloat>& gain);
     TAtrac3Data::SubbandInfo CreateSubbandInfo(TFloat* in[4], uint32_t channel, TTransientDetector* transientDetector);
     TonalComponentMask AnalyzeTonalComponent(TFloat* specs);
     TTonalComponents ExtractTonalComponents(TFloat* specs, TTonalDetector fn);