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

Side by Side Diff: webrtc/call/call.cc

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanups. 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 DeliveryStatus DeliverPacket(MediaType media_type, 71 DeliveryStatus DeliverPacket(MediaType media_type,
72 const uint8_t* packet, 72 const uint8_t* packet,
73 size_t length, 73 size_t length,
74 const PacketTime& packet_time) override; 74 const PacketTime& packet_time) override;
75 75
76 void SetBitrateConfig( 76 void SetBitrateConfig(
77 const webrtc::Call::Config::BitrateConfig& bitrate_config) override; 77 const webrtc::Call::Config::BitrateConfig& bitrate_config) override;
78 void SignalNetworkState(NetworkState state) override; 78 void SignalNetworkState(NetworkState state) override;
79 79
80 void OnSentPacket(const rtc::SentPacket& sent_packet) override;
81
80 private: 82 private:
81 DeliveryStatus DeliverRtcp(MediaType media_type, const uint8_t* packet, 83 DeliveryStatus DeliverRtcp(MediaType media_type, const uint8_t* packet,
82 size_t length); 84 size_t length);
83 DeliveryStatus DeliverRtp(MediaType media_type, 85 DeliveryStatus DeliverRtp(MediaType media_type,
84 const uint8_t* packet, 86 const uint8_t* packet,
85 size_t length, 87 size_t length,
86 const PacketTime& packet_time); 88 const PacketTime& packet_time);
87 89
88 void ConfigureSync(const std::string& sync_group) 90 void ConfigureSync(const std::string& sync_group)
89 EXCLUSIVE_LOCKS_REQUIRED(receive_crit_); 91 EXCLUSIVE_LOCKS_REQUIRED(receive_crit_);
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 } 405 }
404 } 406 }
405 { 407 {
406 ReadLockScoped write_lock(*receive_crit_); 408 ReadLockScoped write_lock(*receive_crit_);
407 for (auto& kv : video_receive_ssrcs_) { 409 for (auto& kv : video_receive_ssrcs_) {
408 kv.second->SignalNetworkState(state); 410 kv.second->SignalNetworkState(state);
409 } 411 }
410 } 412 }
411 } 413 }
412 414
415 void Call::OnSentPacket(const rtc::SentPacket& sent_packet) {
416 channel_group_->OnSentPacket(sent_packet);
417 }
418
413 void Call::ConfigureSync(const std::string& sync_group) { 419 void Call::ConfigureSync(const std::string& sync_group) {
414 // Set sync only if there was no previous one. 420 // Set sync only if there was no previous one.
415 if (config_.voice_engine == nullptr || sync_group.empty()) 421 if (config_.voice_engine == nullptr || sync_group.empty())
416 return; 422 return;
417 423
418 AudioReceiveStream* sync_audio_stream = nullptr; 424 AudioReceiveStream* sync_audio_stream = nullptr;
419 // Find existing audio stream. 425 // Find existing audio stream.
420 const auto it = sync_stream_mapping_.find(sync_group); 426 const auto it = sync_stream_mapping_.find(sync_group);
421 if (it != sync_stream_mapping_.end()) { 427 if (it != sync_stream_mapping_.end()) {
422 sync_audio_stream = it->second; 428 sync_audio_stream = it->second;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 size_t length, 537 size_t length,
532 const PacketTime& packet_time) { 538 const PacketTime& packet_time) {
533 if (RtpHeaderParser::IsRtcp(packet, length)) 539 if (RtpHeaderParser::IsRtcp(packet, length))
534 return DeliverRtcp(media_type, packet, length); 540 return DeliverRtcp(media_type, packet, length);
535 541
536 return DeliverRtp(media_type, packet, length, packet_time); 542 return DeliverRtp(media_type, packet, length, packet_time);
537 } 543 }
538 544
539 } // namespace internal 545 } // namespace internal
540 } // namespace webrtc 546 } // namespace webrtc
OLDNEW
« talk/session/media/channel.cc ('K') | « webrtc/call.h ('k') | webrtc/config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698