commit ec0f45be1144078338805b8bd525b29e8e736085
author Fredrik Solenberg <solenberg@webrtc.org> Mon Dec 03 15:50:44 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Mon Dec 03 15:50:51 2018 +0000
tree 63daac9a0b8ed19a2397140f6f66c2e4059dd594
parent 9d54bd889898baa02a2b3920cbaf80fa3c70e598

Revert "Remove CodecInst pt.1"

This reverts commit 056f9738bf7a3d16da45398239656e165c4e0851.

Reason for revert: breaks downstream

Original change's description:
> Remove CodecInst pt.1
> 
> Update audio_coding tests to not use CodecInst.
> 
> Bug: webrtc:7626
> Change-Id: I880fb8d72d7d0a915d274e67feb6106f023697c2
> Reviewed-on: https://webrtc-review.googlesource.com/c/112594
> Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25879}

TBR=solenberg@webrtc.org,kwiberg@webrtc.org

Change-Id: I51d666969bcd63e2b7cb7d669ec2f59b5f8f9dde
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7626
Reviewed-on: https://webrtc-review.googlesource.com/c/112906
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25881}

modules/audio_coding/test/iSACTest.h

diff --git a/modules/audio_coding/test/iSACTest.h b/modules/audio_coding/test/iSACTest.h
index e000476..0b140b6 100644
--- a/modules/audio_coding/test/iSACTest.h
+++ b/modules/audio_coding/test/iSACTest.h
@@ -15,9 +15,14 @@
 
 #include <memory>
 
+#include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/audio_coding/test/Channel.h"
 #include "modules/audio_coding/test/PCMFile.h"
+#include "modules/audio_coding/test/utility.h"
+
+#define MAX_FILE_NAME_LENGTH_BYTE 500
+#define NO_OF_CLIENTS 15
 
 namespace webrtc {
 
@@ -32,37 +37,12 @@
 
 class ISACTest {
  public:
-  ISACTest();
+  explicit ISACTest(int testMode);
   ~ISACTest();
 
   void Perform();
 
  private:
-  class ACMTestTimer {
-   public:
-    ACMTestTimer();
-    ~ACMTestTimer();
-
-    void Reset();
-    void Tick10ms();
-    void Tick1ms();
-    void Tick100ms();
-    void Tick1sec();
-    void CurrentTimeHMS(char* currTime);
-    void CurrentTime(unsigned long& h,
-                     unsigned char& m,
-                     unsigned char& s,
-                     unsigned short& ms);
-
-   private:
-    void Adjust();
-
-    unsigned short _msec;
-    unsigned char _sec;
-    unsigned char _min;
-    unsigned long _hour;
-  };
-
   void Setup();
 
   void Run10ms();
@@ -85,9 +65,15 @@
   PCMFile _outFileA;
   PCMFile _outFileB;
 
+  uint8_t _idISAC16kHz;
+  uint8_t _idISAC32kHz;
+  CodecInst _paramISAC16kHz;
+  CodecInst _paramISAC32kHz;
+
   std::string file_name_swb_;
 
   ACMTestTimer _myTimer;
+  int _testMode;
 };
 
 }  // namespace webrtc