From 2a06c2641c8a1c4bc146fdb227f6f10f2e6a97d7 Mon Sep 17 00:00:00 2001 From: Tanuj Mittal Date: Tue, 5 May 2015 16:30:09 +0530 Subject: [PATCH] Fix DataSourceInputStream.read() for EOF cases --- .../android/exoplayer/upstream/DataSourceInputStream.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java b/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java index e81e1990de..d7203f759c 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java +++ b/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java @@ -58,8 +58,11 @@ public class DataSourceInputStream extends InputStream { @Override public int read() throws IOException { - read(singleByteArray); - return singleByteArray[0] & 0xFF; + int length = read(singleByteArray); + if(length != -1) { + return singleByteArray[0] & 0xFF; + } + return length; } @Override