37144b214e
Reason for revert: Still problems with downstream projects Original issue's description: > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ ) > > Reason for revert: > Fixing downstream breakages > > Original issue's description: > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ ) > > > > Reason for revert: > > Breaking downstream projects. > > > > Original issue's description: > > > Split iOS sdk in to separate targets > > > > > > This CL splits the iOS sdk into separate static libraries for video, > > > audio, ui, common, and peerconnection-related code. This will in the > > > future make it easier to compile WebRTC without unneeded components. > > > > > > BUG=webrtc:4867 > > > > > > Review-Url: https://codereview.webrtc.org/2862543002 > > > Cr-Commit-Position: refs/heads/master@{#18166} > > > Committed:52c83fe710> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:4867 > > > > Review-Url: https://codereview.webrtc.org/2890513002 > > Cr-Commit-Position: refs/heads/master@{#18170} > > Committed:9756238084> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:4867 > > Review-Url: https://codereview.webrtc.org/2890733003 > Cr-Commit-Position: refs/heads/master@{#18174} > Committed:d51e042492TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:4867 Review-Url: https://codereview.webrtc.org/2893593002 Cr-Commit-Position: refs/heads/master@{#18182}
72 lines
2.6 KiB
Plaintext
72 lines
2.6 KiB
Plaintext
/*
|
|
* Copyright (c) 2017 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 "webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h"
|
|
|
|
#import "RTCVideoFrame+Private.h"
|
|
|
|
#include "webrtc/api/video/i420_buffer.h"
|
|
#include "webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
ObjcVideoTrackSource::ObjcVideoTrackSource() {}
|
|
|
|
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) {
|
|
const int64_t timestamp_us = frame.timeStampNs / rtc::kNumNanosecsPerMicrosec;
|
|
const int64_t translated_timestamp_us =
|
|
timestamp_aligner_.TranslateTimestamp(timestamp_us, rtc::TimeMicros());
|
|
|
|
int adapted_width;
|
|
int adapted_height;
|
|
int crop_width;
|
|
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)) {
|
|
return;
|
|
}
|
|
|
|
rtc::scoped_refptr<VideoFrameBuffer> buffer;
|
|
if (adapted_width == frame.width && adapted_height == frame.height) {
|
|
// No adaption - optimized path.
|
|
buffer = frame.videoBuffer;
|
|
} else if (frame.nativeHandle) {
|
|
// Adapted CVPixelBuffer frame.
|
|
buffer = new rtc::RefCountedObject<CoreVideoFrameBuffer>(
|
|
static_cast<CVPixelBufferRef>(frame.nativeHandle), adapted_width, adapted_height,
|
|
crop_width, crop_height, crop_x, crop_y);
|
|
} else {
|
|
// Adapted I420 frame.
|
|
// TODO(magjed): Optimize this I420 path.
|
|
rtc::scoped_refptr<I420Buffer> i420_buffer = I420Buffer::Create(adapted_width, adapted_height);
|
|
i420_buffer->CropAndScaleFrom(*frame.videoBuffer, crop_x, crop_y, crop_width, crop_height);
|
|
buffer = i420_buffer;
|
|
}
|
|
|
|
// Applying rotation is only supported for legacy reasons and performance is
|
|
// not critical here.
|
|
webrtc::VideoRotation rotation = static_cast<webrtc::VideoRotation>(frame.rotation);
|
|
if (apply_rotation() && rotation != kVideoRotation_0) {
|
|
buffer = I420Buffer::Rotate(*buffer->NativeToI420Buffer(), rotation);
|
|
rotation = kVideoRotation_0;
|
|
}
|
|
|
|
OnFrame(webrtc::VideoFrame(buffer, rotation, translated_timestamp_us));
|
|
}
|
|
|
|
} // namespace webrtc
|