
AndroidVideoTrackSource::OnFrameCaptured currently does adaptation before passing frames on. We want to add video processing between adaptation and delivering the frame to the rest WebRTC C++. This CL prepares for that by splitting OnFrameCaptured() into a separate adaptation step and delivery step. Bug: webrtc:10247 Change-Id: Iab759bac7f3072d4552ece80d0b81fc3e634c64c Reviewed-on: https://webrtc-review.googlesource.com/c/119952 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26571}
110 lines
4.2 KiB
Java
110 lines
4.2 KiB
Java
/*
|
|
* Copyright 2013 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.
|
|
*/
|
|
|
|
package org.webrtc;
|
|
|
|
import android.support.annotation.Nullable;
|
|
|
|
/**
|
|
* Java wrapper of native AndroidVideoTrackSource.
|
|
*/
|
|
public class VideoSource extends MediaSource {
|
|
/** Simple aspect ratio clas for use in constraining output format. */
|
|
public static class AspectRatio {
|
|
public static final AspectRatio UNDEFINED = new AspectRatio(/* width= */ 0, /* height= */ 0);
|
|
|
|
public final int width;
|
|
public final int height;
|
|
|
|
public AspectRatio(int width, int height) {
|
|
this.width = width;
|
|
this.height = height;
|
|
}
|
|
}
|
|
|
|
private final NativeAndroidVideoTrackSource nativeAndroidVideoTrackSource;
|
|
private final CapturerObserver capturerObserver = new CapturerObserver() {
|
|
@Override
|
|
public void onCapturerStarted(boolean success) {
|
|
nativeAndroidVideoTrackSource.setState(success);
|
|
}
|
|
|
|
@Override
|
|
public void onCapturerStopped() {
|
|
nativeAndroidVideoTrackSource.setState(/* isLive= */ false);
|
|
}
|
|
|
|
@Override
|
|
public void onFrameCaptured(VideoFrame frame) {
|
|
final NativeAndroidVideoTrackSource.FrameAdaptationParameters parameters =
|
|
nativeAndroidVideoTrackSource.adaptFrame(frame);
|
|
if (parameters == null) {
|
|
// Drop frame.
|
|
return;
|
|
}
|
|
|
|
final VideoFrame.Buffer adaptedBuffer =
|
|
frame.getBuffer().cropAndScale(parameters.cropX, parameters.cropY, parameters.cropWidth,
|
|
parameters.cropHeight, parameters.scaleWidth, parameters.scaleHeight);
|
|
// TODO(magjed): Add video processing hook here.
|
|
nativeAndroidVideoTrackSource.onFrameCaptured(
|
|
new VideoFrame(adaptedBuffer, frame.getRotation(), parameters.timestampNs));
|
|
adaptedBuffer.release();
|
|
}
|
|
};
|
|
|
|
public VideoSource(long nativeSource) {
|
|
super(nativeSource);
|
|
this.nativeAndroidVideoTrackSource = new NativeAndroidVideoTrackSource(nativeSource);
|
|
}
|
|
|
|
/**
|
|
* Calling this function will cause frames to be scaled down to the requested resolution. Also,
|
|
* frames will be cropped to match the requested aspect ratio, and frames will be dropped to match
|
|
* the requested fps. The requested aspect ratio is orientation agnostic and will be adjusted to
|
|
* maintain the input orientation, so it doesn't matter if e.g. 1280x720 or 720x1280 is requested.
|
|
*/
|
|
public void adaptOutputFormat(int width, int height, int fps) {
|
|
final int maxSide = Math.max(width, height);
|
|
final int minSide = Math.min(width, height);
|
|
adaptOutputFormat(maxSide, minSide, minSide, maxSide, fps);
|
|
}
|
|
|
|
/**
|
|
* Same as above, but allows setting two different target resolutions depending on incoming
|
|
* frame orientation. This gives more fine-grained control and can e.g. be used to force landscape
|
|
* video to be cropped to portrait video.
|
|
*/
|
|
public void adaptOutputFormat(
|
|
int landscapeWidth, int landscapeHeight, int portraitWidth, int portraitHeight, int fps) {
|
|
adaptOutputFormat(new AspectRatio(landscapeWidth, landscapeHeight),
|
|
/* maxLandscapePixelCount= */ landscapeWidth * landscapeHeight,
|
|
new AspectRatio(portraitWidth, portraitHeight),
|
|
/* maxPortraitPixelCount= */ portraitWidth * portraitHeight, fps);
|
|
}
|
|
|
|
/** Same as above, with even more control as each constraint is optional. */
|
|
public void adaptOutputFormat(AspectRatio targetLandscapeAspectRatio,
|
|
@Nullable Integer maxLandscapePixelCount, AspectRatio targetPortraitAspectRatio,
|
|
@Nullable Integer maxPortraitPixelCount, @Nullable Integer maxFps) {
|
|
nativeAndroidVideoTrackSource.adaptOutputFormat(targetLandscapeAspectRatio,
|
|
maxLandscapePixelCount, targetPortraitAspectRatio, maxPortraitPixelCount, maxFps);
|
|
}
|
|
|
|
public CapturerObserver getCapturerObserver() {
|
|
return capturerObserver;
|
|
}
|
|
|
|
/** Returns a pointer to webrtc::VideoTrackSourceInterface. */
|
|
long getNativeVideoTrackSource() {
|
|
return getNativeMediaSource();
|
|
}
|
|
}
|