1cfeb43542
This reverts commit 7583390d1a3a7c4e9a77da0d77250abac0c34d1d. Reason for revert: Breaks unit tests Original change's description: > Revert "Revert "Support more formats in RTCVideoFrame"" > > This reverts commit 0789dab2cbd1617e94d7300e375163d42345f3d4. > > Reason for revert: Include obc_corevideoframebuffer target > > Original change's description: > > Revert "Support more formats in RTCVideoFrame" > > > > This reverts commit bd2220a9c496ef2e8567b68d4be9435a110bdc34. > > > > Reason for revert: Broke external clients > > > > Original change's description: > > > Support more formats in RTCVideoFrame > > > > > > Implement Obj-C version of webrtc::VideoFrameBuffer and use that in > > > RTCVideoFrame. > > > > > > Bug: webrtc:7785 > > > Change-Id: I49f42bcf451dd6769b3a79a65fe7b400dce22677 > > > Reviewed-on: https://chromium-review.googlesource.com/536773 > > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#18691} > > > > TBR=magjed@webrtc.org,andersc@webrtc.org > > > > Change-Id: Id765dd9543ed0613a6b2de108b268c3501025fcd > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:7785 > > Reviewed-on: https://chromium-review.googlesource.com/542837 > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#18697} > > TBR=magjed@webrtc.org,andersc@webrtc.org > > Change-Id: I1ef5313b4a6c56eb8c7fd02d95db62c4e3c00255 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7785 > Reviewed-on: https://chromium-review.googlesource.com/542838 > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#18716} TBR=magjed@webrtc.org,andersc@webrtc.org Change-Id: Id12f33698eb02041607cb9a5c54f37f01bfac5b1 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7785 Reviewed-on: https://chromium-review.googlesource.com/544840 Reviewed-by: Anders Carlsson <andersc@webrtc.org> Commit-Queue: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18718}
73 lines
2.7 KiB
Plaintext
73 lines
2.7 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/Video/objcvideotracksource.h"
|
|
|
|
#import "RTCVideoFrame+Private.h"
|
|
|
|
#include "webrtc/api/video/i420_buffer.h"
|
|
#include "webrtc/sdk/objc/Framework/Classes/Video/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->ToI420(), 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->ToI420(), rotation);
|
|
rotation = kVideoRotation_0;
|
|
}
|
|
|
|
OnFrame(webrtc::VideoFrame(buffer, rotation, translated_timestamp_us));
|
|
}
|
|
|
|
} // namespace webrtc
|