Hold a reference to AndroidVideoTrackSource while calling onFrameCaptured.
This makes it safe to deliver frames to the sink from VideoProcessor even after setSink has been called with null reference without danger of use after free. Bug: b/148063550 Change-Id: Ib78f75ac49fc6117f744c55da1a4e671bbdcdf22 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168160 Reviewed-by: Paulina Hensman <phensman@webrtc.org> Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30455}
This commit is contained in:
committed by
Commit Bot
parent
215963c759
commit
0f6bcd18b2
83
sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java
Normal file
83
sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java
Normal file
@ -0,0 +1,83 @@
|
||||
/*
|
||||
* Copyright 2020 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 static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import org.chromium.testing.local.LocalRobolectricTestRunner;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(LocalRobolectricTestRunner.class)
|
||||
@Config(manifest = Config.NONE)
|
||||
public class RefCountDelegateTest {
|
||||
@Mock Runnable mockReleaseCallback;
|
||||
private RefCountDelegate refCountDelegate;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
refCountDelegate = new RefCountDelegate(mockReleaseCallback);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReleaseRunsReleaseCallback() {
|
||||
refCountDelegate.release();
|
||||
verify(mockReleaseCallback).run();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRetainIncreasesRefCount() {
|
||||
refCountDelegate.retain();
|
||||
|
||||
refCountDelegate.release();
|
||||
verify(mockReleaseCallback, never()).run();
|
||||
|
||||
refCountDelegate.release();
|
||||
verify(mockReleaseCallback).run();
|
||||
}
|
||||
|
||||
@Test(expected = IllegalStateException.class)
|
||||
public void testReleaseAfterFreeThrowsIllegalStateException() {
|
||||
refCountDelegate.release();
|
||||
refCountDelegate.release();
|
||||
}
|
||||
|
||||
@Test(expected = IllegalStateException.class)
|
||||
public void testRetainAfterFreeThrowsIllegalStateException() {
|
||||
refCountDelegate.release();
|
||||
refCountDelegate.retain();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSafeRetainBeforeFreeReturnsTrueAndIncreasesRefCount() {
|
||||
assertThat(refCountDelegate.safeRetain()).isTrue();
|
||||
|
||||
refCountDelegate.release();
|
||||
verify(mockReleaseCallback, never()).run();
|
||||
|
||||
refCountDelegate.release();
|
||||
verify(mockReleaseCallback).run();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSafeRetainAfterFreeReturnsFalse() {
|
||||
refCountDelegate.release();
|
||||
assertThat(refCountDelegate.safeRetain()).isFalse();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user