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

Side by Side Diff: webrtc/video/rtp_stream_receiver.h

Issue 2401673002: Delete old video defines in engine config and rename file (Closed)
Patch Set: And GYP Created 4 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) 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 #ifndef WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 11 #ifndef WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
12 #define WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 12 #define WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory> 15 #include <memory>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/constructormagic.h" 19 #include "webrtc/base/constructormagic.h"
20 #include "webrtc/base/criticalsection.h" 20 #include "webrtc/base/criticalsection.h"
21 #include "webrtc/engine_configurations.h"
22 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h" 21 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
23 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h" 22 #include "webrtc/modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
24 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 24 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
26 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 25 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
27 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 26 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
28 #include "webrtc/typedefs.h" 27 #include "webrtc/typedefs.h"
29 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
30 29
31 namespace webrtc { 30 namespace webrtc {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_); 149 uint8_t restored_packet_[IP_PACKET_SIZE] GUARDED_BY(receive_cs_);
151 bool restored_packet_in_use_ GUARDED_BY(receive_cs_); 150 bool restored_packet_in_use_ GUARDED_BY(receive_cs_);
152 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_); 151 int64_t last_packet_log_ms_ GUARDED_BY(receive_cs_);
153 152
154 const std::unique_ptr<RtpRtcp> rtp_rtcp_; 153 const std::unique_ptr<RtpRtcp> rtp_rtcp_;
155 }; 154 };
156 155
157 } // namespace webrtc 156 } // namespace webrtc
158 157
159 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_ 158 #endif // WEBRTC_VIDEO_RTP_STREAM_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698