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

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

Issue 1412143002: Remove the video channel id completely. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove string. 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 21 matching lines...) Expand all
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 ChannelGroup* channel_group, 41 ChannelGroup* channel_group,
42 int channel_id,
43 const VideoReceiveStream::Config& config, 42 const VideoReceiveStream::Config& config,
44 webrtc::VoiceEngine* voice_engine, 43 webrtc::VoiceEngine* voice_engine,
45 ProcessThread* process_thread); 44 ProcessThread* process_thread);
46 ~VideoReceiveStream() override; 45 ~VideoReceiveStream() override;
47 46
48 // webrtc::ReceiveStream implementation. 47 // webrtc::ReceiveStream implementation.
49 void Start() override; 48 void Start() override;
50 void Stop() override; 49 void Stop() override;
51 void SignalNetworkState(NetworkState state) override; 50 void SignalNetworkState(NetworkState state) override;
52 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 51 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
(...skipping 24 matching lines...) Expand all
77 ChannelGroup* const channel_group_; 76 ChannelGroup* const channel_group_;
78 77
79 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 78 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
80 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 79 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
81 rtc::scoped_ptr<ViEChannel> vie_channel_; 80 rtc::scoped_ptr<ViEChannel> vie_channel_;
82 }; 81 };
83 } // namespace internal 82 } // namespace internal
84 } // namespace webrtc 83 } // namespace webrtc
85 84
86 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 85 #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