admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: d41631aa27

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}
This commit is contained in:
ehmaldonado 2017-05-03 13:25:38 -07:00 committed by Commit bot
parent 642b0f8ffd
commit c34e730896
12 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/common_video/BUILD.gn
View File

@ -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) {

2
webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc → webrtc/common_video/corevideo_frame_buffer.cc
View File

@ -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"

0
webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h → webrtc/common_video/include/corevideo_frame_buffer.h
View File

2
webrtc/common_video/libyuv/include/webrtc_libyuv.h
View File

@ -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,

3
webrtc/common_video/libyuv/webrtc_libyuv.cc
View File

@ -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,

16
webrtc/sdk/BUILD.gn
View File

@ -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",

1
webrtc/sdk/objc/DEPS
View File

@ -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",

2
webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm
View File

@ -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;

2
webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm
View File

@ -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 {

2
webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc
View File

@ -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"

2
webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm
View File

@ -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"

2
webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm
View File

@ -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 {