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

Side by Side Diff: webrtc/modules/video_render/test/testAPI/testAPI.cc

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
(...skipping 14 matching lines...) Expand all
25 #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) 25 #elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
26 26
27 #include <X11/Xlib.h> 27 #include <X11/Xlib.h>
28 #include <X11/Xutil.h> 28 #include <X11/Xutil.h>
29 #include <iostream> 29 #include <iostream>
30 #include <sys/time.h> 30 #include <sys/time.h>
31 31
32 #endif 32 #endif
33 33
34 #include "webrtc/common_types.h" 34 #include "webrtc/common_types.h"
35 #include "webrtc/modules/interface/module_common_types.h" 35 #include "webrtc/modules/include/module_common_types.h"
36 #include "webrtc/modules/utility/interface/process_thread.h" 36 #include "webrtc/modules/utility/include/process_thread.h"
37 #include "webrtc/modules/video_render/include/video_render.h" 37 #include "webrtc/modules/video_render/include/video_render.h"
38 #include "webrtc/modules/video_render/include/video_render_defines.h" 38 #include "webrtc/modules/video_render/include/video_render_defines.h"
39 #include "webrtc/system_wrappers/include/sleep.h" 39 #include "webrtc/system_wrappers/include/sleep.h"
40 #include "webrtc/system_wrappers/include/tick_util.h" 40 #include "webrtc/system_wrappers/include/tick_util.h"
41 #include "webrtc/system_wrappers/include/trace.h" 41 #include "webrtc/system_wrappers/include/trace.h"
42 42
43 using namespace webrtc; 43 using namespace webrtc;
44 44
45 void GetTestVideoFrame(VideoFrame* frame, uint8_t startColor); 45 void GetTestVideoFrame(VideoFrame* frame, uint8_t startColor);
46 int TestSingleStream(VideoRender* renderModule); 46 int TestSingleStream(VideoRender* renderModule);
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 Display* display; 636 Display* display;
637 WebRtcCreateWindow(&testWindow, &display, 0, 352, 288); 637 WebRtcCreateWindow(&testWindow, &display, 0, 352, 288);
638 VideoRenderType windowType = kRenderX11; 638 VideoRenderType windowType = kRenderX11;
639 window = (void*)testWindow; 639 window = (void*)testWindow;
640 #endif // WEBRTC_LINUX 640 #endif // WEBRTC_LINUX
641 641
642 RunVideoRenderTests(window, windowType); 642 RunVideoRenderTests(window, windowType);
643 return 0; 643 return 0;
644 } 644 }
645 #endif // !WEBRTC_MAC 645 #endif // !WEBRTC_MAC
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/include/video_render_defines.h ('k') | webrtc/modules/video_render/test/testAPI/testAPI_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698