Commit a77bc8d4 by andrewlewis Committed by Oliver Woodman

Close DataSources quietly.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143672900
parent 01d22f81
......@@ -105,7 +105,7 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
try {
return Util.toByteArray(inputStream);
} finally {
inputStream.close();
Util.closeQuietly(inputStream);
}
}
......
......@@ -40,6 +40,7 @@ import com.google.android.exoplayer2.upstream.Loader.Loadable;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.ConditionVariable;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
import java.io.EOFException;
import java.io.IOException;
......@@ -644,7 +645,7 @@ import java.io.IOException;
} else if (input != null) {
positionHolder.position = input.getPosition();
}
dataSource.close();
Util.closeQuietly(dataSource);
}
}
}
......
......@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.Loader;
import com.google.android.exoplayer2.upstream.Loader.Loadable;
import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -276,7 +277,7 @@ import java.util.Arrays;
result = dataSource.read(sampleData, sampleSize, sampleData.length - sampleSize);
}
} finally {
dataSource.close();
Util.closeQuietly(dataSource);
}
}
......
......@@ -128,7 +128,7 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackMe
bytesLoaded = (int) (input.getPosition() - dataSpec.absoluteStreamPosition);
}
} finally {
dataSource.close();
Util.closeQuietly(dataSource);
}
loadCompleted = true;
}
......
......@@ -19,6 +19,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.util.Arrays;
......@@ -96,7 +97,7 @@ public abstract class DataChunk extends Chunk {
consume(data, limit);
}
} finally {
dataSource.close();
Util.closeQuietly(dataSource);
}
}
......
......@@ -150,7 +150,7 @@ public final class InitializationChunk extends Chunk implements SingleTrackMetad
bytesLoaded = (int) (input.getPosition() - dataSpec.absoluteStreamPosition);
}
} finally {
dataSource.close();
Util.closeQuietly(dataSource);
}
}
......
......@@ -98,7 +98,7 @@ public final class SingleSampleMediaChunk extends BaseMediaChunk {
int sampleSize = bytesLoaded;
trackOutput.sampleMetadata(startTimeUs, C.BUFFER_FLAG_KEY_FRAME, sampleSize, 0, null);
} finally {
dataSource.close();
Util.closeQuietly(dataSource);
}
loadCompleted = true;
}
......
......@@ -119,7 +119,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
}
}
} finally {
reader.close();
Util.closeQuietly(reader);
}
throw new ParserException("Failed to parse the playlist, could not identify any tags.");
}
......
......@@ -19,6 +19,7 @@ import android.net.Uri;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.upstream.Loader.Loadable;
import com.google.android.exoplayer2.util.Util;
import java.io.IOException;
import java.io.InputStream;
......@@ -114,7 +115,7 @@ public final class ParsingLoadable<T> implements Loadable {
result = parser.parse(dataSource.getUri(), inputStream);
} finally {
bytesLoaded = inputStream.bytesRead();
inputStream.close();
Util.closeQuietly(inputStream);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment