NetEq: Implement logging of Delayed Packet Outage Events

webrtc/modules/audio_coding/neteq/expand.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_
 
 #include <assert.h>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Forward declarations.
 class BackgroundNoise;
 class RandomVector;
+class StatisticsCalculator;
 class SyncBuffer;
 
 // This class handles extrapolation of audio data from the sync_buffer to
 // produce packet-loss concealment.
 // TODO(hlundin): Refactor this class to divide the long methods into shorter
 // ones.
 class Expand {
  public:
   Expand(BackgroundNoise* background_noise,
          SyncBuffer* sync_buffer,
          RandomVector* random_vector,
+         StatisticsCalculator* statistics,
          int fs,
          size_t num_channels);
 
   virtual ~Expand();
 
   // Resets the object.
   virtual void Reset();
 
   // The main method to produce concealment data. The data is appended to the
   // end of |output|.
@@ skipping 32 matching lines @@
 
   // Initializes member variables at the beginning of an expand period.
   void InitializeForAnExpandPeriod();
 
   bool TooManyExpands();
 
   // Analyzes the signal history in |sync_buffer_|, and set up all parameters
   // necessary to produce concealment data.
   void AnalyzeSignal(int16_t* random_vector);
 
-  RandomVector* random_vector_;
-  SyncBuffer* sync_buffer_;
+  RandomVector* const random_vector_;
+  SyncBuffer* const sync_buffer_;
   bool first_expand_;
   const int fs_hz_;
   const size_t num_channels_;
   int consecutive_expands_;
 
  private:
   static const int kUnvoicedLpcOrder = 6;
   static const int kNumCorrelationCandidates = 3;
   static const int kDistortionLength = 20;
   static const int kLpcAnalysisLength = 160;
@@ skipping 19 matching lines @@
   // samples. The correlation is calculated from a downsampled version of
   // |input|, and is written to |output|. The scale factor is written to
   // |output_scale|.
   void Correlation(const int16_t* input,
                    size_t input_length,
                    int16_t* output,
                    int* output_scale) const;
 
   void UpdateLagIndex();
 
-  BackgroundNoise* background_noise_;
+  BackgroundNoise* const background_noise_;
+  StatisticsCalculator* const statistics_;
   const size_t overlap_length_;
   int16_t max_lag_;
   size_t expand_lags_[kNumLags];
   int lag_index_direction_;
   int current_lag_index_;
   bool stop_muting_;
+  size_t expand_duration_samples_;
   rtc::scoped_ptr<ChannelParameters[]> channel_parameters_;
 
   DISALLOW_COPY_AND_ASSIGN(Expand);
 };
 
 struct ExpandFactory {
   ExpandFactory() {}
   virtual ~ExpandFactory() {}
 
   virtual Expand* Create(BackgroundNoise* background_noise,
                          SyncBuffer* sync_buffer,
                          RandomVector* random_vector,
+                         StatisticsCalculator* statistics,
                          int fs,
                          size_t num_channels) const;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_NETEQ_EXPAND_H_