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

Side by Side Diff: webrtc/modules/video_capture/device_info_impl.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
11 #include <assert.h> 11 #include <assert.h>
12 #include <stdlib.h> 12 #include <stdlib.h>
13 13
14 #include "webrtc/base/logging.h"
14 #include "webrtc/modules/video_capture/device_info_impl.h" 15 #include "webrtc/modules/video_capture/device_info_impl.h"
15 #include "webrtc/modules/video_capture/video_capture_config.h" 16 #include "webrtc/modules/video_capture/video_capture_config.h"
16 #include "webrtc/rtc_base/logging.h"
17 17
18 #ifndef abs 18 #ifndef abs
19 #define abs(a) (a>=0?a:-a) 19 #define abs(a) (a>=0?a:-a)
20 #endif 20 #endif
21 21
22 namespace webrtc 22 namespace webrtc
23 { 23 {
24 namespace videocapturemodule 24 namespace videocapturemodule
25 { 25 {
26 DeviceInfoImpl::DeviceInfoImpl() 26 DeviceInfoImpl::DeviceInfoImpl()
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 } 254 }
255 255
256 //Default implementation. This should be overridden by Mobile implementations. 256 //Default implementation. This should be overridden by Mobile implementations.
257 int32_t DeviceInfoImpl::GetOrientation(const char* deviceUniqueIdUTF8, 257 int32_t DeviceInfoImpl::GetOrientation(const char* deviceUniqueIdUTF8,
258 VideoRotation& orientation) { 258 VideoRotation& orientation) {
259 orientation = kVideoRotation_0; 259 orientation = kVideoRotation_0;
260 return -1; 260 return -1;
261 } 261 }
262 } // namespace videocapturemodule 262 } // namespace videocapturemodule
263 } // namespace webrtc 263 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698