b7700d370d
In particular: * Trying to remove a VideoSink that was not attached should be a no-op. * Trying to remove a null VideoSink should be a no-op. * Adding the same VideoSink multiple times should a no-op, and should not create duplicate native VideoSinks. * Trying to add a null VideoSink should throw an exception in the Java layer instead of crashing in native code. This CL also adds tests that verify these behaviors. Bug: webrtc:9403 Change-Id: I928b7bb7f683634e287d7fec9e26f4179f73c150 Reviewed-on: https://webrtc-review.googlesource.com/83322 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Paulina Hensman <phensman@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23602}
93 lines
2.9 KiB
Java
93 lines
2.9 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.IdentityHashMap;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
/** Java version of VideoTrackInterface. */
|
|
public class VideoTrack extends MediaStreamTrack {
|
|
private final List<VideoRenderer> renderers = new ArrayList<>();
|
|
private final IdentityHashMap<VideoSink, Long> sinks = new IdentityHashMap<VideoSink, Long>();
|
|
|
|
public VideoTrack(long nativeTrack) {
|
|
super(nativeTrack);
|
|
}
|
|
|
|
/**
|
|
* Adds a VideoSink to the track.
|
|
*
|
|
* A track can have any number of VideoSinks. VideoSinks will replace
|
|
* renderers. However, converting old style texture frames will involve costly
|
|
* conversion to I420 so it is not recommended to upgrade before all your
|
|
* sources produce VideoFrames.
|
|
*/
|
|
public void addSink(VideoSink sink) {
|
|
if (sink == null) {
|
|
throw new IllegalArgumentException("The VideoSink is not allowed to be null");
|
|
}
|
|
// We allow calling addSink() with the same sink multiple times. This is similar to the C++
|
|
// VideoTrack::AddOrUpdateSink().
|
|
if (!sinks.containsKey(sink)) {
|
|
final long nativeSink = nativeWrapSink(sink);
|
|
sinks.put(sink, nativeSink);
|
|
nativeAddSink(nativeTrack, nativeSink);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Removes a VideoSink from the track.
|
|
*
|
|
* If the VideoSink was not attached to the track, this is a no-op.
|
|
*/
|
|
public void removeSink(VideoSink sink) {
|
|
final Long nativeSink = sinks.remove(sink);
|
|
if (nativeSink != null) {
|
|
nativeRemoveSink(nativeTrack, nativeSink);
|
|
nativeFreeSink(nativeSink);
|
|
}
|
|
}
|
|
|
|
public void addRenderer(VideoRenderer renderer) {
|
|
renderers.add(renderer);
|
|
nativeAddSink(nativeTrack, renderer.nativeVideoRenderer);
|
|
}
|
|
|
|
public void removeRenderer(VideoRenderer renderer) {
|
|
if (!renderers.remove(renderer)) {
|
|
return;
|
|
}
|
|
nativeRemoveSink(nativeTrack, renderer.nativeVideoRenderer);
|
|
renderer.dispose();
|
|
}
|
|
|
|
@Override
|
|
public void dispose() {
|
|
for (VideoRenderer renderer : renderers) {
|
|
nativeRemoveSink(nativeTrack, renderer.nativeVideoRenderer);
|
|
renderer.dispose();
|
|
}
|
|
renderers.clear();
|
|
for (long nativeSink : sinks.values()) {
|
|
nativeRemoveSink(nativeTrack, nativeSink);
|
|
nativeFreeSink(nativeSink);
|
|
}
|
|
sinks.clear();
|
|
super.dispose();
|
|
}
|
|
|
|
private static native void nativeAddSink(long track, long nativeSink);
|
|
private static native void nativeRemoveSink(long track, long nativeSink);
|
|
private static native long nativeWrapSink(VideoSink sink);
|
|
private static native void nativeFreeSink(long sink);
|
|
}
|