mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 22:30:40 +01:00

This reverts commitfab3460a82
. Reason for revert: fix downstream instead Original change's description: > Revert "Reland "Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker."" > > This reverts commit9973933d2e
. > > Reason for revert: breaking downstream projects and not reviewed by direct owners > > Original change's description: > > Reland "Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker." > > > > This reverts commit24192c267a
. > > > > Reason for revert: Analyzed the performance regression in more detail. > > > > Most of the regression comes from the extra RtpPacketInfos-related memory allocations in every `NetEq::GetAudio()` call. Commit1796a820f6
has removed roughly 2/3rds of the extra allocations from the impacted perf tests. Remaining perf impact is expected to be about "8 microseconds of CPU time per second" on the Linux benchmarking machines and "15 us per second" on Windows/Mac. > > > > There are options to optimize further but they are unlikely worth doing. Note for example that `NetEqPerformanceTest` uses the PCM codec while the real-world use cases would likely use the much heavier Opus codec. The numbers from `OpusSpeedTest` and `NetEqPerformanceTest` suggest that Opus decoding is about 10x as expensive as NetEq overall. > > > > Original change's description: > > > Revert "Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker." > > > > > > This reverts commit3e8ef940fe
. > > > > > > Reason for revert: This CL causes a performance regression in NetEq, see https://bugs.chromium.org/p/chromium/issues/detail?id=982260. > > > > > > Original change's description: > > > > Add plumbing of RtpPacketInfos to each AudioFrame as input for SourceTracker. > > > > > > > > This change adds the plumbing of RtpPacketInfo from ChannelReceive::OnRtpPacket() to ChannelReceive::GetAudioFrameWithInfo() for audio. It is a step towards replacing the non-spec compliant ContributingSources that updates itself at packet-receive time, with the spec-compliant SourceTracker that will update itself at frame-delivery-to-track time. > > > > > > > > Bug: webrtc:10668 > > > > Change-Id: I03385d6865bbc7bfbef7634f88de820a934f787a > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139890 > > > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > > > Reviewed-by: Minyue Li <minyue@webrtc.org> > > > > Commit-Queue: Chen Xing <chxg@google.com> > > > > Cr-Commit-Position: refs/heads/master@{#28434} > > > > > > TBR=kwiberg@webrtc.org,stefan@webrtc.org,minyue@webrtc.org,chxg@google.com > > > > > > Bug: webrtc:10668, chromium:982260 > > > Change-Id: I5e2cfde78c59d1123e21869564d76ed3f6193a5c > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145339 > > > Reviewed-by: Ivo Creusen <ivoc@webrtc.org> > > > Commit-Queue: Ivo Creusen <ivoc@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#28561} > > > > TBR=kwiberg@webrtc.org,stefan@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org,chxg@google.com > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:10668, chromium:982260 > > Change-Id: Ie375a0b327ee368317bf3a04b2f1415c3a974470 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146707 > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Chen Xing <chxg@google.com> > > Cr-Commit-Position: refs/heads/master@{#28664} > > TBR=kwiberg@webrtc.org,stefan@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org,chxg@google.com > > Change-Id: I652cb0814d83b514d3bee34e65ca3bb693099b22 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:10668, chromium:982260 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146712 > Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> > Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28671} TBR=alessiob@webrtc.org,kwiberg@webrtc.org,stefan@webrtc.org,ivoc@webrtc.org,minyue@webrtc.org,chxg@google.com Change-Id: Id43b7b3da79b4f48004b41767482bae1c1fa1e16 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10668, chromium:982260 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/146713 Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28672}
176 lines
4.9 KiB
C++
176 lines
4.9 KiB
C++
/*
|
|
* Copyright (c) 2014 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.
|
|
*/
|
|
|
|
#ifndef MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
|
|
#define MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
|
|
|
|
#include <fstream>
|
|
#include <memory>
|
|
|
|
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
|
|
#include "modules/audio_coding/neteq/include/neteq.h"
|
|
#include "modules/audio_coding/neteq/tools/audio_sink.h"
|
|
#include "modules/audio_coding/neteq/tools/input_audio_file.h"
|
|
#include "modules/audio_coding/neteq/tools/rtp_generator.h"
|
|
#include "system_wrappers/include/clock.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
enum LossModes {
|
|
kNoLoss,
|
|
kUniformLoss,
|
|
kGilbertElliotLoss,
|
|
kFixedLoss,
|
|
kLastLossMode
|
|
};
|
|
|
|
class LossModel {
|
|
public:
|
|
virtual ~LossModel() {}
|
|
virtual bool Lost(int now_ms) = 0;
|
|
};
|
|
|
|
class NoLoss : public LossModel {
|
|
public:
|
|
bool Lost(int now_ms) override;
|
|
};
|
|
|
|
class UniformLoss : public LossModel {
|
|
public:
|
|
UniformLoss(double loss_rate);
|
|
bool Lost(int now_ms) override;
|
|
void set_loss_rate(double loss_rate) { loss_rate_ = loss_rate; }
|
|
|
|
private:
|
|
double loss_rate_;
|
|
};
|
|
|
|
class GilbertElliotLoss : public LossModel {
|
|
public:
|
|
GilbertElliotLoss(double prob_trans_11, double prob_trans_01);
|
|
~GilbertElliotLoss() override;
|
|
bool Lost(int now_ms) override;
|
|
|
|
private:
|
|
// Prob. of losing current packet, when previous packet is lost.
|
|
double prob_trans_11_;
|
|
// Prob. of losing current packet, when previous packet is not lost.
|
|
double prob_trans_01_;
|
|
bool lost_last_;
|
|
std::unique_ptr<UniformLoss> uniform_loss_model_;
|
|
};
|
|
|
|
struct FixedLossEvent {
|
|
int start_ms;
|
|
int duration_ms;
|
|
FixedLossEvent(int start_ms, int duration_ms)
|
|
: start_ms(start_ms), duration_ms(duration_ms) {}
|
|
};
|
|
|
|
struct FixedLossEventCmp {
|
|
bool operator()(const FixedLossEvent& l_event,
|
|
const FixedLossEvent& r_event) const {
|
|
return l_event.start_ms < r_event.start_ms;
|
|
}
|
|
};
|
|
|
|
class FixedLossModel : public LossModel {
|
|
public:
|
|
FixedLossModel(std::set<FixedLossEvent, FixedLossEventCmp> loss_events);
|
|
~FixedLossModel() override;
|
|
bool Lost(int now_ms) override;
|
|
|
|
private:
|
|
std::set<FixedLossEvent, FixedLossEventCmp> loss_events_;
|
|
std::set<FixedLossEvent, FixedLossEventCmp>::iterator loss_events_it_;
|
|
};
|
|
|
|
class NetEqQualityTest : public ::testing::Test {
|
|
protected:
|
|
NetEqQualityTest(
|
|
int block_duration_ms,
|
|
int in_sampling_khz,
|
|
int out_sampling_khz,
|
|
const SdpAudioFormat& format,
|
|
const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory =
|
|
webrtc::CreateBuiltinAudioDecoderFactory());
|
|
~NetEqQualityTest() override;
|
|
|
|
void SetUp() override;
|
|
|
|
// EncodeBlock(...) does the following:
|
|
// 1. encodes a block of audio, saved in |in_data| and has a length of
|
|
// |block_size_samples| (samples per channel),
|
|
// 2. save the bit stream to |payload| of |max_bytes| bytes in size,
|
|
// 3. returns the length of the payload (in bytes),
|
|
virtual int EncodeBlock(int16_t* in_data,
|
|
size_t block_size_samples,
|
|
rtc::Buffer* payload,
|
|
size_t max_bytes) = 0;
|
|
|
|
// PacketLost(...) determines weather a packet sent at an indicated time gets
|
|
// lost or not.
|
|
bool PacketLost();
|
|
|
|
// DecodeBlock() decodes a block of audio using the payload stored in
|
|
// |payload_| with the length of |payload_size_bytes_| (bytes). The decoded
|
|
// audio is to be stored in |out_data_|.
|
|
int DecodeBlock();
|
|
|
|
// Transmit() uses |rtp_generator_| to generate a packet and passes it to
|
|
// |neteq_|.
|
|
int Transmit();
|
|
|
|
// Runs encoding / transmitting / decoding.
|
|
void Simulate();
|
|
|
|
// Write to log file. Usage Log() << ...
|
|
std::ofstream& Log();
|
|
|
|
SdpAudioFormat audio_format_;
|
|
const size_t channels_;
|
|
|
|
private:
|
|
int decoded_time_ms_;
|
|
int decodable_time_ms_;
|
|
double drift_factor_;
|
|
int packet_loss_rate_;
|
|
const int block_duration_ms_;
|
|
const int in_sampling_khz_;
|
|
const int out_sampling_khz_;
|
|
|
|
// Number of samples per channel in a frame.
|
|
const size_t in_size_samples_;
|
|
|
|
size_t payload_size_bytes_;
|
|
size_t max_payload_bytes_;
|
|
|
|
std::unique_ptr<InputAudioFile> in_file_;
|
|
std::unique_ptr<AudioSink> output_;
|
|
std::ofstream log_file_;
|
|
|
|
std::unique_ptr<RtpGenerator> rtp_generator_;
|
|
std::unique_ptr<NetEq> neteq_;
|
|
std::unique_ptr<LossModel> loss_model_;
|
|
|
|
std::unique_ptr<int16_t[]> in_data_;
|
|
rtc::Buffer payload_;
|
|
AudioFrame out_frame_;
|
|
RTPHeader rtp_header_;
|
|
|
|
size_t total_payload_size_bytes_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_AUDIO_CODING_NETEQ_TOOLS_NETEQ_QUALITY_TEST_H_
|