mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-15 14:50:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add field trial that enables Opus PLC.

Browse source 
Low-Coverage-Reason: EXPERIMENTAL_CODE Code is behind field trial that will only be used for testing.
Bug: webrtc:13322
Change-Id: Ie306be808381b3a20b4e0d58349927bf3524018a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/335840
Reviewed-by: Tomas Lundqvist <tomasl@google.com>
Commit-Queue: Jakob Ivarsson‎ <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41608}
This commit is contained in:
Jakob Ivarsson 2024-01-24 09:48:01 +01:00 committed by WebRTC LUCI CQ
parent de3c726121
commit c3624d02d0
3 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
experiments/field_trials.py
View file

@ -50,6 +50,9 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-Audio-OpusSetSignalVoiceWithDtx', FieldTrial('WebRTC-Audio-OpusSetSignalVoiceWithDtx',
'webrtc:4559', 'webrtc:4559',
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-Audio-OpusGeneratePlc',
'webrtc:13322',
date(2024, 4, 1)),
FieldTrial('WebRTC-AV1-OverridePriorityBitrate', FieldTrial('WebRTC-AV1-OverridePriorityBitrate',
'webrtc:15763', 'webrtc:15763',
date(2024, 4, 1)), date(2024, 4, 1)),

23
modules/audio_coding/codecs/opus/audio_decoder_opus.cc
View file

@ -17,12 +17,15 @@
#include "api/array_view.h" #include "api/array_view.h"
#include "modules/audio_coding/codecs/opus/audio_coder_opus_common.h" #include "modules/audio_coding/codecs/opus/audio_coder_opus_common.h"
#include "rtc_base/checks.h" #include "rtc_base/checks.h"
#include "system_wrappers/include/field_trial.h"
namespace webrtc { namespace webrtc {
AudioDecoderOpusImpl::AudioDecoderOpusImpl(size_t num_channels, AudioDecoderOpusImpl::AudioDecoderOpusImpl(size_t num_channels,
int sample_rate_hz) int sample_rate_hz)
: channels_{num_channels}, sample_rate_hz_{sample_rate_hz} { : channels_(num_channels),
sample_rate_hz_(sample_rate_hz),
generate_plc_(field_trial::IsEnabled("WebRTC-Audio-OpusGeneratePlc")) {
RTC_DCHECK(num_channels == 1 || num_channels == 2); RTC_DCHECK(num_channels == 1 || num_channels == 2);
RTC_DCHECK(sample_rate_hz == 16000 || sample_rate_hz == 48000); RTC_DCHECK(sample_rate_hz == 16000 || sample_rate_hz == 48000);
const int error = const int error =
@ -125,4 +128,22 @@ size_t AudioDecoderOpusImpl::Channels() const {
return channels_; return channels_;
} }
void AudioDecoderOpusImpl::GeneratePlc(
size_t requested_samples_per_channel,
rtc::BufferT<int16_t>* concealment_audio) {
if (!generate_plc_) {
return;
}
int plc_size = WebRtcOpus_PlcDuration(dec_state_) * channels_;
concealment_audio->AppendData(plc_size, [&](rtc::ArrayView<int16_t> decoded) {
int16_t temp_type = 1;
int ret =
WebRtcOpus_Decode(dec_state_, nullptr, 0, decoded.data(), &temp_type);
if (ret < 0) {
return 0;
}
return ret;
});
}
} // namespace webrtc } // namespace webrtc

3
modules/audio_coding/codecs/opus/audio_decoder_opus.h
View file

@ -40,6 +40,8 @@ class AudioDecoderOpusImpl final : public AudioDecoder {
bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override; bool PacketHasFec(const uint8_t* encoded, size_t encoded_len) const override;
int SampleRateHz() const override; int SampleRateHz() const override;
size_t Channels() const override; size_t Channels() const override;
void GeneratePlc(size_t requested_samples_per_channel,
rtc::BufferT<int16_t>* concealment_audio) override;
protected: protected:
int DecodeInternal(const uint8_t* encoded, int DecodeInternal(const uint8_t* encoded,
@ -57,6 +59,7 @@ class AudioDecoderOpusImpl final : public AudioDecoder {
OpusDecInst* dec_state_; OpusDecInst* dec_state_;
const size_t channels_; const size_t channels_;
const int sample_rate_hz_; const int sample_rate_hz_;
const bool generate_plc_;
}; };
} // namespace webrtc } // namespace webrtc