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/EncodeDecodeTest.h

diff --git a/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h
index df6ee5f..9132d71 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.h
+++ b/modules/audio_coding/test/EncodeDecodeTest.h
@@ -47,12 +47,13 @@
  public:
   Sender();
   void Setup(AudioCodingModule *acm, RTPStream *rtpStream,
-             std::string in_file_name, int in_sample_rate,
-             int payload_type, SdpAudioFormat format);
+             std::string in_file_name, int sample_rate, size_t channels);
   void Teardown();
   void Run();
   bool Add10MsData();
 
+  uint8_t codeId;
+
  protected:
   AudioCodingModule* _acm;
 
@@ -67,12 +68,15 @@
   Receiver();
   virtual ~Receiver() {};
   void Setup(AudioCodingModule *acm, RTPStream *rtpStream,
-             std::string out_file_name, size_t channels, int file_num);
+             std::string out_file_name, size_t channels);
   void Teardown();
   void Run();
   virtual bool IncomingPacket();
   bool PlayoutData();
 
+  //for auto_test and logging
+  uint8_t codeId;
+
  private:
   PCMFile _pcmFile;
   int16_t* _playoutBuffer;
@@ -92,8 +96,17 @@
 
 class EncodeDecodeTest {
  public:
-  EncodeDecodeTest();
+  explicit EncodeDecodeTest(int test_mode);
   void Perform();
+
+  uint16_t _playoutFreq;
+
+ private:
+  std::string EncodeToFile(int fileType, int codeId, int* codePars);
+
+ protected:
+  Sender _sender;
+  Receiver _receiver;
 };
 
 }  // namespace webrtc