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

Side by Side Diff: webrtc/video/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: . 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 DeliveryStatus DeliverPacket(MediaType media_type, 74 DeliveryStatus DeliverPacket(MediaType media_type,
75 const uint8_t* packet, 75 const uint8_t* packet,
76 size_t length, 76 size_t length,
77 const PacketTime& packet_time) override; 77 const PacketTime& packet_time) override;
78 78
79 void SetBitrateConfig( 79 void SetBitrateConfig(
80 const webrtc::Call::Config::BitrateConfig& bitrate_config) override; 80 const webrtc::Call::Config::BitrateConfig& bitrate_config) override;
81 void SignalNetworkState(NetworkState state) override; 81 void SignalNetworkState(NetworkState state) override;
82 82
83 void OnSentPacket(const SentPacket& packet_sent) override;
84
83 private: 85 private:
84 DeliveryStatus DeliverRtcp(MediaType media_type, const uint8_t* packet, 86 DeliveryStatus DeliverRtcp(MediaType media_type, const uint8_t* packet,
85 size_t length); 87 size_t length);
86 DeliveryStatus DeliverRtp(MediaType media_type, 88 DeliveryStatus DeliverRtp(MediaType media_type,
87 const uint8_t* packet, 89 const uint8_t* packet,
88 size_t length, 90 size_t length,
89 const PacketTime& packet_time); 91 const PacketTime& packet_time);
90 92
91 void SetBitrateControllerConfig( 93 void SetBitrateControllerConfig(
92 const webrtc::Call::Config::BitrateConfig& bitrate_config); 94 const webrtc::Call::Config::BitrateConfig& bitrate_config);
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 417 }
416 } 418 }
417 { 419 {
418 ReadLockScoped write_lock(*receive_crit_); 420 ReadLockScoped write_lock(*receive_crit_);
419 for (auto& kv : video_receive_ssrcs_) { 421 for (auto& kv : video_receive_ssrcs_) {
420 kv.second->SignalNetworkState(state); 422 kv.second->SignalNetworkState(state);
421 } 423 }
422 } 424 }
423 } 425 }
424 426
427 void Call::OnSentPacket(const SentPacket& packet_sent) {
428 channel_group_->OnSentPacket(packet_sent);
429 }
430
425 void Call::ConfigureSync(const std::string& sync_group) { 431 void Call::ConfigureSync(const std::string& sync_group) {
426 // Set sync only if there was no previous one. 432 // Set sync only if there was no previous one.
427 if (config_.voice_engine == nullptr || sync_group.empty()) 433 if (config_.voice_engine == nullptr || sync_group.empty())
428 return; 434 return;
429 435
430 AudioReceiveStream* sync_audio_stream = nullptr; 436 AudioReceiveStream* sync_audio_stream = nullptr;
431 // Find existing audio stream. 437 // Find existing audio stream.
432 const auto it = sync_stream_mapping_.find(sync_group); 438 const auto it = sync_stream_mapping_.find(sync_group);
433 if (it != sync_stream_mapping_.end()) { 439 if (it != sync_stream_mapping_.end()) {
434 sync_audio_stream = it->second; 440 sync_audio_stream = it->second;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 size_t length, 549 size_t length,
544 const PacketTime& packet_time) { 550 const PacketTime& packet_time) {
545 if (RtpHeaderParser::IsRtcp(packet, length)) 551 if (RtpHeaderParser::IsRtcp(packet, length))
546 return DeliverRtcp(media_type, packet, length); 552 return DeliverRtcp(media_type, packet, length);
547 553
548 return DeliverRtp(media_type, packet, length, packet_time); 554 return DeliverRtp(media_type, packet, length, packet_time);
549 } 555 }
550 556
551 } // namespace internal 557 } // namespace internal
552 } // namespace webrtc 558 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698