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

Unified Diff: webrtc/modules/audio_coding/main/acm2/acm_receiver.cc

Issue 1362943004: ACM: Removing runtime APIs related to playout mode (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 3 months 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
Index: webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
index 2040ae1c4ed11f71853d4d4e0b3d24a7dbf7c6e4..bfcf76ce724d84c01a845183edea6bd7dd3f9416 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver.cc
@@ -213,51 +213,6 @@ int AcmReceiver::current_sample_rate_hz() const {
return current_sample_rate_hz_;
}
-// TODO(turajs): use one set of enumerators, e.g. the one defined in
-// common_types.h
-// TODO(henrik.lundin): This method is not used any longer. The call hierarchy
-// stops in voe::Channel::SetNetEQPlayoutMode(). Remove it.
-void AcmReceiver::SetPlayoutMode(AudioPlayoutMode mode) {
- enum NetEqPlayoutMode playout_mode = kPlayoutOn;
- switch (mode) {
- case voice:
- playout_mode = kPlayoutOn;
- break;
- case fax: // No change to background noise mode.
- playout_mode = kPlayoutFax;
- break;
- case streaming:
- playout_mode = kPlayoutStreaming;
- break;
- case off:
- playout_mode = kPlayoutOff;
- break;
- }
- neteq_->SetPlayoutMode(playout_mode);
-}
-
-AudioPlayoutMode AcmReceiver::PlayoutMode() const {
- AudioPlayoutMode acm_mode = voice;
- NetEqPlayoutMode mode = neteq_->PlayoutMode();
- switch (mode) {
- case kPlayoutOn:
- acm_mode = voice;
- break;
- case kPlayoutOff:
- acm_mode = off;
- break;
- case kPlayoutFax:
- acm_mode = fax;
- break;
- case kPlayoutStreaming:
- acm_mode = streaming;
- break;
- default:
- assert(false);
- }
- return acm_mode;
-}
-
int AcmReceiver::InsertPacket(const WebRtcRTPHeader& rtp_header,
const uint8_t* incoming_payload,
size_t length_payload) {
« no previous file with comments | « webrtc/modules/audio_coding/main/acm2/acm_receiver.h ('k') | webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698