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

Remove CodecInst pt.1

Browse Source 
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}
This commit is contained in:
Fredrik Solenberg
2018-12-03 15:22:16 +01:00
committed by Commit Bot
parent 450b548cad
commit 056f9738bf
24 changed files with 359 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/audio_coding/test/TwoWayCommunication.cc
View File

@ -16,15 +16,9 @@
#include <memory>
#ifdef WIN32
#include <Windows.h>
#endif
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
#include "common_types.h" // NOLINT(build/include)
#include "modules/audio_coding/test/PCMFile.h"
#include "modules/audio_coding/test/utility.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
@ -65,25 +59,26 @@ void TwoWayCommunication::SetUpAutotest(
const int payload_type1,
const SdpAudioFormat& format2,
const int payload_type2) {
//--- Set A codecs
_acmA->SetEncoder(
encoder_factory->MakeAudioEncoder(payload_type1, format1, absl::nullopt));
EXPECT_EQ(true, _acmA->RegisterReceiveCodec(payload_type2, format2));
_acmA->SetReceiveCodecs({{payload_type2, format2}});
//--- Set ref-A codecs
_acmRefA->SetEncoder(
encoder_factory->MakeAudioEncoder(payload_type1, format1, absl::nullopt));
EXPECT_EQ(true, _acmRefA->RegisterReceiveCodec(payload_type2, format2));
_acmRefA->SetReceiveCodecs({{payload_type2, format2}});
//--- Set B codecs
_acmB->SetEncoder(
encoder_factory->MakeAudioEncoder(payload_type2, format2, absl::nullopt));
EXPECT_EQ(true, _acmB->RegisterReceiveCodec(payload_type1, format1));
_acmB->SetReceiveCodecs({{payload_type1, format1}});
//--- Set ref-B codecs
_acmRefB->SetEncoder(
encoder_factory->MakeAudioEncoder(payload_type2, format2, absl::nullopt));
EXPECT_EQ(true, _acmRefB->RegisterReceiveCodec(payload_type1, format1));
_acmRefB->SetReceiveCodecs({{payload_type1, format1}});
uint16_t frequencyHz;
@ -184,14 +179,13 @@ void TwoWayCommunication::Perform() {
if (((secPassed % 5) == 4) && (msecPassed >= 990)) {
_acmB->SetEncoder(encoder_factory->MakeAudioEncoder(
payload_type2, format2, absl::nullopt));
EXPECT_TRUE(_acmB->SendCodec());
}
// Initialize receiver on side A.
if (((secPassed % 7) == 6) && (msecPassed == 0))
EXPECT_EQ(0, _acmA->InitializeReceiver());
// Re-register codec on side A.
if (((secPassed % 7) == 6) && (msecPassed >= 990)) {
EXPECT_EQ(true, _acmA->RegisterReceiveCodec(payload_type2, format2));
_acmA->SetReceiveCodecs({{payload_type2, format2}});
}
}
}