Index: talk/app/webrtc/java/src/org/webrtc/RtpSender.java |
diff --git a/talk/app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java b/talk/app/webrtc/java/src/org/webrtc/RtpSender.java |
similarity index 56% |
copy from talk/app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java |
copy to talk/app/webrtc/java/src/org/webrtc/RtpSender.java |
index f7032a739bdbb24ac93dc000b9a42fb11223cc40..60e169038aecf9eea0bbd1af945bcd8747bd1776 100644 |
--- a/talk/app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java |
+++ b/talk/app/webrtc/java/src/org/webrtc/RtpSender.java |
@@ -27,31 +27,49 @@ |
package org.webrtc; |
-public class CallSessionFileRotatingLogSink { |
- static { |
- System.loadLibrary("jingle_peerconnection_so"); |
+/** Java wrapper for a C++ RtpSenderInterface. */ |
+public class RtpSender { |
+ final long nativeRtpSender; |
+ |
+ private MediaStreamTrack cachedTrack; |
+ |
+ public RtpSender(long nativeRtpSender) { |
+ this.nativeRtpSender = nativeRtpSender; |
+ long track = nativeTrack(nativeRtpSender); |
+ cachedTrack = (track == 0) ? null : new MediaStreamTrack(track); |
} |
- private long nativeSink; |
+ public void setTrack(MediaStreamTrack track) { |
+ if (cachedTrack != null) { |
+ cachedTrack.dispose(); |
+ } |
+ nativeSetTrack(nativeRtpSender, track.nativeTrack); |
+ cachedTrack = track; |
+ } |
- public static byte[] getLogData(String dirPath) { |
- return nativeGetLogData(dirPath); |
+ public MediaStreamTrack track() { |
+ return cachedTrack; |
} |
- public CallSessionFileRotatingLogSink( |
- String dirPath, int maxFileSize, Logging.Severity severity) { |
- nativeSink = nativeAddSink(dirPath, maxFileSize, severity.ordinal()); |
+ public String id() { |
+ return nativeId(nativeRtpSender); |
} |
public void dispose() { |
- if (nativeSink != 0) { |
- nativeDeleteSink(nativeSink); |
- nativeSink = 0; |
+ free(nativeRtpSender); |
+ if (cachedTrack != null) { |
+ cachedTrack.dispose(); |
} |
} |
- private static native long nativeAddSink( |
- String dirPath, int maxFileSize, int severity); |
- private static native void nativeDeleteSink(long nativeSink); |
- private static native byte[] nativeGetLogData(String dirPath); |
+ private static native void nativeSetTrack(long nativeRtpSender, long nativeTrack); |
+ |
+ // This should increment the reference count of the track, with the assumption |
+ // that a MediaStreamTrack will be created which will release it. |
+ private static native long nativeTrack(long nativeRtpSender); |
+ |
+ private static native String nativeId(long nativeRtpSender); |
+ |
+ private static native void free(long nativeRtpSender); |
} |
+; |