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

Side by Side Diff: webrtc/modules/video_capture/include/video_capture_defines.h

Issue 1417683006: modules: more interface -> include renames (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix last incorrectly wrapped pragma message Created 5 years, 1 month 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 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
12 #define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ 12 #define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
13 13
14 #include "webrtc/modules/interface/module_common_types.h" 14 #include "webrtc/modules/include/module_common_types.h"
15 #include "webrtc/typedefs.h" 15 #include "webrtc/typedefs.h"
16 #include "webrtc/video_frame.h" 16 #include "webrtc/video_frame.h"
17 17
18 namespace webrtc 18 namespace webrtc
19 { 19 {
20 // Defines 20 // Defines
21 #ifndef NULL 21 #ifndef NULL
22 #define NULL 0 22 #define NULL 0
23 #endif 23 #endif
24 24
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const uint32_t frameRate) = 0; 109 const uint32_t frameRate) = 0;
110 virtual void OnNoPictureAlarm(const int32_t id, 110 virtual void OnNoPictureAlarm(const int32_t id,
111 const VideoCaptureAlarm alarm) = 0; 111 const VideoCaptureAlarm alarm) = 0;
112 protected: 112 protected:
113 virtual ~VideoCaptureFeedBack(){} 113 virtual ~VideoCaptureFeedBack(){}
114 }; 114 };
115 115
116 } // namespace webrtc 116 } // namespace webrtc
117 117
118 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ 118 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/include/video_capture.h ('k') | webrtc/modules/video_capture/test/video_capture_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698