| Index: webrtc/api/objc/RTCNSGLVideoView.m
|
| diff --git a/talk/app/webrtc/objc/RTCNSGLVideoView.m b/webrtc/api/objc/RTCNSGLVideoView.m
|
| similarity index 67%
|
| copy from talk/app/webrtc/objc/RTCNSGLVideoView.m
|
| copy to webrtc/api/objc/RTCNSGLVideoView.m
|
| index 34a866bd06c986e6b4e8ff80b3b782c9fa236475..09158f8d5221d84dcb3452bb66c2446e40e0ba99 100644
|
| --- a/talk/app/webrtc/objc/RTCNSGLVideoView.m
|
| +++ b/webrtc/api/objc/RTCNSGLVideoView.m
|
| @@ -1,34 +1,13 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2014 Google Inc.
|
| + * Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
| *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| + * Use of this source code is governed by a BSD-style license
|
| + * that can be found in the LICENSE file in the root of the source
|
| + * tree. An additional intellectual property rights grant can be found
|
| + * in the file PATENTS. All contributing project authors may
|
| + * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| -#error "This file requires ARC support."
|
| -#endif
|
| -
|
| #import "RTCNSGLVideoView.h"
|
|
|
| #import <CoreVideo/CVDisplayLink.h>
|
| @@ -39,8 +18,8 @@
|
| @interface RTCNSGLVideoView ()
|
| // |i420Frame| is set when we receive a frame from a worker thread and is read
|
| // from the display link callback so atomicity is required.
|
| -@property(atomic, strong) RTCI420Frame* i420Frame;
|
| -@property(atomic, strong) RTCOpenGLVideoRenderer* glRenderer;
|
| +@property(atomic, strong) RTCI420Frame *i420Frame;
|
| +@property(atomic, strong) RTCOpenGLVideoRenderer *glRenderer;
|
| - (void)drawFrame;
|
| @end
|
|
|
| @@ -109,7 +88,7 @@ static CVReturn OnDisplayLinkFired(CVDisplayLinkRef displayLink,
|
| });
|
| }
|
|
|
| -- (void)renderFrame:(RTCI420Frame*)frame {
|
| +- (void)renderFrame:(RTCI420Frame *)frame {
|
| self.i420Frame = frame;
|
| }
|
|
|
|
|