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

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

Issue 1407693005: Remove simulcast bitrate modes. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove constants Created 5 years, 2 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 | « talk/app/webrtc/mediaconstraintsinterface.cc ('k') | talk/media/base/mediachannel.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 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 video_options_.unsignalled_recv_stream_limit.Get(&stream_limit); 689 video_options_.unsignalled_recv_stream_limit.Get(&stream_limit);
690 stream_limit = std::min(kMaxUnsignalledRecvStreams, stream_limit); 690 stream_limit = std::min(kMaxUnsignalledRecvStreams, stream_limit);
691 stream_limit = std::max(0, stream_limit); 691 stream_limit = std::max(0, stream_limit);
692 video_options_.unsignalled_recv_stream_limit.Set(stream_limit); 692 video_options_.unsignalled_recv_stream_limit.Set(stream_limit);
693 } 693 }
694 694
695 SetOptionFromOptionalConstraint(constraints, 695 SetOptionFromOptionalConstraint(constraints,
696 MediaConstraintsInterface::kHighStartBitrate, 696 MediaConstraintsInterface::kHighStartBitrate,
697 &video_options_.video_start_bitrate); 697 &video_options_.video_start_bitrate);
698 698
699 if (FindConstraint(
700 constraints,
701 MediaConstraintsInterface::kVeryHighBitrate,
702 &value,
703 NULL)) {
704 video_options_.video_highest_bitrate.Set(
705 cricket::VideoOptions::VERY_HIGH);
706 } else if (FindConstraint(
707 constraints,
708 MediaConstraintsInterface::kHighBitrate,
709 &value,
710 NULL)) {
711 video_options_.video_highest_bitrate.Set(
712 cricket::VideoOptions::HIGH);
713 }
714
715 SetOptionFromOptionalConstraint(constraints, 699 SetOptionFromOptionalConstraint(constraints,
716 MediaConstraintsInterface::kCombinedAudioVideoBwe, 700 MediaConstraintsInterface::kCombinedAudioVideoBwe,
717 &audio_options_.combined_audio_video_bwe); 701 &audio_options_.combined_audio_video_bwe);
718 702
719 audio_options_.audio_jitter_buffer_max_packets.Set( 703 audio_options_.audio_jitter_buffer_max_packets.Set(
720 rtc_configuration.audio_jitter_buffer_max_packets); 704 rtc_configuration.audio_jitter_buffer_max_packets);
721 705
722 audio_options_.audio_jitter_buffer_fast_accelerate.Set( 706 audio_options_.audio_jitter_buffer_fast_accelerate.Set(
723 rtc_configuration.audio_jitter_buffer_fast_accelerate); 707 rtc_configuration.audio_jitter_buffer_fast_accelerate);
724 708
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
2211 } 2195 }
2212 } 2196 }
2213 2197
2214 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2198 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2215 const rtc::SentPacket& sent_packet) { 2199 const rtc::SentPacket& sent_packet) {
2216 RTC_DCHECK(worker_thread()->IsCurrent()); 2200 RTC_DCHECK(worker_thread()->IsCurrent());
2217 media_controller_->call_w()->OnSentPacket(sent_packet); 2201 media_controller_->call_w()->OnSentPacket(sent_packet);
2218 } 2202 }
2219 2203
2220 } // namespace webrtc 2204 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/mediaconstraintsinterface.cc ('k') | talk/media/base/mediachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698