zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Raise IllegalStateException for calls to retain() or release() on zero ref count"

Browse Source 
This reverts commit 8a959bfa88b08e215baf3b38e914c41e483c9ece.

Reason for revert: Breaks a downstream test.

Original change's description:
> Raise IllegalStateException for calls to retain() or release() on zero ref count
> 
> Bug: None
> Change-Id: I3205e77b5adfdc4f5dbd7509d1ca0e8b08af62f2
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142175
> Commit-Queue: Niels Moller <nisse@webrtc.org>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#28319}

TBR=sakal@webrtc.org,nisse@webrtc.org

Change-Id: I522cc5264789d8c7088de6df6e47584622265a94
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/142806
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28320}
This commit is contained in:
Niels Moller
2019-06-19 08:50:44 +00:00
committed by Commit Bot
parent 8a959bfa88
commit 18f1f0c1f5
2 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sdk/android/src/java/org/webrtc/RefCountDelegate.java
View File

@ -29,19 +29,12 @@ class RefCountDelegate implements RefCounted {
@Override
public void retain() {
int updated_count = refCount.incrementAndGet();
if (updated_count < 2) {
throw new IllegalStateException("retain() called on an object with refcount < 1");
}
refCount.incrementAndGet();
}
@Override
public void release() {
int updated_count = refCount.decrementAndGet();
if (updated_count < 0) {
throw new IllegalStateException("release() called on an object with refcount < 1");
}
if (updated_count == 0 && releaseCallback != null) {
if (refCount.decrementAndGet() == 0 && releaseCallback != null) {
releaseCallback.run();
}
}

53
sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java
View File

@ -29,10 +29,7 @@ import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaFormat;
import android.os.Handler;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.chromium.testing.local.LocalRobolectricTestRunner;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -165,25 +162,6 @@ public class AndroidVideoDecoderTest {
}
}
private static class FakeDecoderCallback implements VideoDecoder.Callback {
public final List<VideoFrame> decodedFrames;
public FakeDecoderCallback() {
decodedFrames = new ArrayList<>();
}
@Override
public void onDecodedFrame(VideoFrame frame, Integer decodeTimeMs, Integer qp) {
frame.retain();
decodedFrames.add(frame);
}
public void release() {
for (VideoFrame frame : decodedFrames) frame.release();
decodedFrames.clear();
}
}
private EncodedImage createTestEncodedImage() {
return EncodedImage.builder()
.setBuffer(ByteBuffer.wrap(ENCODED_TEST_DATA))
@ -196,7 +174,6 @@ public class AndroidVideoDecoderTest {
@Mock private SurfaceTextureHelper mockSurfaceTextureHelper;
@Mock private VideoDecoder.Callback mockDecoderCallback;
private FakeMediaCodecWrapper fakeMediaCodecWrapper;
private FakeDecoderCallback fakeDecoderCallback;
@Before
public void setUp() {
@ -206,12 +183,6 @@ public class AndroidVideoDecoderTest {
MediaFormat outputFormat = new MediaFormat();
// TODO(sakal): Add more details to output format as needed.
fakeMediaCodecWrapper = spy(new FakeMediaCodecWrapper(outputFormat));
fakeDecoderCallback = new FakeDecoderCallback();
}
@After
public void cleanUp() {
fakeDecoderCallback.release();
}
@Test
@ -297,7 +268,7 @@ public class AndroidVideoDecoderTest {
// Set-up.
TestDecoder decoder = new TestDecoderBuilder().setUseSurface(/* useSurface = */ false).build();
decoder.initDecode(TEST_DECODER_SETTINGS, fakeDecoderCallback);
decoder.initDecode(TEST_DECODER_SETTINGS, mockDecoderCallback);
decoder.decode(createTestEncodedImage(),
new DecodeInfo(/* isMissingFrames= */ false, /* renderTimeMs= */ 0));
fakeMediaCodecWrapper.addOutputData(
@ -307,8 +278,13 @@ public class AndroidVideoDecoderTest {
decoder.waitDeliverDecodedFrame();
// Verify.
assertThat(fakeDecoderCallback.decodedFrames).hasSize(1);
VideoFrame videoFrame = fakeDecoderCallback.decodedFrames.get(0);
ArgumentCaptor<VideoFrame> videoFrameCaptor = ArgumentCaptor.forClass(VideoFrame.class);
verify(mockDecoderCallback)
.onDecodedFrame(videoFrameCaptor.capture(),
/* decodeTimeMs= */ any(Integer.class),
/* qp= */ any());
VideoFrame videoFrame = videoFrameCaptor.getValue();
assertThat(videoFrame).isNotNull();
assertThat(videoFrame.getRotatedWidth()).isEqualTo(TEST_DECODER_SETTINGS.width);
assertThat(videoFrame.getRotatedHeight()).isEqualTo(TEST_DECODER_SETTINGS.height);
@ -370,7 +346,7 @@ public class AndroidVideoDecoderTest {
public void testDeliversRenderedBuffers() throws InterruptedException {
// Set-up.
TestDecoder decoder = new TestDecoderBuilder().build();
decoder.initDecode(TEST_DECODER_SETTINGS, fakeDecoderCallback);
decoder.initDecode(TEST_DECODER_SETTINGS, mockDecoderCallback);
decoder.decode(createTestEncodedImage(),
new DecodeInfo(/* isMissingFrames= */ false, /* renderTimeMs= */ 0));
fakeMediaCodecWrapper.addOutputTexture(/* presentationTimestampUs= */ 0, /* flags= */ 0);
@ -394,13 +370,16 @@ public class AndroidVideoDecoderTest {
outputVideoFrame.release();
// Verify.
assertThat(fakeDecoderCallback.decodedFrames).hasSize(1);
VideoFrame videoFrame = fakeDecoderCallback.decodedFrames.get(0);
ArgumentCaptor<VideoFrame> videoFrameCaptor = ArgumentCaptor.forClass(VideoFrame.class);
verify(mockDecoderCallback)
.onDecodedFrame(videoFrameCaptor.capture(),
/* decodeTimeMs= */ any(Integer.class),
/* qp= */ any());
VideoFrame videoFrame = videoFrameCaptor.getValue();
assertThat(videoFrame).isNotNull();
assertThat(videoFrame.getBuffer()).isEqualTo(outputTextureBuffer);
fakeDecoderCallback.release();
verify(releaseCallback).run();
}