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

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

Issue 1671893002: Remove ViEChannel calls for VideoReceiveStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: comment Created 4 years, 10 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/send_statistics_proxy.cc ('k') | webrtc/video/video_receive_stream.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 <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/call.h" 17 #include "webrtc/call.h"
18 #include "webrtc/call/transport_adapter.h" 18 #include "webrtc/call/transport_adapter.h"
19 #include "webrtc/common_video/include/incoming_video_stream.h" 19 #include "webrtc/common_video/include/incoming_video_stream.h"
20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
21 #include "webrtc/modules/video_render/video_render_defines.h" 21 #include "webrtc/modules/video_render/video_render_defines.h"
22 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
23 #include "webrtc/video/encoded_frame_callback_adapter.h" 23 #include "webrtc/video/encoded_frame_callback_adapter.h"
24 #include "webrtc/video/payload_router.h"
25 #include "webrtc/video/receive_statistics_proxy.h" 24 #include "webrtc/video/receive_statistics_proxy.h"
26 #include "webrtc/video/vie_channel.h" 25 #include "webrtc/video/vie_channel.h"
27 #include "webrtc/video/vie_encoder.h" 26 #include "webrtc/video/vie_encoder.h"
28 #include "webrtc/video_encoder.h" 27 #include "webrtc/video_encoder.h"
29 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
30 29
31 namespace webrtc { 30 namespace webrtc {
32 31
33 class CallStats; 32 class CallStats;
34 class CongestionController; 33 class CongestionController;
34 class ProcessThread;
35 class VoiceEngine; 35 class VoiceEngine;
36 36
37 namespace internal { 37 namespace internal {
38 38
39 class VideoReceiveStream : public webrtc::VideoReceiveStream, 39 class VideoReceiveStream : public webrtc::VideoReceiveStream,
40 public I420FrameCallback, 40 public I420FrameCallback,
41 public VideoRenderCallback, 41 public VideoRenderCallback,
42 public EncodedImageCallback { 42 public EncodedImageCallback {
43 public: 43 public:
44 VideoReceiveStream(int num_cpu_cores, 44 VideoReceiveStream(int num_cpu_cores,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ProcessThread* const process_thread_; 84 ProcessThread* const process_thread_;
85 Clock* const clock_; 85 Clock* const clock_;
86 86
87 CongestionController* const congestion_controller_; 87 CongestionController* const congestion_controller_;
88 CallStats* const call_stats_; 88 CallStats* const call_stats_;
89 89
90 rtc::scoped_ptr<VideoCodingModule> vcm_; 90 rtc::scoped_ptr<VideoCodingModule> vcm_;
91 IncomingVideoStream incoming_video_stream_; 91 IncomingVideoStream incoming_video_stream_;
92 ReceiveStatisticsProxy stats_proxy_; 92 ReceiveStatisticsProxy stats_proxy_;
93 ViEChannel vie_channel_; 93 ViEChannel vie_channel_;
94 ViEReceiver* const vie_receiver_;
95 RtpRtcp* const rtp_rtcp_;
94 }; 96 };
95 } // namespace internal 97 } // namespace internal
96 } // namespace webrtc 98 } // namespace webrtc
97 99
98 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 100 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698