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

Side by Side Diff: webrtc/media/base/capturemanager.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 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 * libjingle 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * Copyright 2012 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #include "talk/media/base/capturemanager.h" 11 #include "webrtc/media/base/capturemanager.h"
29 12
30 #include <algorithm> 13 #include <algorithm>
31 14
32 #include "talk/media/base/videocapturer.h"
33 #include "talk/media/base/videorenderer.h"
34 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
35 #include "webrtc/base/logging.h" 16 #include "webrtc/base/logging.h"
17 #include "webrtc/media/base/videocapturer.h"
18 #include "webrtc/media/base/videorenderer.h"
36 19
37 namespace cricket { 20 namespace cricket {
38 21
39 // CaptureManager helper class. 22 // CaptureManager helper class.
40 class VideoCapturerState { 23 class VideoCapturerState {
41 public: 24 public:
42 static const VideoFormatPod kDefaultCaptureFormat; 25 static const VideoFormatPod kDefaultCaptureFormat;
43 26
44 static VideoCapturerState* Create(VideoCapturer* video_capturer); 27 static VideoCapturerState* Create(VideoCapturer* video_capturer);
45 ~VideoCapturerState() {} 28 ~VideoCapturerState() {}
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 VideoCapturer* video_capturer) const { 379 VideoCapturer* video_capturer) const {
397 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 380 RTC_DCHECK(thread_checker_.CalledOnValidThread());
398 VideoCapturerState* capture_state = GetCaptureState(video_capturer); 381 VideoCapturerState* capture_state = GetCaptureState(video_capturer);
399 if (!capture_state) { 382 if (!capture_state) {
400 return NULL; 383 return NULL;
401 } 384 }
402 return capture_state->adapter(); 385 return capture_state->adapter();
403 } 386 }
404 387
405 } // namespace cricket 388 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698