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

Merge pull request #6036 from angelrc96:dev-v2

Browse Source 
PiperOrigin-RevId: 253228214
This commit is contained in:
Toni 2019-06-14 16:50:10 +01:00 committed by Oliver Woodman
parent 692f4152d5
commit 7f435b4787
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -39,6 +39,8 @@
([#5971](https://github.com/google/ExoPlayer/issues/5971)). ([#5971](https://github.com/google/ExoPlayer/issues/5971)).
* Fix bug in `CastPlayer.getCurrentWindowIndex()` * Fix bug in `CastPlayer.getCurrentWindowIndex()`
([#5955](https://github.com/google/ExoPlayer/issues/5955)). ([#5955](https://github.com/google/ExoPlayer/issues/5955)).
* Add support for auto-detecting UDP streams in `DefaultDataSource`
([#6036](https://github.com/google/ExoPlayer/pull/6036)).
### 2.10.1 ### ### 2.10.1 ###

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

@ -42,6 +42,7 @@ import java.util.Map;
* <li>rtmp: For fetching data over RTMP. Only supported if the project using ExoPlayer has an * <li>rtmp: For fetching data over RTMP. Only supported if the project using ExoPlayer has an
* explicit dependency on ExoPlayer's RTMP extension. * explicit dependency on ExoPlayer's RTMP extension.
* <li>data: For parsing data inlined in the URI as defined in RFC 2397. * <li>data: For parsing data inlined in the URI as defined in RFC 2397.
* <li>udp: For fetching data over UDP (e.g. udp://something.com/media).
* <li>http(s): For fetching data over HTTP and HTTPS (e.g. https://www.something.com/media.mp4), * <li>http(s): For fetching data over HTTP and HTTPS (e.g. https://www.something.com/media.mp4),
* if constructed using {@link #DefaultDataSource(Context, TransferListener, String, * if constructed using {@link #DefaultDataSource(Context, TransferListener, String,
* boolean)}, or any other schemes supported by a base data source if constructed using {@link * boolean)}, or any other schemes supported by a base data source if constructed using {@link
@ -243,7 +244,7 @@ public final class DefaultDataSource implements DataSource {
dataSource = getContentDataSource(); dataSource = getContentDataSource();
} else if (SCHEME_RTMP.equals(scheme)) { } else if (SCHEME_RTMP.equals(scheme)) {
dataSource = getRtmpDataSource(); dataSource = getRtmpDataSource();
} else if(SCHEME_UDP.equals(scheme)){ } else if (SCHEME_UDP.equals(scheme)) {
dataSource = getUdpDataSource(); dataSource = getUdpDataSource();
} else if (DataSchemeDataSource.SCHEME_DATA.equals(scheme)) { } else if (DataSchemeDataSource.SCHEME_DATA.equals(scheme)) {
dataSource = getDataSchemeDataSource(); dataSource = getDataSchemeDataSource();
@ -282,7 +283,7 @@ public final class DefaultDataSource implements DataSource {
} }
} }
private DataSource getUdpDataSource(){ private DataSource getUdpDataSource() {
if (udpDataSource == null) { if (udpDataSource == null) {
udpDataSource = new UdpDataSource(); udpDataSource = new UdpDataSource();
addListenersToDataSource(udpDataSource); addListenersToDataSource(udpDataSource);