| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 #if !defined(__has_feature) || !__has_feature(objc_arc) | 11 #if !defined(__has_feature) || !__has_feature(objc_arc) |
| 12 #error "This file requires ARC support." | 12 #error "This file requires ARC support." |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 #include "webrtc/modules/video_render/ios/video_render_ios_gles20.h" | 15 #include "webrtc/modules/video_render/ios/video_render_ios_gles20.h" |
| 16 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 17 #include "webrtc/system_wrappers/interface/event_wrapper.h" | 17 #include "webrtc/system_wrappers/include/event_wrapper.h" |
| 18 | 18 |
| 19 using namespace webrtc; | 19 using namespace webrtc; |
| 20 | 20 |
| 21 VideoRenderIosGles20::VideoRenderIosGles20(VideoRenderIosView* view, | 21 VideoRenderIosGles20::VideoRenderIosGles20(VideoRenderIosView* view, |
| 22 bool full_screen, | 22 bool full_screen, |
| 23 int render_id) | 23 int render_id) |
| 24 : gles_crit_sec_(CriticalSectionWrapper::CreateCriticalSection()), | 24 : gles_crit_sec_(CriticalSectionWrapper::CreateCriticalSection()), |
| 25 screen_update_event_(0), | 25 screen_update_event_(0), |
| 26 view_(view), | 26 view_(view), |
| 27 window_rect_(), | 27 window_rect_(), |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 if (counter == stream_id) { | 276 if (counter == stream_id) { |
| 277 VideoRenderIosChannel* agl_channel = it->second; | 277 VideoRenderIosChannel* agl_channel = it->second; |
| 278 agl_channel->SetStreamSettings(0, left, top, right, bottom); | 278 agl_channel->SetStreamSettings(0, left, top, right, bottom); |
| 279 } | 279 } |
| 280 counter++; | 280 counter++; |
| 281 it++; | 281 it++; |
| 282 } | 282 } |
| 283 | 283 |
| 284 return 0; | 284 return 0; |
| 285 } | 285 } |
| OLD | NEW |