Fix native api in preparation for native_api example.

Add native api conversions for video frames and video renderer. This
also requires some changes to sdk/BUILD to avoid cyclic dependencies.

Bug: webrtc:8832
Change-Id: Ibf21e63bdcae195dcb61d63f9262e6a8dc4fa790
Reviewed-on: https://webrtc-review.googlesource.com/57142
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22340}

sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm

@@ -38,8 +38,6 @@
 #include "sdk/objc/Framework/Native/src/objc_video_encoder_factory.h"
 #endif
 
-#include "Video/objcvideotracksource.h"
-#include "api/videosourceproxy.h"
 // Adding the nogncheck to disable the including header check.
 // The no-media version PeerConnectionFactory doesn't depend on media related
 // C++ target.
@@ -232,12 +230,8 @@
 }
 
 - (RTCVideoSource *)videoSource {
-  rtc::scoped_refptr<webrtc::ObjcVideoTrackSource> objcVideoTrackSource(
-      new rtc::RefCountedObject<webrtc::ObjcVideoTrackSource>());
-  return [[RTCVideoSource alloc]
-      initWithNativeVideoSource:webrtc::VideoTrackSourceProxy::Create(_signalingThread.get(),
-                                                                      _workerThread.get(),
-                                                                      objcVideoTrackSource)];
+  return [[RTCVideoSource alloc] initWithSignalingThread:_signalingThread.get()
+                                            workerThread:_workerThread.get()];
 }
 
 - (RTCVideoTrack *)videoTrackWithSource:(RTCVideoSource *)source

sdk/objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm

@@ -8,23 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "RTCVideoFrame+Private.h"
-
 #import "WebRTC/RTCVideoFrame.h"
+
 #import "WebRTC/RTCVideoFrameBuffer.h"
 
