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

Side by Side Diff: webrtc/pc/mediasession.h

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.cc ('k') | webrtc/pc/mediasession.cc » ('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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 // Default ctor; use methods below to set configuration. 414 // Default ctor; use methods below to set configuration.
415 // The TransportDescriptionFactory is not owned by MediaSessionDescFactory, 415 // The TransportDescriptionFactory is not owned by MediaSessionDescFactory,
416 // so it must be kept alive by the user of this class. 416 // so it must be kept alive by the user of this class.
417 explicit MediaSessionDescriptionFactory( 417 explicit MediaSessionDescriptionFactory(
418 const TransportDescriptionFactory* factory); 418 const TransportDescriptionFactory* factory);
419 // This helper automatically sets up the factory to get its configuration 419 // This helper automatically sets up the factory to get its configuration
420 // from the specified ChannelManager. 420 // from the specified ChannelManager.
421 MediaSessionDescriptionFactory(ChannelManager* cmanager, 421 MediaSessionDescriptionFactory(ChannelManager* cmanager,
422 const TransportDescriptionFactory* factory); 422 const TransportDescriptionFactory* factory);
423 423
424 const AudioCodecs& audio_codecs() const; 424 const AudioCodecs& audio_sendrecv_codecs() const;
425 const AudioCodecs& audio_send_codecs() const; 425 const AudioCodecs& audio_send_codecs() const;
426 const AudioCodecs& audio_recv_codecs() const; 426 const AudioCodecs& audio_recv_codecs() const;
427 void set_audio_codecs(const AudioCodecs& send_codecs, 427 void set_audio_codecs(const AudioCodecs& send_codecs,
428 const AudioCodecs& recv_codecs); 428 const AudioCodecs& recv_codecs);
429 void set_audio_rtp_header_extensions(const RtpHeaderExtensions& extensions) { 429 void set_audio_rtp_header_extensions(const RtpHeaderExtensions& extensions) {
430 audio_rtp_extensions_ = extensions; 430 audio_rtp_extensions_ = extensions;
431 } 431 }
432 const RtpHeaderExtensions& audio_rtp_header_extensions() const { 432 const RtpHeaderExtensions& audio_rtp_header_extensions() const {
433 return audio_rtp_extensions_; 433 return audio_rtp_extensions_;
434 } 434 }
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 void GetSupportedVideoCryptoSuiteNames( 581 void GetSupportedVideoCryptoSuiteNames(
582 std::vector<std::string>* crypto_suite_names); 582 std::vector<std::string>* crypto_suite_names);
583 void GetSupportedDataCryptoSuiteNames( 583 void GetSupportedDataCryptoSuiteNames(
584 std::vector<std::string>* crypto_suite_names); 584 std::vector<std::string>* crypto_suite_names);
585 void GetDefaultSrtpCryptoSuiteNames( 585 void GetDefaultSrtpCryptoSuiteNames(
586 std::vector<std::string>* crypto_suite_names); 586 std::vector<std::string>* crypto_suite_names);
587 587
588 } // namespace cricket 588 } // namespace cricket
589 589
590 #endif // WEBRTC_PC_MEDIASESSION_H_ 590 #endif // WEBRTC_PC_MEDIASESSION_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channelmanager.cc ('k') | webrtc/pc/mediasession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698