61b22dde13
Reason for revert: More downstream breakage discovered. Original issue's description: > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2854883002/ ) > > Reason for revert: > Will make another attempt to track down and fix downstream projects. > > Original issue's description: > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2852303002/ ) > > > > Reason for revert: > > Unfortunately, more downstream updates needed. > > > > Original issue's description: > > > Reland of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #1 id:1 of https://codereview.webrtc.org/2845333002/ ) > > > > > > Reason for revert: > > > Downstream projects being updated. > > > > > > For Chrome, relanding depends on cl > > > https://codereview.chromium.org/2855783003/ > > > > > > Original issue's description: > > > > Revert of Delete deprecated and transitional stuff related to video frame refactoring. (patchset #17 id:320001 of https://codereview.webrtc.org/2622263002/ ) > > > > > > > > Reason for revert: > > > > Broke Chrome build, see, e.g., > > > > http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/16237 > > > > > > > > Original issue's description: > > > > > Delete deprecated and transitional stuff related to video frame refactoring. > > > > > > > > > > BUG=webrtc:5880 > > > > > > > > > > Review-Url: https://codereview.webrtc.org/2622263002 > > > > > Cr-Commit-Position: refs/heads/master@{#17928} > > > > > Committed:713a3bbcc7> > > > > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > > > # Skipping CQ checks because original CL landed less than 1 days ago. > > > > NOPRESUBMIT=true > > > > NOTREECHECKS=true > > > > NOTRY=true > > > > BUG=webrtc:5880 > > > > > > > > Review-Url: https://codereview.webrtc.org/2845333002 > > > > Cr-Commit-Position: refs/heads/master@{#17929} > > > > Committed:aec49d2b49> > > > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > > # Not skipping CQ checks because original CL landed more than 1 days ago. > > > BUG=webrtc:5880 > > > > > > Review-Url: https://codereview.webrtc.org/2852303002 > > > Cr-Commit-Position: refs/heads/master@{#17974} > > > Committed:d71ebd70f6> > > > TBR=mflodman@webrtc.org,perkj@webrtc.org > > # Skipping CQ checks because original CL landed less than 1 days ago. > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > BUG=webrtc:5880 > > > > Review-Url: https://codereview.webrtc.org/2854883002 > > Cr-Commit-Position: refs/heads/master@{#17978} > > Committed:6e6a485a02> > TBR=mflodman@webrtc.org,perkj@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > > BUG=webrtc:5880 > > Review-Url: https://codereview.webrtc.org/2854873003 > Cr-Commit-Position: refs/heads/master@{#18006} > Committed:3870a071c4TBR=mflodman@webrtc.org,perkj@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5880 Review-Url: https://codereview.webrtc.org/2853383005 Cr-Commit-Position: refs/heads/master@{#18008}
71 lines
2.6 KiB
Plaintext
71 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/common_video/include/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
|