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

Side by Side Diff: webrtc/video_engine/vie_receiver.cc

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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 | « webrtc/video_engine/vie_receiver.h ('k') | webrtc/voice_engine/channel.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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 15 matching lines...) Expand all
26 #include "webrtc/system_wrappers/interface/logging.h" 26 #include "webrtc/system_wrappers/interface/logging.h"
27 #include "webrtc/system_wrappers/interface/metrics.h" 27 #include "webrtc/system_wrappers/interface/metrics.h"
28 #include "webrtc/system_wrappers/interface/tick_util.h" 28 #include "webrtc/system_wrappers/interface/tick_util.h"
29 #include "webrtc/system_wrappers/interface/timestamp_extrapolator.h" 29 #include "webrtc/system_wrappers/interface/timestamp_extrapolator.h"
30 #include "webrtc/system_wrappers/interface/trace.h" 30 #include "webrtc/system_wrappers/interface/trace.h"
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 static const int kPacketLogIntervalMs = 10000; 34 static const int kPacketLogIntervalMs = 10000;
35 35
36 ViEReceiver::ViEReceiver(const int32_t channel_id, 36 ViEReceiver::ViEReceiver(VideoCodingModule* module_vcm,
37 VideoCodingModule* module_vcm,
38 RemoteBitrateEstimator* remote_bitrate_estimator, 37 RemoteBitrateEstimator* remote_bitrate_estimator,
39 RtpFeedback* rtp_feedback) 38 RtpFeedback* rtp_feedback)
40 : receive_cs_(CriticalSectionWrapper::CreateCriticalSection()), 39 : receive_cs_(CriticalSectionWrapper::CreateCriticalSection()),
41 clock_(Clock::GetRealTimeClock()), 40 clock_(Clock::GetRealTimeClock()),
42 rtp_header_parser_(RtpHeaderParser::Create()), 41 rtp_header_parser_(RtpHeaderParser::Create()),
43 rtp_payload_registry_( 42 rtp_payload_registry_(
44 new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(false))), 43 new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(false))),
45 rtp_receiver_( 44 rtp_receiver_(
46 RtpReceiver::CreateVideoReceiver(channel_id, 45 RtpReceiver::CreateVideoReceiver(clock_,
47 clock_,
48 this, 46 this,
49 rtp_feedback, 47 rtp_feedback,
50 rtp_payload_registry_.get())), 48 rtp_payload_registry_.get())),
51 rtp_receive_statistics_(ReceiveStatistics::Create(clock_)), 49 rtp_receive_statistics_(ReceiveStatistics::Create(clock_)),
52 fec_receiver_(FecReceiver::Create(this)), 50 fec_receiver_(FecReceiver::Create(this)),
53 rtp_rtcp_(NULL), 51 rtp_rtcp_(NULL),
54 vcm_(module_vcm), 52 vcm_(module_vcm),
55 remote_bitrate_estimator_(remote_bitrate_estimator), 53 remote_bitrate_estimator_(remote_bitrate_estimator),
56 ntp_estimator_(new RemoteNtpTimeEstimator(clock_)), 54 ntp_estimator_(new RemoteNtpTimeEstimator(clock_)),
57 receiving_(false), 55 receiving_(false),
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 rtp_receive_statistics_->GetStatistician(header.ssrc); 470 rtp_receive_statistics_->GetStatistician(header.ssrc);
473 if (!statistician) 471 if (!statistician)
474 return false; 472 return false;
475 // Check if this is a retransmission. 473 // Check if this is a retransmission.
476 int64_t min_rtt = 0; 474 int64_t min_rtt = 0;
477 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL); 475 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL);
478 return !in_order && 476 return !in_order &&
479 statistician->IsRetransmitOfOldPacket(header, min_rtt); 477 statistician->IsRetransmitOfOldPacket(header, min_rtt);
480 } 478 }
481 } // namespace webrtc 479 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_receiver.h ('k') | webrtc/voice_engine/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698