Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(672)

Unified Diff: webrtc/modules/audio_coding/acm2/rent_a_codec.h

Issue 1527933002: Add speech encoder to the encoder stack specification struct (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: don't death test on android Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/acm2/codec_manager.cc ('k') | webrtc/modules/audio_coding/acm2/rent_a_codec.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/acm2/rent_a_codec.h
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.h b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
index 7035104dd4e7a6c765150c460a63d58391b1e5f9..cf6891a62ca4cd907f00760867639fe118afdfe6 100644
--- a/webrtc/modules/audio_coding/acm2/rent_a_codec.h
+++ b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
@@ -204,6 +204,7 @@ class RentACodec {
StackParameters();
~StackParameters();
+ AudioEncoder* speech_encoder = nullptr;
bool use_codec_fec = false;
bool use_red = false;
bool use_cng = false;
@@ -219,12 +220,10 @@ class RentACodec {
// will be changed to match (things will be switched off). The returned
// encoder is live until the next successful call to this function, or until
// the Rent-A-Codec is destroyed.
- AudioEncoder* RentEncoderStack(AudioEncoder* speech_encoder,
- StackParameters* param);
+ AudioEncoder* RentEncoderStack(StackParameters* param);
- // Get the last return values of RentEncoder and RentEncoderStack, or null if
- // they haven't been called.
- AudioEncoder* GetEncoder() const { return speech_encoder_.get(); }
+ // The last return value of RentEncoderStack, or null if it hasn't been
+ // called.
AudioEncoder* GetEncoderStack() const { return encoder_stack_; }
// Creates and returns an iSAC decoder, which will remain live until the
« no previous file with comments | « webrtc/modules/audio_coding/acm2/codec_manager.cc ('k') | webrtc/modules/audio_coding/acm2/rent_a_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698