Make base classes for native video encoder/decoder public
Implementers of Java wrappers for native encoders need to have the same implementation of all the unsupported methods, as mentioned in the documentation of VideoEncoder.createNativeVideoEncoder (and its decoder equivalent). This simplifies implementation of such encoders/decoders, and also make sure they don’t override unsupported methods, as they are guaranteed not to be called. Bug: None Change-Id: Iaa8499eda1b52cc14b04622bea2766cd09ba43e6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160186 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Xavier Lepaul <xalep@google.com> Cr-Commit-Position: refs/heads/master@{#29866}
This commit is contained in:
committed by
Commit Bot
parent
58a3210823
commit
6e9d0d38ef
@ -239,6 +239,8 @@ if (is_android) {
|
|||||||
"api/org/webrtc/YuvConverter.java",
|
"api/org/webrtc/YuvConverter.java",
|
||||||
"api/org/webrtc/YuvHelper.java",
|
"api/org/webrtc/YuvHelper.java",
|
||||||
"api/org/webrtc/TimestampAligner.java",
|
"api/org/webrtc/TimestampAligner.java",
|
||||||
|
"api/org/webrtc/WrappedNativeVideoDecoder.java",
|
||||||
|
"api/org/webrtc/WrappedNativeVideoEncoder.java",
|
||||||
"src/java/org/webrtc/EglBase10Impl.java",
|
"src/java/org/webrtc/EglBase10Impl.java",
|
||||||
"src/java/org/webrtc/EglBase14Impl.java",
|
"src/java/org/webrtc/EglBase14Impl.java",
|
||||||
"src/java/org/webrtc/GlGenericDrawer.java",
|
"src/java/org/webrtc/GlGenericDrawer.java",
|
||||||
@ -247,8 +249,6 @@ if (is_android) {
|
|||||||
"src/java/org/webrtc/VideoDecoderWrapper.java",
|
"src/java/org/webrtc/VideoDecoderWrapper.java",
|
||||||
"src/java/org/webrtc/VideoEncoderWrapper.java",
|
"src/java/org/webrtc/VideoEncoderWrapper.java",
|
||||||
"src/java/org/webrtc/WrappedNativeI420Buffer.java",
|
"src/java/org/webrtc/WrappedNativeI420Buffer.java",
|
||||||
"src/java/org/webrtc/WrappedNativeVideoDecoder.java",
|
|
||||||
"src/java/org/webrtc/WrappedNativeVideoEncoder.java",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [
|
||||||
|
|||||||
@ -13,31 +13,31 @@ package org.webrtc;
|
|||||||
/**
|
/**
|
||||||
* Wraps a native webrtc::VideoDecoder.
|
* Wraps a native webrtc::VideoDecoder.
|
||||||
*/
|
*/
|
||||||
abstract class WrappedNativeVideoDecoder implements VideoDecoder {
|
public abstract class WrappedNativeVideoDecoder implements VideoDecoder {
|
||||||
@Override public abstract long createNativeVideoDecoder();
|
@Override public abstract long createNativeVideoDecoder();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus initDecode(Settings settings, Callback decodeCallback) {
|
public final VideoCodecStatus initDecode(Settings settings, Callback decodeCallback) {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus release() {
|
public final VideoCodecStatus release() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus decode(EncodedImage frame, DecodeInfo info) {
|
public final VideoCodecStatus decode(EncodedImage frame, DecodeInfo info) {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean getPrefersLateDecoding() {
|
public final boolean getPrefersLateDecoding() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getImplementationName() {
|
public final String getImplementationName() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -13,37 +13,37 @@ package org.webrtc;
|
|||||||
/**
|
/**
|
||||||
* Wraps a native webrtc::VideoEncoder.
|
* Wraps a native webrtc::VideoEncoder.
|
||||||
*/
|
*/
|
||||||
abstract class WrappedNativeVideoEncoder implements VideoEncoder {
|
public abstract class WrappedNativeVideoEncoder implements VideoEncoder {
|
||||||
@Override public abstract long createNativeVideoEncoder();
|
@Override public abstract long createNativeVideoEncoder();
|
||||||
@Override public abstract boolean isHardwareEncoder();
|
@Override public abstract boolean isHardwareEncoder();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus initEncode(Settings settings, Callback encodeCallback) {
|
public final VideoCodecStatus initEncode(Settings settings, Callback encodeCallback) {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus release() {
|
public final VideoCodecStatus release() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus encode(VideoFrame frame, EncodeInfo info) {
|
public final VideoCodecStatus encode(VideoFrame frame, EncodeInfo info) {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate) {
|
public final VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate) {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ScalingSettings getScalingSettings() {
|
public final ScalingSettings getScalingSettings() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getImplementationName() {
|
public final String getImplementationName() {
|
||||||
throw new UnsupportedOperationException("Not implemented.");
|
throw new UnsupportedOperationException("Not implemented.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user