| OLD | NEW |
| 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 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 { | 237 { |
| 238 XNextEvent(_display, &evnt); | 238 XNextEvent(_display, &evnt); |
| 239 } | 239 } |
| 240 while (evnt.type != MapNotify || evnt.xmap.event != _window); | 240 while (evnt.type != MapNotify || evnt.xmap.event != _window); |
| 241 | 241 |
| 242 *outWindow = _window; | 242 *outWindow = _window; |
| 243 *outDisplay = _display; | 243 *outDisplay = _display; |
| 244 | 244 |
| 245 return 0; | 245 return 0; |
| 246 } | 246 } |
| 247 #endif // LINUX | 247 #endif // WEBRTC_LINUX |
| 248 | 248 |
| 249 // Note: Mac code is in testApi_mac.mm. | 249 // Note: Mac code is in testApi_mac.mm. |
| 250 | 250 |
| 251 class MyRenderCallback: public VideoRenderCallback | 251 class MyRenderCallback: public VideoRenderCallback |
| 252 { | 252 { |
| 253 public: | 253 public: |
| 254 MyRenderCallback() : | 254 MyRenderCallback() : |
| 255 _cnt(0) | 255 _cnt(0) |
| 256 { | 256 { |
| 257 } | 257 } |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |