From c34e730896032ae730b5917306bb4f79e62d03dd Mon Sep 17 00:00:00 2001 From: ehmaldonado Date: Wed, 3 May 2017 13:25:38 -0700 Subject: [PATCH] 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 TBR=kthelgason@webrtc.org,magjed@webrtc.org # 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} --- webrtc/common_video/BUILD.gn | 8 ++++++++ .../corevideo_frame_buffer.cc | 2 +- .../include}/corevideo_frame_buffer.h | 0 .../common_video/libyuv/include/webrtc_libyuv.h | 2 -- webrtc/common_video/libyuv/webrtc_libyuv.cc | 3 --- webrtc/sdk/BUILD.gn | 16 ---------------- webrtc/sdk/objc/DEPS | 1 - .../sdk/objc/Framework/Classes/RTCVideoFrame.mm | 2 +- .../Classes/avfoundationvideocapturer.mm | 2 +- .../Classes/h264_video_toolbox_decoder.cc | 2 +- .../Classes/h264_video_toolbox_encoder.mm | 2 +- .../Framework/Classes/objcvideotracksource.mm | 2 +- 12 files changed, 14 insertions(+), 28 deletions(-) rename webrtc/{sdk/objc/Framework/Classes => common_video}/corevideo_frame_buffer.cc (98%) rename webrtc/{sdk/objc/Framework/Classes => common_video/include}/corevideo_frame_buffer.h (100%) diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index d6005d0195..6b7eb01400 100644 --- a/webrtc/common_video/BUILD.gn +++ b/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) { diff --git a/webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc b/webrtc/common_video/corevideo_frame_buffer.cc similarity index 98% rename from webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc rename to webrtc/common_video/corevideo_frame_buffer.cc index b3c0f2f63a..6455ed18f0 100644 --- a/webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc +++ b/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" diff --git a/webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h b/webrtc/common_video/include/corevideo_frame_buffer.h similarity index 100% rename from webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h rename to webrtc/common_video/include/corevideo_frame_buffer.h diff --git a/webrtc/common_video/libyuv/include/webrtc_libyuv.h b/webrtc/common_video/libyuv/include/webrtc_libyuv.h index 0924f68b4f..74fb67c899 100644 --- a/webrtc/common_video/libyuv/include/webrtc_libyuv.h +++ b/webrtc/common_video/libyuv/include/webrtc_libyuv.h @@ -130,8 +130,6 @@ void NV12Scale(std::vector* 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, diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc index fd08029d1c..73664097cf 100644 --- a/webrtc/common_video/libyuv/webrtc_libyuv.cc +++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc @@ -367,9 +367,6 @@ void NV12Scale(std::vector* 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, diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn index fa44c48fb3..5596af09fc 100644 --- a/webrtc/sdk/BUILD.gn +++ b/webrtc/sdk/BUILD.gn @@ -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", diff --git a/webrtc/sdk/objc/DEPS b/webrtc/sdk/objc/DEPS index dcb040e8d3..46aeb8e029 100644 --- a/webrtc/sdk/objc/DEPS +++ b/webrtc/sdk/objc/DEPS @@ -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", diff --git a/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm b/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm index ed6c288422..a4eaefb853 100644 --- a/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm +++ b/webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm @@ -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 _videoBuffer; diff --git a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm index 1ebc441bb2..526cdbe455 100644 --- a/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm +++ b/webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.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 { diff --git a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc b/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc index a910066572..b42660b74a 100644 --- a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc +++ b/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc @@ -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" diff --git a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm b/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm index 596a72777b..bc46b35364 100644 --- a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm +++ b/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm @@ -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" diff --git a/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm b/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm index deece20e9b..942171be29 100644 --- a/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm +++ b/webrtc/sdk/objc/Framework/Classes/objcvideotracksource.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 {