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

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

Issue 1251163002: Remove base channel for video receivers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix data race Created 5 years, 5 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) 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 20 matching lines...) Expand all
31 31
32 class VoiceEngine; 32 class VoiceEngine;
33 33
34 namespace internal { 34 namespace internal {
35 35
36 class VideoReceiveStream : public webrtc::VideoReceiveStream, 36 class VideoReceiveStream : public webrtc::VideoReceiveStream,
37 public I420FrameCallback, 37 public I420FrameCallback,
38 public VideoRenderCallback { 38 public VideoRenderCallback {
39 public: 39 public:
40 VideoReceiveStream(int num_cpu_cores, 40 VideoReceiveStream(int num_cpu_cores,
41 int base_channel_id,
42 ChannelGroup* channel_group, 41 ChannelGroup* channel_group,
43 int channel_id, 42 int channel_id,
44 const VideoReceiveStream::Config& config, 43 const VideoReceiveStream::Config& config,
45 newapi::Transport* transport, 44 newapi::Transport* transport,
46 webrtc::VoiceEngine* voice_engine); 45 webrtc::VoiceEngine* voice_engine);
47 ~VideoReceiveStream() override; 46 ~VideoReceiveStream() override;
48 47
49 // webrtc::ReceiveStream implementation. 48 // webrtc::ReceiveStream implementation.
50 void Start() override; 49 void Start() override;
51 void Stop() override; 50 void Stop() override;
(...skipping 28 matching lines...) Expand all
80 79
81 ViEChannel* vie_channel_; 80 ViEChannel* vie_channel_;
82 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 81 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
83 82
84 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 83 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
85 }; 84 };
86 } // namespace internal 85 } // namespace internal
87 } // namespace webrtc 86 } // namespace webrtc
88 87
89 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 88 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698