Revert of Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/ (patchset #2 id:60001 of https://codereview.webrtc.org/2851563003/ )

Reason for revert:
Breaks downstream targets.

Original issue's description:
> Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/
>
> CoreVideoFrameBuffer is Mac/iPhone specific and should be moved into
> the webrtc/sdk/objc/ folder.
>
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2851563003
> Cr-Commit-Position: refs/heads/master@{#17998}
> Committed: https://chromium.googlesource.com/external/webrtc/+/d41631aa274e926c4fba1600cbcfbc18020eb35a

[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

Review-Url: https://codereview.webrtc.org/2862663003
Cr-Commit-Position: refs/heads/master@{#18004}

Author: ehlemur-zz

webrtc/common_video/BUILD.gn

@@ -73,6 +73,14 @@ rtc_static_library("common_video") {
     # Need to add a directory normally exported by libyuv.
     include_dirs += [ "$rtc_libyuv_dir/include" ]
   }
+
+  if (is_ios || is_mac) {
+    sources += [
+      "corevideo_frame_buffer.cc",
+      "include/corevideo_frame_buffer.h",
+    ]
+    libs = [ "CoreVideo.framework" ]
+  }
 }
 
 if (rtc_include_tests) {

webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc renamed to webrtc/common_video/corevideo_frame_buffer.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 
 #include "libyuv/convert.h"
 #include "webrtc/base/checks.h"

webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h renamed to webrtc/common_video/include/corevideo_frame_buffer.h

@@ -130,8 +130,6 @@ void NV12Scale(std::vector<uint8_t>* tmp_buffer,
 // than separate NV12->I420 + I420->I420 scaling.
 class NV12ToI420Scaler {
  public:
-  NV12ToI420Scaler();
-  ~NV12ToI420Scaler();
   void NV12ToI420Scale(const uint8_t* src_y, int src_stride_y,
                        const uint8_t* src_uv, int src_stride_uv,
                        int src_width, int src_height,

webrtc/common_video/libyuv/include/webrtc_libyuv.h

@@ -367,9 +367,6 @@ void NV12Scale(std::vector<uint8_t>* tmp_buffer,
                        dst_chroma_width, dst_chroma_height);
 }
 
-NV12ToI420Scaler::NV12ToI420Scaler() = default;
-NV12ToI420Scaler::~NV12ToI420Scaler() = default;
-
 void NV12ToI420Scaler::NV12ToI420Scale(
     const uint8_t* src_y, int src_stride_y,
     const uint8_t* src_uv, int src_stride_uv,

webrtc/common_video/libyuv/webrtc_libyuv.cc

@@ -212,7 +212,6 @@ if (is_ios || is_mac) {
     ]
 
     deps = [
-      ":rtc_sdk_corevideoframebuffer",
       ":webrtc_h264_video_toolbox",
       "../api:video_frame_api",
       "../base:rtc_base",
@@ -426,20 +425,6 @@ if (is_ios || is_mac) {
     ]
   }
 
-  rtc_static_library("rtc_sdk_corevideoframebuffer") {
-    sources = [
-      "objc/Framework/Classes/corevideo_frame_buffer.cc",
-      "objc/Framework/Classes/corevideo_frame_buffer.h",
-    ]
-
-    deps = [
-      "../base:rtc_base_approved",
-      "../common_video",
-    ]
-
-    libs = [ "CoreVideo.framework" ]
-  }
-
   rtc_static_library("webrtc_h264_video_toolbox") {
     sources = [
       "objc/Framework/Classes/h264_video_toolbox_decoder.cc",
@@ -454,7 +439,6 @@ if (is_ios || is_mac) {
 
     deps = [
       ":rtc_sdk_common_objc",
-      ":rtc_sdk_corevideoframebuffer",
       "../api:video_frame_api",
       "../base:rtc_base_approved",
       "../common_video",

webrtc/sdk/BUILD.gn

@@ -3,7 +3,6 @@ include_rules = [
   "+webrtc/api",
   "+webrtc/common_video/h264",
   "+webrtc/common_video/include",
-  "+webrtc/common_video/libyuv/include",
   "+webrtc/media",
   "+webrtc/modules/video_coding",
   "+webrtc/pc",

webrtc/sdk/objc/DEPS

@@ -10,7 +10,7 @@
 
 #import "RTCVideoFrame+Private.h"
 
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 
 @implementation RTCVideoFrame {
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> _videoBuffer;

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

@@ -23,7 +23,7 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 
 namespace webrtc {
 

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

@@ -20,7 +20,7 @@
 #include "webrtc/api/video/video_frame.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h"
 #include "webrtc/video_frame.h"
 

webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc

@@ -23,7 +23,7 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/common_video/h264/profile_level_id.h"
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 #include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h"
 #include "webrtc/system_wrappers/include/clock.h"
 

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

@@ -12,7 +12,7 @@
 
 #import "RTCVideoFrame+Private.h"
 
-#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
+#include "webrtc/common_video/include/corevideo_frame_buffer.h"
 
 namespace webrtc {