sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor tweaks to merged pull requests.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=112161860
This commit is contained in:
olly 2016-01-14 09:57:46 -08:00 committed by Oliver Woodman
parent be2aedbd53
commit 949317a41a
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java
View file

@ -22,6 +22,13 @@ import com.google.android.exoplayer.upstream.TransferListener;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
import com.google.android.exoplayer.util.Predicate; import com.google.android.exoplayer.util.Predicate;
import okhttp3.CacheControl;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -31,13 +38,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import okhttp3.CacheControl;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
/** /**
* An {@link HttpDataSource} that delegates to Square's {@link OkHttpClient}. * An {@link HttpDataSource} that delegates to Square's {@link OkHttpClient}.
*/ */

6
library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
View file

@ -394,11 +394,11 @@ public final class TsExtractor implements Extractor {
streamType = TS_STREAM_TYPE_H265; streamType = TS_STREAM_TYPE_H265;
} }
break; break;
} else if (descriptorTag == 0x6a) { } else if (descriptorTag == 0x6A) {
streamType = TS_STREAM_TYPE_AC3; streamType = TS_STREAM_TYPE_AC3;
} else if (descriptorTag == 0x7a) { } else if (descriptorTag == 0x7A) {
streamType = TS_STREAM_TYPE_E_AC3; streamType = TS_STREAM_TYPE_E_AC3;
} else if (descriptorTag == 0x7b) { } else if (descriptorTag == 0x7B) {
// TODO: TS_STREAM_TYPE_DTS; // TODO: TS_STREAM_TYPE_DTS;
} }