zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing AudioCoding duplicate tests

Browse Source 
Reverting to using one version of ACM in ACM tests.

BUG=2996
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5924 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-04-17 08:29:10 +00:00
parent 6cec07f6a7
commit adaf809612
23 changed files with 197 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/audio_coding/main/test/opus_test.h
View File

@ -13,8 +13,8 @@
#include <math.h>
#include "webrtc/modules/audio_coding/main/source/acm_opus.h"
#include "webrtc/modules/audio_coding/main/source/acm_resampler.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_opus.h"
#include "webrtc/modules/audio_coding/main/acm2/acm_resampler.h"
#include "webrtc/modules/audio_coding/main/test/ACMTest.h"
#include "webrtc/modules/audio_coding/main/test/Channel.h"
#include "webrtc/modules/audio_coding/main/test/PCMFile.h"
@ -23,11 +23,9 @@
namespace webrtc {
class Config;
class OpusTest : public ACMTest {
public:
explicit OpusTest(const Config& config);
OpusTest();
~OpusTest();
void Perform();
@ -47,7 +45,7 @@ class OpusTest : public ACMTest {
int counter_;
uint8_t payload_type_;
int rtp_timestamp_;
acm1::ACMResampler resampler_;
acm2::ACMResampler resampler_;
WebRtcOpusEncInst* opus_mono_encoder_;
WebRtcOpusEncInst* opus_stereo_encoder_;
WebRtcOpusDecInst* opus_mono_decoder_;