Move VideoFrame and related declarations to webrtc/api/video.

webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm

 /*
  *  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 "avfoundationvideocapturer.h"
 
 #import <AVFoundation/AVFoundation.h>
 
 #import "RTCAVFoundationVideoCapturerInternal.h"
 #import "RTCDispatcher+Private.h"
 #import "WebRTC/RTCLogging.h"
 
 #include "avfoundationformatmapper.h"
-#include "libyuv/rotate.h"
+
+#include "webrtc/api/video/video_rotation.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/common_video/include/corevideo_frame_buffer.h"
-#include "webrtc/common_video/rotation.h"
 
 namespace webrtc {
 
 enum AVFoundationVideoCapturerMessageType : uint32_t {
   kMessageTypeFrame,
 };
 
 AVFoundationVideoCapturer::AVFoundationVideoCapturer() : _capturer(nil) {
   _capturer =
       [[RTCAVFoundationVideoCapturerInternal alloc] initWithCapturer:this];
@@ skipping 116 matching lines @@
   rtc::scoped_refptr<VideoFrameBuffer> buffer =
       new rtc::RefCountedObject<CoreVideoFrameBuffer>(
           image_buffer,
           adapted_width, adapted_height,
           crop_width, crop_height,
           crop_x, crop_y);
 
   // Applying rotation is only supported for legacy reasons and performance is
   // not critical here.
   if (apply_rotation() && rotation != kVideoRotation_0) {
-    buffer = buffer->NativeToI420Buffer();
-    rtc::scoped_refptr<I420Buffer> rotated_buffer;
-    if (rotation == kVideoRotation_0 || rotation == kVideoRotation_180) {
-      rotated_buffer = I420Buffer::Create(adapted_width, adapted_height);
-    } else {
-      // Swap width and height.
-      rotated_buffer = I420Buffer::Create(adapted_height, adapted_width);
+    buffer = I420Buffer::Rotate(buffer->NativeToI420Buffer(),

[nisse-webrtc, 2017/01/09 15:31:06]

Magnus: Does this rebase with your rotation bugfix look right?

I'm not sure if the below swap of captured_width and captured_height is needed.
These are used for stats only, and it's unclear to me if they should be affected
by rotation.

[magjed_webrtc, 2017/01/10 13:48:37]

It looks correct.

It's unclear for me as well how the captured_width and captured_height stats
should be reported when apply_rotation() is on, but I don't think it matters, so
don't change anything unrelated in this CL.

+                                rotation);
+    if (rotation != kVideoRotation_180) {

[magjed_webrtc, 2017/01/10 13:48:37]

Makes more sense to do:
if (rotation == kVideoRotation_90 || rotation == kVideoRotation_270) {
  std::swap(captured_width, captured_height);
}
now.

[nisse-webrtc, 2017/01/10 14:09:00]

Should be equivalent (since rotation 0 is excluded earlier). I liked the more
concise version, but I'll change it if you think your version is more readable.

       std::swap(captured_width, captured_height);
     }
-    libyuv::I420Rotate(
-        buffer->DataY(), buffer->StrideY(),
-        buffer->DataU(), buffer->StrideU(),
-        buffer->DataV(), buffer->StrideV(),
-        rotated_buffer->MutableDataY(), rotated_buffer->StrideY(),
-        rotated_buffer->MutableDataU(), rotated_buffer->StrideU(),
-        rotated_buffer->MutableDataV(), rotated_buffer->StrideV(),
-        buffer->width(), buffer->height(),
-        static_cast<libyuv::RotationMode>(rotation));
-    buffer = rotated_buffer;
+
     rotation = kVideoRotation_0;
   }
 
   OnFrame(webrtc::VideoFrame(buffer, rotation, translated_camera_time_us),
           captured_width, captured_height);
 }
 
 }  // namespace webrtc