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

Side by Side Diff: webrtc/modules/video_coding/include/video_coding.h

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 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 * 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_CODING_INCLUDE_VIDEO_CODING_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_
13 13
14 #if defined(WEBRTC_WIN) 14 #if defined(WEBRTC_WIN)
15 // This is a workaround on Windows due to the fact that some Windows 15 // This is a workaround on Windows due to the fact that some Windows
16 // headers define CreateEvent as a macro to either CreateEventW or CreateEventA. 16 // headers define CreateEvent as a macro to either CreateEventW or CreateEventA.
17 // This can cause problems since we use that name as well and could 17 // This can cause problems since we use that name as well and could
18 // declare them as one thing here whereas in another place a windows header 18 // declare them as one thing here whereas in another place a windows header
19 // may have been included and then implementing CreateEvent() causes compilation 19 // may have been included and then implementing CreateEvent() causes compilation
20 // errors. So for consistency, we include the main windows header here. 20 // errors. So for consistency, we include the main windows header here.
21 #include <windows.h> 21 #include <windows.h>
22 #endif 22 #endif
23 23
24 #include "webrtc/api/video/video_frame.h"
24 #include "webrtc/modules/include/module.h" 25 #include "webrtc/modules/include/module.h"
25 #include "webrtc/modules/include/module_common_types.h" 26 #include "webrtc/modules/include/module_common_types.h"
26 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 27 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
27 #include "webrtc/system_wrappers/include/event_wrapper.h" 28 #include "webrtc/system_wrappers/include/event_wrapper.h"
28 #include "webrtc/video_frame.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class Clock; 32 class Clock;
33 class EncodedImageCallback; 33 class EncodedImageCallback;
34 // TODO(pbos): Remove VCMQMSettingsCallback completely. This might be done by 34 // TODO(pbos): Remove VCMQMSettingsCallback completely. This might be done by
35 // removing the VCM and use VideoSender/VideoReceiver as a public interface 35 // removing the VCM and use VideoSender/VideoReceiver as a public interface
36 // directly. 36 // directly.
37 class VCMQMSettingsCallback; 37 class VCMQMSettingsCallback;
38 class VideoBitrateAllocator; 38 class VideoBitrateAllocator;
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 469
470 virtual void RegisterPostEncodeImageCallback( 470 virtual void RegisterPostEncodeImageCallback(
471 EncodedImageCallback* post_encode_callback) = 0; 471 EncodedImageCallback* post_encode_callback) = 0;
472 // Releases pending decode calls, permitting faster thread shutdown. 472 // Releases pending decode calls, permitting faster thread shutdown.
473 virtual void TriggerDecoderShutdown() = 0; 473 virtual void TriggerDecoderShutdown() = 0;
474 }; 474 };
475 475
476 } // namespace webrtc 476 } // namespace webrtc
477 477
478 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_ 478 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698