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

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

Issue 1418613002: ChannelGroup cleanup. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added TODO Created 5 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
« no previous file with comments | « webrtc/call/call.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
(...skipping 11 matching lines...) Expand all
22 #include "webrtc/system_wrappers/interface/clock.h" 22 #include "webrtc/system_wrappers/interface/clock.h"
23 #include "webrtc/video/encoded_frame_callback_adapter.h" 23 #include "webrtc/video/encoded_frame_callback_adapter.h"
24 #include "webrtc/video/receive_statistics_proxy.h" 24 #include "webrtc/video/receive_statistics_proxy.h"
25 #include "webrtc/video_engine/vie_channel.h" 25 #include "webrtc/video_engine/vie_channel.h"
26 #include "webrtc/video_engine/vie_channel_group.h" 26 #include "webrtc/video_engine/vie_channel_group.h"
27 #include "webrtc/video_engine/vie_encoder.h" 27 #include "webrtc/video_engine/vie_encoder.h"
28 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class CallStats;
32 class VoiceEngine; 33 class VoiceEngine;
33 34
34 namespace internal { 35 namespace internal {
35 36
36 class VideoReceiveStream : public webrtc::VideoReceiveStream, 37 class VideoReceiveStream : public webrtc::VideoReceiveStream,
37 public I420FrameCallback, 38 public I420FrameCallback,
38 public VideoRenderCallback { 39 public VideoRenderCallback {
39 public: 40 public:
40 VideoReceiveStream(int num_cpu_cores, 41 VideoReceiveStream(int num_cpu_cores,
41 ChannelGroup* channel_group, 42 ChannelGroup* channel_group,
42 const VideoReceiveStream::Config& config, 43 const VideoReceiveStream::Config& config,
43 webrtc::VoiceEngine* voice_engine, 44 webrtc::VoiceEngine* voice_engine,
44 ProcessThread* process_thread); 45 ProcessThread* process_thread,
46 CallStats* call_stats);
45 ~VideoReceiveStream() override; 47 ~VideoReceiveStream() override;
46 48
47 // webrtc::ReceiveStream implementation. 49 // webrtc::ReceiveStream implementation.
48 void Start() override; 50 void Start() override;
49 void Stop() override; 51 void Stop() override;
50 void SignalNetworkState(NetworkState state) override; 52 void SignalNetworkState(NetworkState state) override;
51 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 53 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
52 bool DeliverRtp(const uint8_t* packet, 54 bool DeliverRtp(const uint8_t* packet,
53 size_t length, 55 size_t length,
54 const PacketTime& packet_time) override; 56 const PacketTime& packet_time) override;
(...skipping 12 matching lines...) Expand all
67 69
68 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 70 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
69 71
70 private: 72 private:
71 TransportAdapter transport_adapter_; 73 TransportAdapter transport_adapter_;
72 EncodedFrameCallbackAdapter encoded_frame_proxy_; 74 EncodedFrameCallbackAdapter encoded_frame_proxy_;
73 const VideoReceiveStream::Config config_; 75 const VideoReceiveStream::Config config_;
74 Clock* const clock_; 76 Clock* const clock_;
75 77
76 ChannelGroup* const channel_group_; 78 ChannelGroup* const channel_group_;
79 CallStats* const call_stats_;
77 80
78 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 81 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
79 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 82 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
80 rtc::scoped_ptr<ViEChannel> vie_channel_; 83 rtc::scoped_ptr<ViEChannel> vie_channel_;
81 }; 84 };
82 } // namespace internal 85 } // namespace internal
83 } // namespace webrtc 86 } // namespace webrtc
84 87
85 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 88 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698