generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PeerConnection(java): added MediaConstraints support to AudioSource, now fed to AudioTrack.

Browse Source 
BUG=2912
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8509004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5540 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2014-02-13 04:01:04 +00:00
parent 540acde5b3
commit 3eda643a91
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -1971,12 +1971,25 @@ JOW(jlong, PeerConnectionFactory_nativeCreateVideoTrack)(
return (jlong)track.release(); return (jlong)track.release();
} }
JOW(jlong, PeerConnectionFactory_nativeCreateAudioTrack)( JOW(jlong, PeerConnectionFactory_nativeCreateAudioSource)(
JNIEnv* jni, jclass, jlong native_factory, jstring id) { JNIEnv* jni, jclass, jlong native_factory, jobject j_constraints) {
scoped_ptr<ConstraintsWrapper> constraints(
new ConstraintsWrapper(jni, j_constraints));
talk_base::scoped_refptr<PeerConnectionFactoryInterface> factory( talk_base::scoped_refptr<PeerConnectionFactoryInterface> factory(
factoryFromJava(native_factory)); factoryFromJava(native_factory));
talk_base::scoped_refptr<AudioTrackInterface> track( talk_base::scoped_refptr<AudioSourceInterface> source(
factory->CreateAudioTrack(JavaToStdString(jni, id), NULL)); factory->CreateAudioSource(constraints.get()));
return (jlong)source.release();
}
JOW(jlong, PeerConnectionFactory_nativeCreateAudioTrack)(
JNIEnv* jni, jclass, jlong native_factory, jstring id,
jlong native_source) {
talk_base::scoped_refptr<PeerConnectionFactoryInterface> factory(
factoryFromJava(native_factory));
talk_base::scoped_refptr<AudioTrackInterface> track(factory->CreateAudioTrack(
JavaToStdString(jni, id),
reinterpret_cast<AudioSourceInterface*>(native_source)));
return (jlong)track.release(); return (jlong)track.release();
} }

14
talk/app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java
View File

@ -85,8 +85,13 @@ public class PeerConnectionFactory {
nativeFactory, id, source.nativeSource)); nativeFactory, id, source.nativeSource));
} }
public AudioTrack createAudioTrack(String id) { public AudioSource createAudioSource(MediaConstraints constraints) {
return new AudioTrack(nativeCreateAudioTrack(nativeFactory, id)); return new AudioSource(nativeCreateAudioSource(nativeFactory, constraints));
}
public AudioTrack createAudioTrack(String id, AudioSource source) {
return new AudioTrack(nativeCreateAudioTrack(
nativeFactory, id, source.nativeSource));
} }
public void dispose() { public void dispose() {
@ -112,8 +117,11 @@ public class PeerConnectionFactory {
private static native long nativeCreateVideoTrack( private static native long nativeCreateVideoTrack(
long nativeFactory, String id, long nativeVideoSource); long nativeFactory, String id, long nativeVideoSource);
private static native long nativeCreateAudioSource(
long nativeFactory, MediaConstraints constraints);
private static native long nativeCreateAudioTrack( private static native long nativeCreateAudioTrack(
long nativeFactory, String id); long nativeFactory, String id, long nativeSource);
private static native void freeFactory(long nativeFactory); private static native void freeFactory(long nativeFactory);
} }

3
talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java
View File

@ -481,7 +481,8 @@ public class PeerConnectionTest extends TestCase {
// Just for fun, let's remove and re-add the track. // Just for fun, let's remove and re-add the track.
lMS.removeTrack(videoTrack); lMS.removeTrack(videoTrack);
lMS.addTrack(videoTrack); lMS.addTrack(videoTrack);
lMS.addTrack(factory.createAudioTrack(audioTrackId)); lMS.addTrack(factory.createAudioTrack(
audioTrackId, factory.createAudioSource(new MediaConstraints())));
pc.addStream(lMS, new MediaConstraints()); pc.addStream(lMS, new MediaConstraints());
return new WeakReference<MediaStream>(lMS); return new WeakReference<MediaStream>(lMS);
} }

4
talk/examples/android/src/org/appspot/apprtc/AppRTCDemoActivity.java
View File

@ -242,7 +242,9 @@ public class AppRTCDemoActivity extends Activity
lMS.addTrack(videoTrack); lMS.addTrack(videoTrack);
} }
if (appRtcClient.audioConstraints() != null) { if (appRtcClient.audioConstraints() != null) {
lMS.addTrack(factory.createAudioTrack("ARDAMSa0")); lMS.addTrack(factory.createAudioTrack(
"ARDAMSa0",
factory.createAudioSource(appRtcClient.audioConstraints())));
} }
pc.addStream(lMS, new MediaConstraints()); pc.addStream(lMS, new MediaConstraints());
} }