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

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

Issue 1419673014: Remove frame time scheduing in IncomingVideoStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename flag to disable_prerenderer_smoothing Created 5 years, 1 month 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
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 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 LOG(LS_INFO) << "Session: " << id() << " is destroyed."; 587 LOG(LS_INFO) << "Session: " << id() << " is destroyed.";
588 } 588 }
589 589
590 bool WebRtcSession::Initialize( 590 bool WebRtcSession::Initialize(
591 const PeerConnectionFactoryInterface::Options& options, 591 const PeerConnectionFactoryInterface::Options& options,
592 const MediaConstraintsInterface* constraints, 592 const MediaConstraintsInterface* constraints,
593 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 593 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
594 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) { 594 const PeerConnectionInterface::RTCConfiguration& rtc_configuration) {
595 bundle_policy_ = rtc_configuration.bundle_policy; 595 bundle_policy_ = rtc_configuration.bundle_policy;
596 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy; 596 rtcp_mux_policy_ = rtc_configuration.rtcp_mux_policy;
597 video_options_.disable_prerenderer_smoothing =
598 rtc::Optional<bool>(rtc_configuration.disable_prerenderer_smoothing);
597 transport_controller_->SetSslMaxProtocolVersion(options.ssl_max_version); 599 transport_controller_->SetSslMaxProtocolVersion(options.ssl_max_version);
598 600
599 // Obtain a certificate from RTCConfiguration if any were provided (optional). 601 // Obtain a certificate from RTCConfiguration if any were provided (optional).
600 rtc::scoped_refptr<rtc::RTCCertificate> certificate; 602 rtc::scoped_refptr<rtc::RTCCertificate> certificate;
601 if (!rtc_configuration.certificates.empty()) { 603 if (!rtc_configuration.certificates.empty()) {
602 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of 604 // TODO(hbos,torbjorng): Decide on certificate-selection strategy instead of
603 // just picking the first one. The decision should be made based on the DTLS 605 // just picking the first one. The decision should be made based on the DTLS
604 // handshake. The DTLS negotiations need to know about all certificates. 606 // handshake. The DTLS negotiations need to know about all certificates.
605 certificate = rtc_configuration.certificates[0]; 607 certificate = rtc_configuration.certificates[0];
606 } 608 }
(...skipping 1581 matching lines...) Expand 10 before | Expand all | Expand 10 after
2188 } 2190 }
2189 } 2191 }
2190 2192
2191 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2193 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2192 const rtc::SentPacket& sent_packet) { 2194 const rtc::SentPacket& sent_packet) {
2193 RTC_DCHECK(worker_thread()->IsCurrent()); 2195 RTC_DCHECK(worker_thread()->IsCurrent());
2194 media_controller_->call_w()->OnSentPacket(sent_packet); 2196 media_controller_->call_w()->OnSentPacket(sent_packet);
2195 } 2197 }
2196 2198
2197 } // namespace webrtc 2199 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698