Add Java support for AudioProcessing and PostProcessing injection
This allows injection of a user-defined post processing module from the Android layer. Bug: webrtc:8163 Change-Id: If3a6b4726c34c5f82d186b8cf95373c283cbd3f6 Reviewed-on: https://webrtc-review.googlesource.com/7610 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20367}
This commit is contained in:

committed by
Commit Bot

parent
6f72f56b6c
commit
6f38d25f11
20
sdk/android/api/org/webrtc/AudioProcessingFactory.java
Normal file
20
sdk/android/api/org/webrtc/AudioProcessingFactory.java
Normal file
@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Copyright 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.
|
||||
*/
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
/** Factory for creating webrtc::AudioProcessing instances. */
|
||||
public interface AudioProcessingFactory {
|
||||
/**
|
||||
* Dynamically allocates a webrtc::AudioProcessing instance and returns a pointer to it.
|
||||
* The caller takes ownership of the object.
|
||||
*/
|
||||
public long createNative();
|
||||
}
|
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright 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.
|
||||
*/
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
/** Factory for instantiating the default webrtc::AudioProcessing implementation. */
|
||||
public class DefaultAudioProcessingFactory implements AudioProcessingFactory {
|
||||
public DefaultAudioProcessingFactory() {
|
||||
this(null /* postProcessingFactory */);
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows injecting a PostProcessingFactory. A null PostProcessingFactory creates a
|
||||
* webrtc::AudioProcessing with nullptr webrtc::postProcessing.
|
||||
*/
|
||||
public DefaultAudioProcessingFactory(PostProcessingFactory postProcessingFactory) {
|
||||
this.postProcessingFactory = postProcessingFactory;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a default webrtc::AudioProcessing module, which takes ownership of objects created by
|
||||
* its factories.
|
||||
*/
|
||||
@Override
|
||||
public long createNative() {
|
||||
long nativePostProcessor = 0;
|
||||
if (postProcessingFactory != null) {
|
||||
nativePostProcessor = postProcessingFactory.createNative();
|
||||
if (nativePostProcessor == 0) {
|
||||
throw new NullPointerException(
|
||||
"PostProcessingFactory.createNative() may not return 0 (nullptr).");
|
||||
}
|
||||
}
|
||||
return nativeCreateAudioProcessing(nativePostProcessor);
|
||||
}
|
||||
|
||||
private PostProcessingFactory postProcessingFactory;
|
||||
|
||||
private static native long nativeCreateAudioProcessing(long nativePostProcessor);
|
||||
}
|
@ -125,6 +125,14 @@ public class PeerConnectionFactory {
|
||||
}
|
||||
}
|
||||
|
||||
private void checkInitializeHasBeenCalled() {
|
||||
if (!NativeLibrary.isLoaded() || ContextUtils.getApplicationContext() == null) {
|
||||
throw new IllegalStateException(
|
||||
"PeerConnectionFactory.initialize was not called before creating a "
|
||||
+ "PeerConnectionFactory.");
|
||||
}
|
||||
}
|
||||
|
||||
// Must be called at least once before creating a PeerConnectionFactory
|
||||
// (for example, at application startup time).
|
||||
private static native void nativeInitializeAndroidGlobals(
|
||||
@ -185,17 +193,27 @@ public class PeerConnectionFactory {
|
||||
|
||||
public PeerConnectionFactory(
|
||||
Options options, VideoEncoderFactory encoderFactory, VideoDecoderFactory decoderFactory) {
|
||||
if (!NativeLibrary.isLoaded() || ContextUtils.getApplicationContext() == null) {
|
||||
throw new IllegalStateException(
|
||||
"PeerConnectionFactory.initialize was not called before creating a "
|
||||
+ "PeerConnectionFactory.");
|
||||
}
|
||||
checkInitializeHasBeenCalled();
|
||||
nativeFactory = nativeCreatePeerConnectionFactory(options, encoderFactory, decoderFactory);
|
||||
if (nativeFactory == 0) {
|
||||
throw new RuntimeException("Failed to initialize PeerConnectionFactory!");
|
||||
}
|
||||
}
|
||||
|
||||
public PeerConnectionFactory(Options options, VideoEncoderFactory encoderFactory,
|
||||
VideoDecoderFactory decoderFactory, AudioProcessingFactory audioProcessingFactory) {
|
||||
checkInitializeHasBeenCalled();
|
||||
if (audioProcessingFactory == null) {
|
||||
throw new NullPointerException(
|
||||
"PeerConnectionFactory constructor does not accept a null AudioProcessingFactory.");
|
||||
}
|
||||
nativeFactory = nativeCreatePeerConnectionFactoryWithAudioProcessing(
|
||||
options, encoderFactory, decoderFactory, audioProcessingFactory.createNative());
|
||||
if (nativeFactory == 0) {
|
||||
throw new RuntimeException("Failed to initialize PeerConnectionFactory!");
|
||||
}
|
||||
}
|
||||
|
||||
public PeerConnection createPeerConnection(PeerConnection.RTCConfiguration rtcConfig,
|
||||
MediaConstraints constraints, PeerConnection.Observer observer) {
|
||||
long nativeObserver = nativeCreateObserver(observer);
|
||||
@ -337,6 +355,10 @@ public class PeerConnectionFactory {
|
||||
private static native long nativeCreatePeerConnectionFactory(
|
||||
Options options, VideoEncoderFactory encoderFactory, VideoDecoderFactory decoderFactory);
|
||||
|
||||
private static native long nativeCreatePeerConnectionFactoryWithAudioProcessing(Options options,
|
||||
VideoEncoderFactory encoderFactory, VideoDecoderFactory decoderFactory,
|
||||
long nativeAudioProcessor);
|
||||
|
||||
private static native long nativeCreateObserver(PeerConnection.Observer observer);
|
||||
|
||||
private static native long nativeCreatePeerConnection(long nativeFactory,
|
||||
|
20
sdk/android/api/org/webrtc/PostProcessingFactory.java
Normal file
20
sdk/android/api/org/webrtc/PostProcessingFactory.java
Normal file
@ -0,0 +1,20 @@
|
||||
/*
|
||||
* Copyright 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.
|
||||
*/
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
/** Factory for creating webrtc::PostProcessing instances. */
|
||||
public interface PostProcessingFactory {
|
||||
/**
|
||||
* Dynamically allocates a webrtc::PostProcessing instance and returns a pointer to it.
|
||||
* The caller takes ownership of the object.
|
||||
*/
|
||||
public long createNative();
|
||||
}
|
Reference in New Issue
Block a user