webrtc/video/video_receive_stream.h - Issue 1411723002: Move ownership of receive ViEChannel to VideoReceiveStream.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/video/video_receive_stream.h

Issue 1411723002: Move ownership of receive ViEChannel to VideoReceiveStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Delete ViEChannel first. 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 side-by-side diff with in-line comments

Download patch

Index: webrtc/video/video_receive_stream.h

diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h

index a16eab4529ea1e1ecd7a2c28da45573815fc1dd5..e42a419515d2aacfc275f46bc3bf76f564f3ac50 100644

--- a/webrtc/video/video_receive_stream.h

+++ b/webrtc/video/video_receive_stream.h

@@ -41,7 +41,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,

ChannelGroup* channel_group,

int channel_id,

const VideoReceiveStream::Config& config,

- webrtc::VoiceEngine* voice_engine);

+ webrtc::VoiceEngine* voice_engine,

+ ProcessThread* process_thread);

~VideoReceiveStream() override;

// webrtc::ReceiveStream implementation.

@@ -74,9 +75,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,

Clock* const clock_;

ChannelGroup* const channel_group_;

- const int channel_id_;

- ViEChannel* vie_channel_;

+ rtc::scoped_ptr<ViEChannel> vie_channel_;

rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;

rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;

pbos-webrtc 2015/10/16 12:49:57 I think you can move this one to the top since it

mflodman 2015/10/16 13:31:57 Done.

« no previous file with comments | « webrtc/call/call.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | webrtc/video/video_receive_stream.cc » ('J')