loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-18 13:09:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preserve postBody in CacheDataSource when reading from upstream.

Browse Source 
Set appropriate Content-Type when posting clientAbrState proto in post body.

PiperOrigin-RevId: 251322860
This commit is contained in:
olly 2019-06-03 23:35:34 +01:00 committed by Oliver Woodman
parent 871a88a921
commit 9ca6f60c3a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,7 @@ public final class CacheDataSource implements DataSource {
@Nullable private Uri uri;
@Nullable private Uri actualUri;
@HttpMethod private int httpMethod;
@Nullable private byte[] httpBody;
private int flags;
@Nullable private String key;
private long readPosition;
@ -261,6 +262,7 @@ public final class CacheDataSource implements DataSource {
uri = dataSpec.uri;
actualUri = getRedirectedUriOrDefault(cache, key, /* defaultUri= */ uri);
httpMethod = dataSpec.httpMethod;
httpBody = dataSpec.httpBody;
flags = dataSpec.flags;
readPosition = dataSpec.position;
@ -347,6 +349,7 @@ public final class CacheDataSource implements DataSource {
uri = null;
actualUri = null;
httpMethod = DataSpec.HTTP_METHOD_GET;
httpBody = null;
notifyBytesRead();
try {
closeCurrentSource();
@ -393,7 +396,7 @@ public final class CacheDataSource implements DataSource {
nextDataSource = upstreamDataSource;
nextDataSpec =
new DataSpec(
uri, httpMethod, null, readPosition, readPosition, bytesRemaining, key, flags);
uri, httpMethod, httpBody, readPosition, readPosition, bytesRemaining, key, flags);
} else if (nextSpan.isCached) {
// Data is cached, read from cache.
Uri fileUri = Uri.fromFile(nextSpan.file);
@ -416,7 +419,7 @@ public final class CacheDataSource implements DataSource {
}
}
nextDataSpec =
new DataSpec(uri, httpMethod, null, readPosition, readPosition, length, key, flags);
new DataSpec(uri, httpMethod, httpBody, readPosition, readPosition, length, key, flags);
if (cacheWriteDataSource != null) {
nextDataSource = cacheWriteDataSource;
} else {