loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor upstream cleanup

Browse Source 
PiperOrigin-RevId: 272614610
This commit is contained in:
olly 2019-10-03 09:55:27 +01:00 committed by Oliver Woodman
parent 4f640bc62e
commit fbb4715646
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java vendored
View File

@ -53,7 +53,6 @@ public final class CacheDataSink implements DataSink {
private long dataSpecFragmentSize; private long dataSpecFragmentSize;
private File file; private File file;
private OutputStream outputStream; private OutputStream outputStream;
private FileOutputStream underlyingFileOutputStream;
private long outputStreamBytesWritten; private long outputStreamBytesWritten;
private long dataSpecBytesWritten; private long dataSpecBytesWritten;
private ReusableBufferedOutputStream bufferedOutputStream; private ReusableBufferedOutputStream bufferedOutputStream;
@ -171,7 +170,7 @@ public final class CacheDataSink implements DataSink {
file = file =
cache.startFile( cache.startFile(
dataSpec.key, dataSpec.absoluteStreamPosition + dataSpecBytesWritten, length); dataSpec.key, dataSpec.absoluteStreamPosition + dataSpecBytesWritten, length);
underlyingFileOutputStream = new FileOutputStream(file); FileOutputStream underlyingFileOutputStream = new FileOutputStream(file);
if (bufferSize > 0) { if (bufferSize > 0) {
if (bufferedOutputStream == null) { if (bufferedOutputStream == null) {
bufferedOutputStream = new ReusableBufferedOutputStream(underlyingFileOutputStream, bufferedOutputStream = new ReusableBufferedOutputStream(underlyingFileOutputStream,

5
library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
View File

@ -52,10 +52,10 @@ public final class AesCipherDataSink implements DataSink {
* *
* @param secretKey The key data. * @param secretKey The key data.
* @param wrappedDataSink The wrapped {@link DataSink}. * @param wrappedDataSink The wrapped {@link DataSink}.
* @param scratch Scratch space. Data is decrypted into this array before being written to the * @param scratch Scratch space. Data is encrypted into this array before being written to the
* wrapped {@link DataSink}. It should be of appropriate size for the expected writes. If a * wrapped {@link DataSink}. It should be of appropriate size for the expected writes. If a
* write is larger than the size of this array the write will still succeed, but multiple * write is larger than the size of this array the write will still succeed, but multiple
* cipher calls will be required to complete the operation. If {@code null} then decryption * cipher calls will be required to complete the operation. If {@code null} then encryption
* will overwrite the input {@code data}. * will overwrite the input {@code data}.
*/ */
public AesCipherDataSink(byte[] secretKey, DataSink wrappedDataSink, @Nullable byte[] scratch) { public AesCipherDataSink(byte[] secretKey, DataSink wrappedDataSink, @Nullable byte[] scratch) {
@ -96,5 +96,4 @@ public final class AesCipherDataSink implements DataSink {
cipher = null; cipher = null;
wrappedDataSink.close(); wrappedDataSink.close();
} }
} }