| Index: webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
|
| diff --git a/webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java b/webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
|
| index 26b1cf2491bcf82fe471bf5f53b571dda8fe948f..fe2c7dc4680d2de2833898b373459f462586dae3 100644
|
| --- a/webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
|
| +++ b/webrtc/api/java/src/org/webrtc/MediaCodecVideoDecoder.java
|
| @@ -469,7 +469,7 @@ public class MediaCodecVideoDecoder {
|
|
|
| public TextureListener(SurfaceTextureHelper surfaceTextureHelper) {
|
| this.surfaceTextureHelper = surfaceTextureHelper;
|
| - surfaceTextureHelper.setListener(this);
|
| + surfaceTextureHelper.startListening(this);
|
| }
|
|
|
| public void addBufferToRender(DecodedOutputBuffer buffer) {
|
| @@ -525,10 +525,10 @@ public class MediaCodecVideoDecoder {
|
| }
|
|
|
| public void release() {
|
| - // SurfaceTextureHelper.disconnect() will block until any onTextureFrameAvailable() in
|
| - // progress is done. Therefore, the call to disconnect() must be outside any synchronized
|
| + // SurfaceTextureHelper.dispose() will block until any onTextureFrameAvailable() in
|
| + // progress is done. Therefore, the call to dispose() must be outside any synchronized
|
| // statement that is also used in the onTextureFrameAvailable() above to avoid deadlocks.
|
| - surfaceTextureHelper.disconnect();
|
| + surfaceTextureHelper.dispose();
|
| synchronized (newFrameLock) {
|
| if (renderedBuffer != null) {
|
| surfaceTextureHelper.returnTextureFrame();
|
|
|