-#include "api/video/video_frame.h"
-#include "rtc_base/timeutils.h"
-#include "sdk/objc/Framework/Native/api/video_frame_buffer.h"
-#include "sdk/objc/Framework/Native/src/objc_frame_buffer.h"
-
-id<RTCVideoFrameBuffer> nativeToRtcFrameBuffer(
-    const rtc::scoped_refptr<webrtc::VideoFrameBuffer> &buffer) {
-  return buffer->type() == webrtc::VideoFrameBuffer::Type::kNative ?
-      static_cast<webrtc::ObjCFrameBuffer *>(buffer.get())->wrapped_frame_buffer() :
-      [[RTCI420Buffer alloc] initWithFrameBuffer:buffer->ToI420()];
-}
-
 @implementation RTCVideoFrame {
   RTCVideoRotation _rotation;
   int64_t _timeStampNs;
@@ -94,24 +81,4 @@ id<RTCVideoFrameBuffer> nativeToRtcFrameBuffer(
   return self;
 }
 
-- (instancetype)initWithNativeVideoFrame:(const webrtc::VideoFrame &)frame {
-  if (self = [self initWithBuffer:nativeToRtcFrameBuffer(frame.video_frame_buffer())
-                         rotation:RTCVideoRotation(frame.rotation())
-                      timeStampNs:frame.timestamp_us() * rtc::kNumNanosecsPerMicrosec]) {
-    self.timeStamp = frame.timestamp();
-  }
-
-  return self;
-}
-
-- (webrtc::VideoFrame)nativeVideoFrame {
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> frameBuffer =
-      webrtc::ObjCToNativeVideoFrameBuffer(self.buffer);
-  webrtc::VideoFrame videoFrame(frameBuffer,
-                                (webrtc::VideoRotation)self.rotation,
-                                self.timeStampNs / rtc::kNumNanosecsPerMicrosec);
-  videoFrame.set_timestamp(self.timeStamp);
-  return videoFrame;
-}
-
 @end

sdk/objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm

@@ -9,13 +9,14 @@
  */
 
 #import "RTCI420Buffer+Private.h"
-#import "RTCVideoFrame+Private.h"
 #import "RTCVideoRendererAdapter+Private.h"
 #import "WebRTC/RTCVideoFrame.h"
 #import "WebRTC/RTCVideoFrameBuffer.h"
 
 #include <memory>
 
+#include "sdk/objc/Framework/Native/api/video_frame.h"
+
 namespace webrtc {
 
 class VideoRendererAdapter
@@ -27,7 +28,7 @@ class VideoRendererAdapter
   }
 
   void OnFrame(const webrtc::VideoFrame& nativeVideoFrame) override {
-    RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithNativeVideoFrame:nativeVideoFrame];
+    RTCVideoFrame* videoFrame = NativeToObjCVideoFrame(nativeVideoFrame);
 
     CGSize current_size = (videoFrame.rotation % 180 == 0)
                               ? CGSizeMake(videoFrame.width, videoFrame.height)

sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h

@@ -35,6 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
     (rtc::scoped_refptr<webrtc::MediaSourceInterface>)nativeMediaSource
                                      type:(RTCMediaSourceType)type NS_UNAVAILABLE;
 
+- (instancetype)initWithSignalingThread:(rtc::Thread *)signalingThread
+                           workerThread:(rtc::Thread *)workerThread;
+
 @end
 
 NS_ASSUME_NONNULL_END

sdk/objc/Framework/Classes/PeerConnection/RTCVideoSource.mm

@@ -12,16 +12,16 @@
 
 #include "api/videosourceproxy.h"
 #include "rtc_base/checks.h"
-#include "sdk/objc/Framework/Classes/Video/objcvideotracksource.h"
+#include "sdk/objc/Framework/Native/src/objc_video_track_source.h"
 
-static webrtc::ObjcVideoTrackSource *getObjcVideoSource(
+static webrtc::ObjCVideoTrackSource *getObjCVideoSource(
     const rtc::scoped_refptr<webrtc::VideoTrackSourceInterface> nativeSource) {
   webrtc::VideoTrackSourceProxy *proxy_source =
       static_cast<webrtc::VideoTrackSourceProxy *>(nativeSource.get());
-  return static_cast<webrtc::ObjcVideoTrackSource *>(proxy_source->internal());
+  return static_cast<webrtc::ObjCVideoTrackSource *>(proxy_source->internal());
 }
 
-// TODO(magjed): Refactor this class and target ObjcVideoTrackSource only once
+// TODO(magjed): Refactor this class and target ObjCVideoTrackSource only once
 // RTCAVFoundationVideoSource is gone. See http://crbug/webrtc/7177 for more
 // info.
 @implementation RTCVideoSource {
@@ -45,17 +45,26 @@ static webrtc::ObjcVideoTrackSource *getObjcVideoSource(
   return nil;
 }
 
+- (instancetype)initWithSignalingThread:(rtc::Thread *)signalingThread
+                           workerThread:(rtc::Thread *)workerThread {
+  rtc::scoped_refptr<webrtc::ObjCVideoTrackSource> objCVideoTrackSource(
+      new rtc::RefCountedObject<webrtc::ObjCVideoTrackSource>());
+
+  return [self initWithNativeVideoSource:webrtc::VideoTrackSourceProxy::Create(
+                                             signalingThread, workerThread, objCVideoTrackSource)];
+}
+
 - (NSString *)description {
   NSString *stateString = [[self class] stringForState:self.state];
   return [NSString stringWithFormat:@"RTCVideoSource( %p ): %@", self, stateString];
 }
 
 - (void)capturer:(RTCVideoCapturer *)capturer didCaptureVideoFrame:(RTCVideoFrame *)frame {
-  getObjcVideoSource(_nativeVideoSource)->OnCapturedFrame(frame);
+  getObjCVideoSource(_nativeVideoSource)->OnCapturedFrame(frame);
 }
 
 - (void)adaptOutputFormatToWidth:(int)width height:(int)height fps:(int)fps {
-  getObjcVideoSource(_nativeVideoSource)->OnOutputFormatRequest(width, height, fps);
+  getObjCVideoSource(_nativeVideoSource)->OnOutputFormatRequest(width, height, fps);
 }
 
 #pragma mark - Private

sdk/objc/Framework/Native/api/video_frame.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
  *
  *  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
@@ -8,19 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "RTCI420Buffer+Private.h"
+#ifndef SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_FRAME_H_
+#define SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_FRAME_H_
+
 #import "WebRTC/RTCVideoFrame.h"
-#import "WebRTC/RTCVideoFrameBuffer.h"
 
 #include "api/video/video_frame.h"
 
-NS_ASSUME_NONNULL_BEGIN
+namespace webrtc {
 
-@interface RTCVideoFrame ()
+RTCVideoFrame* NativeToObjCVideoFrame(const VideoFrame& frame);
 
-- (instancetype)initWithNativeVideoFrame:(const webrtc::VideoFrame &)frame;
-- (webrtc::VideoFrame)nativeVideoFrame;
+}  // namespace webrtc
 
-@end
-
-NS_ASSUME_NONNULL_END
+#endif  // SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_FRAME_H_

sdk/objc/Framework/Native/api/video_frame.mm

@@ -0,0 +1,21 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#include "sdk/objc/Framework/Native/api/video_frame.h"
+
+#include "sdk/objc/Framework/Native/src/objc_video_frame.h"
+
+namespace webrtc {
+
+RTCVideoFrame* NativeToObjCVideoFrame(const VideoFrame& frame) {
+  return ToObjCVideoFrame(frame);
+}
+
+}  // namespace webrtc

sdk/objc/Framework/Native/api/video_frame_buffer.h

@@ -18,9 +18,12 @@
 
 namespace webrtc {
 
-rtc::scoped_refptr<webrtc::VideoFrameBuffer> ObjCToNativeVideoFrameBuffer(
+rtc::scoped_refptr<VideoFrameBuffer> ObjCToNativeVideoFrameBuffer(
     id<RTCVideoFrameBuffer> objc_video_frame_buffer);
 
+id<RTCVideoFrameBuffer> NativeToObjCVideoFrameBuffer(
+    const rtc::scoped_refptr<VideoFrameBuffer>& buffer);
+
 }  // namespace webrtc
 
 #endif  // SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_FRAME_BUFFER_H_

sdk/objc/Framework/Native/api/video_frame_buffer.mm

@@ -14,9 +14,14 @@
 
 namespace webrtc {
 
-rtc::scoped_refptr<webrtc::VideoFrameBuffer> ObjCToNativeVideoFrameBuffer(
+rtc::scoped_refptr<VideoFrameBuffer> ObjCToNativeVideoFrameBuffer(
     id<RTCVideoFrameBuffer> objc_video_frame_buffer) {
-  return new rtc::RefCountedObject<webrtc::ObjCFrameBuffer>(objc_video_frame_buffer);
+  return new rtc::RefCountedObject<ObjCFrameBuffer>(objc_video_frame_buffer);
+}
+
+id<RTCVideoFrameBuffer> NativeToObjCVideoFrameBuffer(
+    const rtc::scoped_refptr<VideoFrameBuffer> &buffer) {
+  return ToObjCVideoFrameBuffer(buffer);
 }
 
 }  // namespace webrtc

sdk/objc/Framework/Native/api/video_renderer.h

@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#ifndef SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_RENDERER_H_
+#define SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_RENDERER_H_
+
+#import "WebRTC/RTCVideoRenderer.h"
+
+#include <memory>
+
+#include "api/video/video_frame.h"
+#include "api/videosinkinterface.h"
+
+namespace webrtc {
+
+std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> ObjCToNativeVideoRenderer(
+    id<RTCVideoRenderer> objc_video_renderer);
+
+}  // namespace webrtc
+
+#endif  // SDK_OBJC_FRAMEWORK_NATIVE_API_VIDEO_RENDERER_H_

sdk/objc/Framework/Native/api/video_renderer.mm

@@ -0,0 +1,23 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#include "sdk/objc/Framework/Native/api/video_renderer.h"
+
+#include "rtc_base/ptr_util.h"
+#include "sdk/objc/Framework/Native/src/objc_video_renderer.h"
+
+namespace webrtc {
+
+std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> ObjCToNativeVideoRenderer(
+    id<RTCVideoRenderer> objc_video_renderer) {
+  return rtc::MakeUnique<ObjCVideoRenderer>(objc_video_renderer);
+}
+
+}  // namespace webrtc

sdk/objc/Framework/Native/src/objc_frame_buffer.h

@@ -39,6 +39,9 @@ class ObjCFrameBuffer : public VideoFrameBuffer {
   int height_;
 };
 
+id<RTCVideoFrameBuffer> ToObjCVideoFrameBuffer(
+    const rtc::scoped_refptr<VideoFrameBuffer>& buffer);
+
 }  // namespace webrtc
 
 #endif  // SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_FRAME_BUFFER_H_

sdk/objc/Framework/Native/src/objc_frame_buffer.mm

@@ -11,6 +11,7 @@
 #include "sdk/objc/Framework/Native/src/objc_frame_buffer.h"
 
 #import "WebRTC/RTCVideoFrameBuffer.h"
+#import "sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h"
 
 namespace webrtc {
 
@@ -75,4 +76,12 @@ id<RTCVideoFrameBuffer> ObjCFrameBuffer::wrapped_frame_buffer() const {
   return frame_buffer_;
 }
 
+id<RTCVideoFrameBuffer> ToObjCVideoFrameBuffer(const rtc::scoped_refptr<VideoFrameBuffer>& buffer) {
+  if (buffer->type() == VideoFrameBuffer::Type::kNative) {
+    return static_cast<ObjCFrameBuffer*>(buffer.get())->wrapped_frame_buffer();
+  } else {
+    return [[RTCI420Buffer alloc] initWithFrameBuffer:buffer->ToI420()];
+  }
+}
+
 }  // namespace webrtc

sdk/objc/Framework/Native/src/objc_video_decoder_factory.h

@@ -34,12 +34,11 @@ class ObjCVideoDecoderFactory : public VideoDecoderFactory,
       const SdpVideoFormat& format) override;
 
   // Needed for WebRtcVideoDecoderFactory interface.
-  webrtc::VideoDecoder* CreateVideoDecoderWithParams(
+  VideoDecoder* CreateVideoDecoderWithParams(
       const cricket::VideoCodec& codec,
       cricket::VideoDecoderParams params) override;
-  webrtc::VideoDecoder* CreateVideoDecoder(
-      webrtc::VideoCodecType type) override;
-  void DestroyVideoDecoder(webrtc::VideoDecoder* decoder) override;
+  VideoDecoder* CreateVideoDecoder(VideoCodecType type) override;
+  void DestroyVideoDecoder(VideoDecoder* decoder) override;
 
  private:
   id<RTCVideoDecoderFactory> decoder_factory_;

sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm

@@ -10,14 +10,14 @@
 
 #include "sdk/objc/Framework/Native/src/objc_video_decoder_factory.h"
 
-#import "NSString+StdString.h"
-#import "RTCVideoCodec+Private.h"
-#import "RTCWrappedNativeVideoDecoder.h"
 #import "WebRTC/RTCVideoCodec.h"
 #import "WebRTC/RTCVideoCodecFactory.h"
 #import "WebRTC/RTCVideoCodecH264.h"
 #import "WebRTC/RTCVideoFrame.h"
 #import "WebRTC/RTCVideoFrameBuffer.h"
+#import "sdk/objc/Framework/Classes/Common/NSString+StdString.h"
+#import "sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h"
+#import "sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.h"
 
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder.h"

sdk/objc/Framework/Native/src/objc_video_encoder_factory.h

@@ -36,10 +36,9 @@ class ObjCVideoEncoderFactory : public VideoEncoderFactory,
   CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override;
 
   // Needed for WebRtcVideoEncoderFactory interface.
-  webrtc::VideoEncoder* CreateVideoEncoder(
-      const cricket::VideoCodec& codec) override;
+  VideoEncoder* CreateVideoEncoder(const cricket::VideoCodec& codec) override;
   const std::vector<cricket::VideoCodec>& supported_codecs() const override;
-  void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
+  void DestroyVideoEncoder(VideoEncoder* encoder) override;
 
  private:
   id<RTCVideoEncoderFactory> encoder_factory_;

sdk/objc/Framework/Native/src/objc_video_encoder_factory.mm

@@ -12,16 +12,13 @@
 
 #include <string>
 
-#import "NSString+StdString.h"
-#import "RTCI420Buffer+Private.h"
-#import "RTCVideoCodec+Private.h"
-#import "RTCVideoFrame+Private.h"
-#import "RTCWrappedNativeVideoEncoder.h"
 #import "WebRTC/RTCVideoCodec.h"
 #import "WebRTC/RTCVideoCodecFactory.h"
 #import "WebRTC/RTCVideoCodecH264.h"
-#import "WebRTC/RTCVideoFrame.h"
-#import "WebRTC/RTCVideoFrameBuffer.h"
+#import "sdk/objc/Framework/Classes/Common/NSString+StdString.h"
+#import "sdk/objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h"
+#import "sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoEncoder.h"
+#import "sdk/objc/Framework/Classes/Video/RTCI420Buffer+Private.h"
 
 #include "api/video/video_frame.h"
 #include "api/video_codecs/sdp_video_format.h"
@@ -31,6 +28,7 @@
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/logging.h"
 #include "sdk/objc/Framework/Classes/Common/helpers.h"
+#include "sdk/objc/Framework/Native/src/objc_video_frame.h"
 
 namespace webrtc {
 
@@ -92,7 +90,7 @@ class ObjCVideoEncoder : public VideoEncoder {
       [rtcFrameTypes addObject:@(RTCFrameType(frame_types->at(i)))];
     }
 
-    return [encoder_ encode:[[RTCVideoFrame alloc] initWithNativeVideoFrame:frame]
+    return [encoder_ encode:ToObjCVideoFrame(frame)
           codecSpecificInfo:rtcCodecSpecificInfo
                  frameTypes:rtcFrameTypes];
   }

sdk/objc/Framework/Native/src/objc_video_frame.h

@@ -0,0 +1,24 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#ifndef SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_FRAME_H_
+#define SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_FRAME_H_
+
+#import "WebRTC/RTCVideoFrame.h"
+
+#include "api/video/video_frame.h"
+
+namespace webrtc {
+
+RTCVideoFrame* ToObjCVideoFrame(const VideoFrame& frame);
+
+}  // namespace webrtc
+
+#endif  // SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_FRAME_H_

sdk/objc/Framework/Native/src/objc_video_frame.mm

@@ -0,0 +1,28 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#include "sdk/objc/Framework/Native/src/objc_video_frame.h"
+
+#include "rtc_base/timeutils.h"
+#include "sdk/objc/Framework/Native/src/objc_frame_buffer.h"
+
+namespace webrtc {
+
+RTCVideoFrame *ToObjCVideoFrame(const VideoFrame &frame) {
+  RTCVideoFrame *videoFrame =
+      [[RTCVideoFrame alloc] initWithBuffer:ToObjCVideoFrameBuffer(frame.video_frame_buffer())
+                                   rotation:RTCVideoRotation(frame.rotation())
+                                timeStampNs:frame.timestamp_us() * rtc::kNumNanosecsPerMicrosec];
+  videoFrame.timeStamp = frame.timestamp();
+
+  return videoFrame;
+}
+
+}  // namespace webrtc

sdk/objc/Framework/Native/src/objc_video_renderer.h

@@ -0,0 +1,36 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#ifndef SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_RENDERER_H_
+#define SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_RENDERER_H_
+
+#import <CoreGraphics/CoreGraphics.h>
+#import <Foundation/Foundation.h>
+
+#include "api/video/video_frame.h"
+#include "api/videosinkinterface.h"
+
+@protocol RTCVideoRenderer;
+
+namespace webrtc {
+
+class ObjCVideoRenderer : public rtc::VideoSinkInterface<VideoFrame> {
+ public:
+  ObjCVideoRenderer(id<RTCVideoRenderer> renderer);
+  void OnFrame(const VideoFrame& nativeVideoFrame) override;
+
+ private:
+  id<RTCVideoRenderer> renderer_;
+  CGSize size_;
+};
+
+}  // namespace webrtc
+
+#endif  // SDK_OBJC_FRAMEWORK_NATIVE_SRC_OBJC_VIDEO_RENDERER_H_

sdk/objc/Framework/Native/src/objc_video_renderer.mm

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
+ *
+ *  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.
+ */
+
+#include "sdk/objc/Framework/Native/src/objc_video_renderer.h"
+
+#import "WebRTC/RTCVideoFrame.h"
+#import "WebRTC/RTCVideoRenderer.h"
+
+#include "sdk/objc/Framework/Native/src/objc_video_frame.h"
+
+namespace webrtc {
+
+ObjCVideoRenderer::ObjCVideoRenderer(id<RTCVideoRenderer> renderer)
+    : renderer_(renderer), size_(CGSizeZero) {}
+
+void ObjCVideoRenderer::OnFrame(const VideoFrame& nativeVideoFrame) {
+  RTCVideoFrame* videoFrame = ToObjCVideoFrame(nativeVideoFrame);
+
+  CGSize current_size = (videoFrame.rotation % 180 == 0) ?
+      CGSizeMake(videoFrame.width, videoFrame.height) :
+      CGSizeMake(videoFrame.height, videoFrame.width);
+
+  if (!CGSizeEqualToSize(size_, current_size)) {
+    size_ = current_size;
+    [renderer_ setSize:size_];
+  }
+  [renderer_ renderFrame:videoFrame];
+}
+
+}  // namespace webrtc

sdk/objc/Framework/Native/src/objc_video_track_source.h

@@ -19,9 +19,9 @@ RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
 
 namespace webrtc {
 
-class ObjcVideoTrackSource : public rtc::AdaptedVideoTrackSource {
+class ObjCVideoTrackSource : public rtc::AdaptedVideoTrackSource {
  public:
-  ObjcVideoTrackSource();
+  ObjCVideoTrackSource();
 
   // This class can not be used for implementing screen casting. Hopefully, this
   // function will be removed before we add that to iOS/Mac.

sdk/objc/Framework/Native/src/objc_video_track_source.mm

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "sdk/objc/Framework/Classes/Video/objcvideotracksource.h"
+#include "sdk/objc/Framework/Native/src/objc_video_track_source.h"
 
 #import "WebRTC/RTCVideoFrame.h"
 #import "WebRTC/RTCVideoFrameBuffer.h"
@@ -18,14 +18,14 @@
 
 namespace webrtc {
 
-ObjcVideoTrackSource::ObjcVideoTrackSource() {}
+ObjCVideoTrackSource::ObjCVideoTrackSource() {}
 
-void ObjcVideoTrackSource::OnOutputFormatRequest(int width, int height, int fps) {
+void ObjCVideoTrackSource::OnOutputFormatRequest(int width, int height, int fps) {
   cricket::VideoFormat format(width, height, cricket::VideoFormat::FpsToInterval(fps), 0);
   video_adapter()->OnOutputFormatRequest(format);
 }
 
-void ObjcVideoTrackSource::OnCapturedFrame(RTCVideoFrame* frame) {
+void ObjCVideoTrackSource::OnCapturedFrame(RTCVideoFrame *frame) {
   const int64_t timestamp_us = frame.timeStampNs / rtc::kNumNanosecsPerMicrosec;
   const int64_t translated_timestamp_us =
       timestamp_aligner_.TranslateTimestamp(timestamp_us, rtc::TimeMicros());
@@ -36,8 +36,15 @@ void ObjcVideoTrackSource::OnCapturedFrame(RTCVideoFrame* frame) {
   int crop_height;
   int crop_x;
   int crop_y;
-  if (!AdaptFrame(frame.width, frame.height, timestamp_us, &adapted_width, &adapted_height,
-                  &crop_width, &crop_height, &crop_x, &crop_y)) {
+  if (!AdaptFrame(frame.width,
+                  frame.height,
+                  timestamp_us,
+                  &adapted_width,
+                  &adapted_height,
+                  &crop_width,
+                  &crop_height,
+                  &crop_x,
+                  &crop_y)) {
     return;
   }
 
@@ -67,13 +74,13 @@ void ObjcVideoTrackSource::OnCapturedFrame(RTCVideoFrame* frame) {
 
   // Applying rotation is only supported for legacy reasons and performance is
   // not critical here.
-  webrtc::VideoRotation rotation = static_cast<webrtc::VideoRotation>(frame.rotation);
+  VideoRotation rotation = static_cast<VideoRotation>(frame.rotation);
   if (apply_rotation() && rotation != kVideoRotation_0) {
     buffer = I420Buffer::Rotate(*buffer->ToI420(), rotation);
     rotation = kVideoRotation_0;
   }
 
-  OnFrame(webrtc::VideoFrame(buffer, rotation, translated_timestamp_us));
+  OnFrame(VideoFrame(buffer, rotation, translated_timestamp_us));
 }
 
 }  // namespace webrtc