This CL does the following: * Split out MediaStream JNI code from peerconnection.cc to mediastream.h/mediastream.cc. * Split out RtpSender JNI code from peerconnection.cc to rtpsender.h/rtpsender.cc. * Split out TurnCustomizer JNI code from peerconnection.cc to turncustomizer.h/turncustomizer.cc. * Add missing instanceof function to WrappedNativeVideoDecoder.java. * Move some PeerConnectionFactory JNI declarations from pc/video.cc to peerconnectionfactory.cc. * Add declaration to video.h for the JNI functions that depend on EglBase14_jni.h. * Use a scoped object to store the global Java MediaStream objects that also call dispose. Bug: webrtc:8278 Change-Id: I3c56a599b8bcbc8f34e5c5a7b9c9fe1d192ff3f3 Reviewed-on: https://webrtc-review.googlesource.com/34645 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21380}
145 lines
4.3 KiB
Java
145 lines
4.3 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 java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Iterator;
|
|
|
|
/** Java wrapper for a C++ MediaStreamInterface. */
|
|
public class MediaStream {
|
|
private static final String TAG = "MediaStream";
|
|
|
|
public final List<AudioTrack> audioTracks = new ArrayList<>();
|
|
public final List<VideoTrack> videoTracks = new ArrayList<>();
|
|
public final List<VideoTrack> preservedVideoTracks = new ArrayList<>();
|
|
// Package-protected for PeerConnection.
|
|
final long nativeStream;
|
|
|
|
@CalledByNative
|
|
public MediaStream(long nativeStream) {
|
|
this.nativeStream = nativeStream;
|
|
}
|
|
|
|
public boolean addTrack(AudioTrack track) {
|
|
if (addAudioTrackToNativeStream(nativeStream, track.nativeTrack)) {
|
|
audioTracks.add(track);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public boolean addTrack(VideoTrack track) {
|
|
if (addVideoTrackToNativeStream(nativeStream, track.nativeTrack)) {
|
|
videoTracks.add(track);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Tracks added in addTrack() call will be auto released once MediaStream.dispose()
|
|
// is called. If video track need to be preserved after MediaStream is destroyed it
|
|
// should be added to MediaStream using addPreservedTrack() call.
|
|
public boolean addPreservedTrack(VideoTrack track) {
|
|
if (addVideoTrackToNativeStream(nativeStream, track.nativeTrack)) {
|
|
preservedVideoTracks.add(track);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public boolean removeTrack(AudioTrack track) {
|
|
audioTracks.remove(track);
|
|
return removeNativeAudioTrack(nativeStream, track.nativeTrack);
|
|
}
|
|
|
|
public boolean removeTrack(VideoTrack track) {
|
|
videoTracks.remove(track);
|
|
preservedVideoTracks.remove(track);
|
|
return removeNativeVideoTrack(nativeStream, track.nativeTrack);
|
|
}
|
|
|
|
@CalledByNative
|
|
public void dispose() {
|
|
// Remove and release previously added audio and video tracks.
|
|
while (!audioTracks.isEmpty()) {
|
|
AudioTrack track = audioTracks.get(0 /* index */);
|
|
removeTrack(track);
|
|
track.dispose();
|
|
}
|
|
while (!videoTracks.isEmpty()) {
|
|
VideoTrack track = videoTracks.get(0 /* index */);
|
|
removeTrack(track);
|
|
track.dispose();
|
|
}
|
|
// Remove, but do not release preserved video tracks.
|
|
while (!preservedVideoTracks.isEmpty()) {
|
|
removeTrack(preservedVideoTracks.get(0 /* index */));
|
|
}
|
|
JniCommon.nativeReleaseRef(nativeStream);
|
|
}
|
|
|
|
public String label() {
|
|
return getNativeLabel(nativeStream);
|
|
}
|
|
|
|
@Override
|
|
public String toString() {
|
|
return "[" + label() + ":A=" + audioTracks.size() + ":V=" + videoTracks.size() + "]";
|
|
}
|
|
|
|
@CalledByNative
|
|
void addNativeAudioTrack(long nativeTrack) {
|
|
audioTracks.add(new AudioTrack(nativeTrack));
|
|
}
|
|
|
|
@CalledByNative
|
|
void addNativeVideoTrack(long nativeTrack) {
|
|
videoTracks.add(new VideoTrack(nativeTrack));
|
|
}
|
|
|
|
@CalledByNative
|
|
void removeAudioTrack(long nativeTrack) {
|
|
removeMediaStreamTrack(audioTracks, nativeTrack);
|
|
}
|
|
|
|
@CalledByNative
|
|
void removeVideoTrack(long nativeTrack) {
|
|
removeMediaStreamTrack(videoTracks, nativeTrack);
|
|
}
|
|
|
|
private static void removeMediaStreamTrack(
|
|
List<? extends MediaStreamTrack> tracks, long nativeTrack) {
|
|
final Iterator<? extends MediaStreamTrack> it = tracks.iterator();
|
|
while (it.hasNext()) {
|
|
MediaStreamTrack track = it.next();
|
|
if (track.nativeTrack == nativeTrack) {
|
|
track.dispose();
|
|
it.remove();
|
|
return;
|
|
}
|
|
}
|
|
Logging.e(TAG, "Couldn't not find track");
|
|
}
|
|
|
|
private static native boolean addAudioTrackToNativeStream(
|
|
long nativeStream, long nativeAudioTrack);
|
|
|
|
private static native boolean addVideoTrackToNativeStream(
|
|
long nativeStream, long nativeVideoTrack);
|
|
|
|
private static native boolean removeNativeAudioTrack(long nativeStream, long nativeAudioTrack);
|
|
|
|
private static native boolean removeNativeVideoTrack(long nativeStream, long nativeVideoTrack);
|
|
|
|
private static native String getNativeLabel(long nativeStream);
|
|
}
|