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

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

Issue 2470913004: Moved transport_adapter.h/.cc from call/ to video/ dir to remove circular dependency (Closed)
Patch Set: Fixed footer guards Created 4 years, 1 month 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/transport_adapter.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('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) 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
11 #ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
12 #define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 12 #define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/call/transport_adapter.h"
18 #include "webrtc/common_video/include/incoming_video_stream.h" 17 #include "webrtc/common_video/include/incoming_video_stream.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 18 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" 19 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
21 #include "webrtc/modules/video_coding/video_coding_impl.h" 20 #include "webrtc/modules/video_coding/video_coding_impl.h"
22 #include "webrtc/system_wrappers/include/clock.h" 21 #include "webrtc/system_wrappers/include/clock.h"
23 #include "webrtc/video/receive_statistics_proxy.h" 22 #include "webrtc/video/receive_statistics_proxy.h"
24 #include "webrtc/video/rtp_stream_receiver.h" 23 #include "webrtc/video/rtp_stream_receiver.h"
25 #include "webrtc/video/rtp_streams_synchronizer.h" 24 #include "webrtc/video/rtp_streams_synchronizer.h"
25 #include "webrtc/video/transport_adapter.h"
26 #include "webrtc/video/video_stream_decoder.h" 26 #include "webrtc/video/video_stream_decoder.h"
27 #include "webrtc/video_receive_stream.h" 27 #include "webrtc/video_receive_stream.h"
28 28
29 namespace webrtc { 29 namespace webrtc {
30 30
31 class CallStats; 31 class CallStats;
32 class CongestionController; 32 class CongestionController;
33 class IvfFileWriter; 33 class IvfFileWriter;
34 class ProcessThread; 34 class ProcessThread;
35 class RTPFragmentationHeader; 35 class RTPFragmentationHeader;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 116 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
117 RtpStreamsSynchronizer rtp_stream_sync_; 117 RtpStreamsSynchronizer rtp_stream_sync_;
118 118
119 rtc::CriticalSection ivf_writer_lock_; 119 rtc::CriticalSection ivf_writer_lock_;
120 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 120 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
121 }; 121 };
122 } // namespace internal 122 } // namespace internal
123 } // namespace webrtc 123 } // namespace webrtc
124 124
125 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 125 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/transport_adapter.cc ('k') | webrtc/video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698