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

Side by Side Diff: webrtc/pc/channelmanager.cc

Issue 2013053002: Support for two audio codec lists down into WebRtcVoiceEngine. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@asymmetric-audio-codec-support
Patch Set: Replaced MergeSendRecvCodecs with NegotiateCodecs. Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // app. 92 // app.
93 if (!initialized_) { 93 if (!initialized_) {
94 enable_rtx_ = enable; 94 enable_rtx_ = enable;
95 return true; 95 return true;
96 } else { 96 } else {
97 LOG(LS_WARNING) << "Cannot toggle rtx after initialization!"; 97 LOG(LS_WARNING) << "Cannot toggle rtx after initialization!";
98 return false; 98 return false;
99 } 99 }
100 } 100 }
101 101
102 void ChannelManager::GetSupportedAudioCodecs( 102 void ChannelManager::GetSupportedAudioSendCodecs(
103 std::vector<AudioCodec>* codecs) const { 103 std::vector<AudioCodec>* codecs) const {
104 codecs->clear(); 104 *codecs = media_engine_->audio_send_codecs();
105 }
105 106
106 for (std::vector<AudioCodec>::const_iterator it = 107 void ChannelManager::GetSupportedAudioReceiveCodecs(
107 media_engine_->audio_codecs().begin(); 108 std::vector<AudioCodec>* codecs) const {
108 it != media_engine_->audio_codecs().end(); ++it) { 109 *codecs = media_engine_->audio_recv_codecs();
109 codecs->push_back(*it);
110 }
111 } 110 }
112 111
113 void ChannelManager::GetSupportedAudioRtpHeaderExtensions( 112 void ChannelManager::GetSupportedAudioRtpHeaderExtensions(
114 RtpHeaderExtensions* ext) const { 113 RtpHeaderExtensions* ext) const {
115 *ext = media_engine_->GetAudioCapabilities().header_extensions; 114 *ext = media_engine_->GetAudioCapabilities().header_extensions;
116 } 115 }
117 116
118 void ChannelManager::GetSupportedVideoCodecs( 117 void ChannelManager::GetSupportedVideoCodecs(
119 std::vector<VideoCodec>* codecs) const { 118 std::vector<VideoCodec>* codecs) const {
120 codecs->clear(); 119 codecs->clear();
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 return worker_thread_->Invoke<bool>( 416 return worker_thread_->Invoke<bool>(
418 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); 417 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
419 } 418 }
420 419
421 void ChannelManager::StopRtcEventLog() { 420 void ChannelManager::StopRtcEventLog() {
422 worker_thread_->Invoke<void>( 421 worker_thread_->Invoke<void>(
423 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); 422 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
424 } 423 }
425 424
426 } // namespace cricket 425 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.h ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698