commit | 208b30936f1d7392f666c0ea19966bdc684b6951 | [log] [tgz] |
---|---|---|
author | Sami Kalliomäki <sakal@webrtc.org> | Mon Oct 02 14:02:51 2017 |
committer | Commit Bot <commit-bot@chromium.org> | Mon Oct 02 16:46:49 2017 |
tree | aa55b72bd1587c7f110208ff1f0a723b150f1b84 | |
parent | a31fd0d69aea4797646ec0ca1eafed8c996ad682 [diff] |
Fix a bug in HardwareVideoEncoderTest. Previously, EGL context was always supplied regardless of useEglContext parameter. Bug: None Change-Id: Iaae93f4f52175674862a101837e0f2ae6575d91b Reviewed-on: https://webrtc-review.googlesource.com/5562 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20088}
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java index 120ed3f..629c831 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
@@ -265,7 +265,7 @@ private VideoEncoder createEncoder() { VideoEncoderFactory factory = - createEncoderFactory(useTextures ? eglBase.getEglBaseContext() : null); + createEncoderFactory(useEglContext ? eglBase.getEglBaseContext() : null); VideoCodecInfo[] supportedCodecs = factory.getSupportedCodecs(); return factory.createEncoder(supportedCodecs[0]); }