9a58cc00e0
This updates AppRTC to use addTrack instead of addStream, and removes the use of onAddStream, because we no longer have to wait for this to be fired to set the remote track's video renderers. Bug: webrtc:8869 Change-Id: I1ecae684a9bc4b30512e8c5d717e72b52c589831 Reviewed-on: https://webrtc-review.googlesource.com/57840 Commit-Queue: Seth Hampson <shampson@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Steve Anton <steveanton@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22318}
105 lines
3.4 KiB
Java
105 lines
3.4 KiB
Java
/*
|
|
* Copyright 2015 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;
|
|
|
|
/** Java wrapper for a C++ RtpSenderInterface. */
|
|
@JNINamespace("webrtc::jni")
|
|
public class RtpSender {
|
|
final long nativeRtpSender;
|
|
|
|
private MediaStreamTrack cachedTrack;
|
|
private boolean ownsTrack = true;
|
|
|
|
private final DtmfSender dtmfSender;
|
|
|
|
@CalledByNative
|
|
public RtpSender(long nativeRtpSender) {
|
|
this.nativeRtpSender = nativeRtpSender;
|
|
long nativeTrack = nativeGetTrack(nativeRtpSender);
|
|
cachedTrack = MediaStreamTrack.createMediaStreamTrack(nativeTrack);
|
|
|
|
long nativeDtmfSender = nativeGetDtmfSender(nativeRtpSender);
|
|
dtmfSender = (nativeDtmfSender != 0) ? new DtmfSender(nativeDtmfSender) : null;
|
|
}
|
|
|
|
/**
|
|
* Starts sending a new track, without requiring additional SDP negotiation.
|
|
* <p>
|
|
* Note: This is equivalent to replaceTrack in the official WebRTC API. It
|
|
* was just implemented before the standards group settled on a name.
|
|
*
|
|
* @param takeOwnership If true, the RtpSender takes ownership of the track
|
|
* from the caller, and will auto-dispose of it when no
|
|
* longer needed. |takeOwnership| should only be used if
|
|
* the caller owns the track; it is not appropriate when
|
|
* the track is owned by, for example, another RtpSender
|
|
* or a MediaStream.
|
|
* @return true on success and false on failure.
|
|
*/
|
|
public boolean setTrack(MediaStreamTrack track, boolean takeOwnership) {
|
|
if (!nativeSetTrack(nativeRtpSender, (track == null) ? 0 : track.nativeTrack)) {
|
|
return false;
|
|
}
|
|
if (cachedTrack != null && ownsTrack) {
|
|
cachedTrack.dispose();
|
|
}
|
|
cachedTrack = track;
|
|
ownsTrack = takeOwnership;
|
|
return true;
|
|
}
|
|
|
|
public MediaStreamTrack track() {
|
|
return cachedTrack;
|
|
}
|
|
|
|
public boolean setParameters(RtpParameters parameters) {
|
|
return nativeSetParameters(nativeRtpSender, parameters);
|
|
}
|
|
|
|
public RtpParameters getParameters() {
|
|
return nativeGetParameters(nativeRtpSender);
|
|
}
|
|
|
|
public String id() {
|
|
return nativeGetId(nativeRtpSender);
|
|
}
|
|
|
|
public DtmfSender dtmf() {
|
|
return dtmfSender;
|
|
}
|
|
|
|
public void dispose() {
|
|
if (dtmfSender != null) {
|
|
dtmfSender.dispose();
|
|
}
|
|
if (cachedTrack != null && ownsTrack) {
|
|
cachedTrack.dispose();
|
|
}
|
|
JniCommon.nativeReleaseRef(nativeRtpSender);
|
|
}
|
|
|
|
private static native boolean nativeSetTrack(long rtpSender, long nativeTrack);
|
|
|
|
// This should increment the reference count of the track.
|
|
// Will be released in dispose() or setTrack().
|
|
private static native long nativeGetTrack(long rtpSender);
|
|
|
|
// This should increment the reference count of the DTMF sender.
|
|
// Will be released in dispose().
|
|
private static native long nativeGetDtmfSender(long rtpSender);
|
|
|
|
private static native boolean nativeSetParameters(long rtpSender, RtpParameters parameters);
|
|
|
|
private static native RtpParameters nativeGetParameters(long rtpSender);
|
|
|
|
private static native String nativeGetId(long rtpSender);
|
|
};
|