talk/session/media/channelmanager.h - Issue 1687273002: Revert of Make cricket::VideoCapturer implement VideoSourceInterface

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: talk/session/media/channelmanager.h

Issue 1687273002: Revert of Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: 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

OLD	NEW
1 /*	1 /*

2 * libjingle	2 * libjingle

3 * Copyright 2004 Google Inc.	3 * Copyright 2004 Google Inc.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions are met:	6 * modification, are permitted provided that the following conditions are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright notice,	8 * 1. Redistributions of source code must retain the above copyright notice,

9 * this list of conditions and the following disclaimer.	9 * this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright notice,	10 * 2. Redistributions in binary form must reproduce the above copyright notice,

(...skipping 213 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
224 rtc::scoped_ptr<CaptureManager> capture_manager_;	224 rtc::scoped_ptr<CaptureManager> capture_manager_;

225 bool initialized_;	225 bool initialized_;

226 rtc::Thread* main_thread_;	226 rtc::Thread* main_thread_;

227 rtc::Thread* worker_thread_;	227 rtc::Thread* worker_thread_;

228	228

229 VoiceChannels voice_channels_;	229 VoiceChannels voice_channels_;

230 VideoChannels video_channels_;	230 VideoChannels video_channels_;

231 DataChannels data_channels_;	231 DataChannels data_channels_;

232	232

233 int audio_output_volume_;	233 int audio_output_volume_;

	234 VideoRenderer* local_renderer_;

234 bool enable_rtx_;	235 bool enable_rtx_;

235	236

236 bool capturing_;	237 bool capturing_;

237 };	238 };

238	239

239 } // namespace cricket	240 } // namespace cricket

240	241

241 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_	242 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_

OLD	NEW

« no previous file with comments | « no previous file | talk/session/media/channelmanager.cc » ('j') | no next file with comments »