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

Regression test for issue where Opus DTX status was being forgotten.

Browse Source 
BUG=webrtc:6020

Review-Url: https://codereview.webrtc.org/2177263002
Cr-Commit-Position: refs/heads/master@{#13539}
This commit is contained in:
ivoc
2016-07-27 04:53:47 -07:00
committed by Commit bot
parent f22d3c48fa
commit 85228d6af6
12 changed files with 92 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_coding/codecs/audio_encoder.cc
View File

@ -50,6 +50,10 @@ bool AudioEncoder::SetDtx(bool enable) {
return !enable;
}
bool AudioEncoder::GetDtx() const {
return false;
}
bool AudioEncoder::SetApplication(Application application) {
return false;
}

4
webrtc/modules/audio_coding/codecs/audio_encoder.h
View File

@ -127,6 +127,10 @@ class AudioEncoder {
// supported).
virtual bool SetDtx(bool enable);
// Returns the status of codec-internal DTX. The default implementation always
// returns false.
virtual bool GetDtx() const;
// Sets the application mode. Returns true if the codec was able to comply.
// The default implementation just returns false.
enum class Application { kSpeech, kAudio };

4
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@ -152,6 +152,10 @@ bool AudioEncoderOpus::SetDtx(bool enable) {
return RecreateEncoderInstance(conf);
}
bool AudioEncoderOpus::GetDtx() const {
return config_.dtx_enabled;
}
bool AudioEncoderOpus::SetApplication(Application application) {
auto conf = config_;
switch (application) {

2
webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h
View File

@ -75,6 +75,7 @@ class AudioEncoderOpus final : public AudioEncoder {
// being inactive. During that, it still sends 2 packets (one for content, one
// for signaling) about every 400 ms.
bool SetDtx(bool enable) override;
bool GetDtx() const override;
bool SetApplication(Application application) override;
void SetMaxPlaybackRate(int frequency_hz) override;
@ -84,7 +85,6 @@ class AudioEncoderOpus final : public AudioEncoder {
// Getters for testing.
double packet_loss_rate() const { return packet_loss_rate_; }
ApplicationMode application() const { return config_.application; }
bool dtx_enabled() const { return config_.dtx_enabled; }
protected:
EncodedInfo EncodeImpl(uint32_t rtp_timestamp,