LastDecoderError was only used in tests. LastError was only used in conjunction with RemovePayloadType, and always to distinguish between "decoder not found" and "other error". In AcmReceiver, "decoder not found" was not treated as an error. With this change, calling NetEq::RemovePayloadType with a payload type that is not registered is no longer considered to be an error. This allows to rewrite the code in AcmReceiver, such that it no longer has to call LastError. The internal member variables NetEqImpl::error_code_ and NetEqImpl::decoder_error_code_ are removed, since they were no longer read. Bug: none Change-Id: Ibfe97265954a2870c3caea4a34aac958351d7ff1 Reviewed-on: https://chromium-review.googlesource.com/535533 Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18588}
137 lines
4.6 KiB
C++
137 lines
4.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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.
|
|
*/
|
|
|
|
#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h"
|
|
|
|
#include <iostream>
|
|
|
|
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
void DefaultNetEqTestErrorCallback::OnInsertPacketError(
|
|
const NetEqInput::PacketData& packet) {
|
|
std::cerr << "InsertPacket returned an error." << std::endl;
|
|
std::cerr << "Packet data: " << packet.ToString() << std::endl;
|
|
FATAL();
|
|
}
|
|
|
|
void DefaultNetEqTestErrorCallback::OnGetAudioError() {
|
|
std::cerr << "GetAudio returned an error." << std::endl;
|
|
FATAL();
|
|
}
|
|
|
|
NetEqTest::NetEqTest(const NetEq::Config& config,
|
|
const DecoderMap& codecs,
|
|
const ExtDecoderMap& ext_codecs,
|
|
std::unique_ptr<NetEqInput> input,
|
|
std::unique_ptr<AudioSink> output,
|
|
Callbacks callbacks)
|
|
: neteq_(NetEq::Create(config, CreateBuiltinAudioDecoderFactory())),
|
|
input_(std::move(input)),
|
|
output_(std::move(output)),
|
|
callbacks_(callbacks),
|
|
sample_rate_hz_(config.sample_rate_hz) {
|
|
RTC_CHECK(!config.enable_muted_state)
|
|
<< "The code does not handle enable_muted_state";
|
|
RegisterDecoders(codecs);
|
|
RegisterExternalDecoders(ext_codecs);
|
|
}
|
|
|
|
int64_t NetEqTest::Run() {
|
|
const int64_t start_time_ms = *input_->NextEventTime();
|
|
int64_t time_now_ms = start_time_ms;
|
|
|
|
while (!input_->ended()) {
|
|
// Advance time to next event.
|
|
RTC_DCHECK(input_->NextEventTime());
|
|
time_now_ms = *input_->NextEventTime();
|
|
// Check if it is time to insert packet.
|
|
if (input_->NextPacketTime() && time_now_ms >= *input_->NextPacketTime()) {
|
|
std::unique_ptr<NetEqInput::PacketData> packet_data = input_->PopPacket();
|
|
RTC_CHECK(packet_data);
|
|
int error = neteq_->InsertPacket(
|
|
packet_data->header,
|
|
rtc::ArrayView<const uint8_t>(packet_data->payload),
|
|
static_cast<uint32_t>(packet_data->time_ms * sample_rate_hz_ / 1000));
|
|
if (error != NetEq::kOK && callbacks_.error_callback) {
|
|
callbacks_.error_callback->OnInsertPacketError(*packet_data);
|
|
}
|
|
if (callbacks_.post_insert_packet) {
|
|
callbacks_.post_insert_packet->AfterInsertPacket(*packet_data,
|
|
neteq_.get());
|
|
}
|
|
}
|
|
|
|
// Check if it is time to get output audio.
|
|
if (input_->NextOutputEventTime() &&
|
|
time_now_ms >= *input_->NextOutputEventTime()) {
|
|
if (callbacks_.get_audio_callback) {
|
|
callbacks_.get_audio_callback->BeforeGetAudio(neteq_.get());
|
|
}
|
|
AudioFrame out_frame;
|
|
bool muted;
|
|
int error = neteq_->GetAudio(&out_frame, &muted);
|
|
RTC_CHECK(!muted) << "The code does not handle enable_muted_state";
|
|
if (error != NetEq::kOK) {
|
|
if (callbacks_.error_callback) {
|
|
callbacks_.error_callback->OnGetAudioError();
|
|
}
|
|
} else {
|
|
sample_rate_hz_ = out_frame.sample_rate_hz_;
|
|
}
|
|
if (callbacks_.get_audio_callback) {
|
|
callbacks_.get_audio_callback->AfterGetAudio(time_now_ms, out_frame,
|
|
muted, neteq_.get());
|
|
}
|
|
|
|
if (output_) {
|
|
RTC_CHECK(output_->WriteArray(
|
|
out_frame.data(),
|
|
out_frame.samples_per_channel_ * out_frame.num_channels_));
|
|
}
|
|
|
|
input_->AdvanceOutputEvent();
|
|
}
|
|
}
|
|
return time_now_ms - start_time_ms;
|
|
}
|
|
|
|
NetEqNetworkStatistics NetEqTest::SimulationStats() {
|
|
NetEqNetworkStatistics stats;
|
|
RTC_CHECK_EQ(neteq_->NetworkStatistics(&stats), 0);
|
|
return stats;
|
|
}
|
|
|
|
void NetEqTest::RegisterDecoders(const DecoderMap& codecs) {
|
|
for (const auto& c : codecs) {
|
|
RTC_CHECK_EQ(
|
|
neteq_->RegisterPayloadType(c.second.first, c.second.second, c.first),
|
|
NetEq::kOK)
|
|
<< "Cannot register " << c.second.second << " to payload type "
|
|
<< c.first;
|
|
}
|
|
}
|
|
|
|
void NetEqTest::RegisterExternalDecoders(const ExtDecoderMap& codecs) {
|
|
for (const auto& c : codecs) {
|
|
RTC_CHECK_EQ(
|
|
neteq_->RegisterExternalDecoder(c.second.decoder, c.second.codec,
|
|
c.second.codec_name, c.first),
|
|
NetEq::kOK)
|
|
<< "Cannot register " << c.second.codec_name << " to payload type "
|
|
<< c.first;
|
|
}
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|