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

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

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years 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/video_engine/vie_remb.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
11 #include "webrtc/video/vie_receiver.h" 11 #include "webrtc/video_engine/vie_receiver.h"
12 12
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/base/logging.h" 15 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h" 16 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat or.h"
17 #include "webrtc/modules/rtp_rtcp/include/fec_receiver.h" 17 #include "webrtc/modules/rtp_rtcp/include/fec_receiver.h"
18 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 18 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
19 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 19 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
20 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
21 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" 21 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 rtp_receive_statistics_->GetStatistician(header.ssrc); 473 rtp_receive_statistics_->GetStatistician(header.ssrc);
474 if (!statistician) 474 if (!statistician)
475 return false; 475 return false;
476 // Check if this is a retransmission. 476 // Check if this is a retransmission.
477 int64_t min_rtt = 0; 477 int64_t min_rtt = 0;
478 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL); 478 rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL);
479 return !in_order && 479 return !in_order &&
480 statistician->IsRetransmitOfOldPacket(header, min_rtt); 480 statistician->IsRetransmitOfOldPacket(header, min_rtt);
481 } 481 }
482 } // namespace webrtc 482 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_receiver.h ('k') | webrtc/video_engine/vie_remb.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698