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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1512853007: Remove cricket::VideoEncoderConfig. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove stale function 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 unified diff | Download patch
« no previous file with comments | « no previous file | talk/media/base/codec.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 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 SetOptionFromOptionalConstraint(constraints, 699 SetOptionFromOptionalConstraint(constraints,
700 MediaConstraintsInterface::kCombinedAudioVideoBwe, 700 MediaConstraintsInterface::kCombinedAudioVideoBwe,
701 &audio_options_.combined_audio_video_bwe); 701 &audio_options_.combined_audio_video_bwe);
702 702
703 audio_options_.audio_jitter_buffer_max_packets = 703 audio_options_.audio_jitter_buffer_max_packets =
704 rtc::Optional<int>(rtc_configuration.audio_jitter_buffer_max_packets); 704 rtc::Optional<int>(rtc_configuration.audio_jitter_buffer_max_packets);
705 705
706 audio_options_.audio_jitter_buffer_fast_accelerate = rtc::Optional<bool>( 706 audio_options_.audio_jitter_buffer_fast_accelerate = rtc::Optional<bool>(
707 rtc_configuration.audio_jitter_buffer_fast_accelerate); 707 rtc_configuration.audio_jitter_buffer_fast_accelerate);
708 708
709 const cricket::VideoCodec default_codec(
710 JsepSessionDescription::kDefaultVideoCodecId,
711 JsepSessionDescription::kDefaultVideoCodecName,
712 JsepSessionDescription::kMaxVideoCodecWidth,
713 JsepSessionDescription::kMaxVideoCodecHeight,
714 JsepSessionDescription::kDefaultVideoCodecFramerate,
715 JsepSessionDescription::kDefaultVideoCodecPreference);
716 channel_manager_->SetDefaultVideoEncoderConfig(
717 cricket::VideoEncoderConfig(default_codec));
718
719 if (!dtls_enabled_) { 709 if (!dtls_enabled_) {
720 // Construct with DTLS disabled. 710 // Construct with DTLS disabled.
721 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( 711 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory(
722 signaling_thread(), channel_manager_, this, id())); 712 signaling_thread(), channel_manager_, this, id()));
723 } else { 713 } else {
724 // Construct with DTLS enabled. 714 // Construct with DTLS enabled.
725 if (!certificate) { 715 if (!certificate) {
726 // Use the |dtls_identity_store| to generate a certificate. 716 // Use the |dtls_identity_store| to generate a certificate.
727 RTC_DCHECK(dtls_identity_store); 717 RTC_DCHECK(dtls_identity_store);
728 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory( 718 webrtc_session_desc_factory_.reset(new WebRtcSessionDescriptionFactory(
(...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after
2189 } 2179 }
2190 } 2180 }
2191 2181
2192 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2182 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2193 const rtc::SentPacket& sent_packet) { 2183 const rtc::SentPacket& sent_packet) {
2194 RTC_DCHECK(worker_thread()->IsCurrent()); 2184 RTC_DCHECK(worker_thread()->IsCurrent());
2195 media_controller_->call_w()->OnSentPacket(sent_packet); 2185 media_controller_->call_w()->OnSentPacket(sent_packet);
2196 } 2186 }
2197 2187
2198 } // namespace webrtc 2188 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | talk/media/base/codec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698