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

Fix AndroidVideoDecoderTest for new Robolectric version.

Browse Source 
New Robolectric version doesn't allow Surface to be constructed with a
null SurfaceTexture.

Bug: webrtc:10323
Change-Id: Ib6991d40b12b81d16ecb04787945cc4045e99b40
Reviewed-on: https://webrtc-review.googlesource.com/c/123236
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26734}
This commit is contained in:
Sami Kalliomäki 2019-02-18 13:24:05 +01:00 committed by Commit Bot
parent e049eba27c
commit 3073c728ac
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,9 +20,11 @@ import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.graphics.Matrix;
import android.graphics.SurfaceTexture;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaFormat;
import android.os.Handler;
@ -176,6 +178,8 @@ public class AndroidVideoDecoderTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mockSurfaceTextureHelper.getSurfaceTexture())
.thenReturn(new SurfaceTexture(/*texName=*/0));
MediaFormat outputFormat = new MediaFormat();
// TODO(sakal): Add more details to output format as needed.
fakeMediaCodecWrapper = spy(new FakeMediaCodecWrapper(outputFormat));