admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding a way for a Java RtpSender to set a track without taking ownership.

Browse Source 
This means that the track will still have a reference count after the
PeerConnection and RtpSender have been destroyed.

R=glaznev@webrtc.org, pthatcher@webrtc.org

Review URL: https://codereview.webrtc.org/1566103003 .

Cr-Commit-Position: refs/heads/master@{#11176}
This commit is contained in:
Taylor Brandstetter 2016-01-07 15:11:25 -08:00
parent ced8ec9069
commit e5ba13bc09
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2120,11 +2120,11 @@ JOW(jbyteArray, CallSessionFileRotatingLogSink_nativeGetLogData)(
return result;
}
JOW(void, RtpSender_nativeSetTrack)(JNIEnv* jni,
JOW(jboolean, RtpSender_nativeSetTrack)(JNIEnv* jni,
jclass,
jlong j_rtp_sender_pointer,
jlong j_track_pointer) {
reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
return reinterpret_cast<RtpSenderInterface*>(j_rtp_sender_pointer)
->SetTrack(reinterpret_cast<MediaStreamTrackInterface*>(j_track_pointer));
}

25
talk/app/webrtc/java/src/org/webrtc/RtpSender.java
View File

@ -32,6 +32,7 @@ public class RtpSender {
final long nativeRtpSender;
private MediaStreamTrack cachedTrack;
private boolean ownsTrack = true;
public RtpSender(long nativeRtpSender) {
this.nativeRtpSender = nativeRtpSender;
@ -40,14 +41,22 @@ public class RtpSender {
cachedTrack = (track == 0) ? null : new MediaStreamTrack(track);
}
// NOTE: This should not be called with a track that's already used by
// another RtpSender, because then it would be double-disposed.
public void setTrack(MediaStreamTrack track) {
if (cachedTrack != null) {
// If |takeOwnership| is 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.
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;
nativeSetTrack(nativeRtpSender, (track == null) ? 0 : track.nativeTrack);
ownsTrack = takeOwnership;
return true;
}
public MediaStreamTrack track() {
@ -59,14 +68,14 @@ public class RtpSender {
}
public void dispose() {
if (cachedTrack != null) {
if (cachedTrack != null && ownsTrack) {
cachedTrack.dispose();
}
free(nativeRtpSender);
}
private static native void nativeSetTrack(long nativeRtpSender,
long nativeTrack);
private static native boolean nativeSetTrack(long nativeRtpSender,
long nativeTrack);
// This should increment the reference count of the track.
// Will be released in dispose() or setTrack().