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

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

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Rebase onto split-off RtcError CL Created 3 years, 10 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/mediasession.h ('k') | webrtc/pc/ortcfactory.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 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 } 1273 }
1274 1274
1275 MediaSessionDescriptionFactory::MediaSessionDescriptionFactory( 1275 MediaSessionDescriptionFactory::MediaSessionDescriptionFactory(
1276 ChannelManager* channel_manager, 1276 ChannelManager* channel_manager,
1277 const TransportDescriptionFactory* transport_desc_factory) 1277 const TransportDescriptionFactory* transport_desc_factory)
1278 : secure_(SEC_DISABLED), 1278 : secure_(SEC_DISABLED),
1279 add_legacy_(true), 1279 add_legacy_(true),
1280 transport_desc_factory_(transport_desc_factory) { 1280 transport_desc_factory_(transport_desc_factory) {
1281 channel_manager->GetSupportedAudioSendCodecs(&audio_send_codecs_); 1281 channel_manager->GetSupportedAudioSendCodecs(&audio_send_codecs_);
1282 channel_manager->GetSupportedAudioReceiveCodecs(&audio_recv_codecs_); 1282 channel_manager->GetSupportedAudioReceiveCodecs(&audio_recv_codecs_);
1283 channel_manager->GetSupportedAudioSendCodecs(&audio_send_codecs_);
1284 channel_manager->GetSupportedAudioRtpHeaderExtensions(&audio_rtp_extensions_); 1283 channel_manager->GetSupportedAudioRtpHeaderExtensions(&audio_rtp_extensions_);
1285 channel_manager->GetSupportedVideoCodecs(&video_codecs_); 1284 channel_manager->GetSupportedVideoCodecs(&video_codecs_);
1286 channel_manager->GetSupportedVideoRtpHeaderExtensions(&video_rtp_extensions_); 1285 channel_manager->GetSupportedVideoRtpHeaderExtensions(&video_rtp_extensions_);
1287 channel_manager->GetSupportedDataCodecs(&data_codecs_); 1286 channel_manager->GetSupportedDataCodecs(&data_codecs_);
1288 NegotiateCodecs(audio_recv_codecs_, audio_send_codecs_, 1287 NegotiateCodecs(audio_recv_codecs_, audio_send_codecs_,
1289 &audio_sendrecv_codecs_); 1288 &audio_sendrecv_codecs_);
1290 } 1289 }
1291 1290
1292 const AudioCodecs& MediaSessionDescriptionFactory::audio_sendrecv_codecs() 1291 const AudioCodecs& MediaSessionDescriptionFactory::audio_sendrecv_codecs()
1293 const { 1292 const {
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
2169 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO)); 2168 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
2170 } 2169 }
2171 2170
2172 DataContentDescription* GetFirstDataContentDescription( 2171 DataContentDescription* GetFirstDataContentDescription(
2173 SessionDescription* sdesc) { 2172 SessionDescription* sdesc) {
2174 return static_cast<DataContentDescription*>( 2173 return static_cast<DataContentDescription*>(
2175 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA)); 2174 GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
2176 } 2175 }
2177 2176
2178 } // namespace cricket 2177 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.h ('k') | webrtc/pc/ortcfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698