Commit da1f3f01 by Toni

Merge pull request #6036 from angelrc96:dev-v2

PiperOrigin-RevId: 253228214
parents 30ac71d4 28ee05f6
......@@ -19,6 +19,8 @@
* Add VR player demo.
* Wrap decoder exceptions in a new `DecoderException` class and report as
renderer error.
* Add support for auto-detecting UDP streams in `DefaultDataSource`
([#6036](https://github.com/google/ExoPlayer/pull/6036)).
### 2.10.2 ###
......
......@@ -42,6 +42,7 @@ import java.util.Map;
* <li>rtmp: For fetching data over RTMP. Only supported if the project using ExoPlayer has an
* explicit dependency on ExoPlayer's RTMP extension.
* <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),
* if constructed using {@link #DefaultDataSource(Context, String, boolean)}, or any other
* schemes supported by a base data source if constructed using {@link
......@@ -164,7 +165,7 @@ public final class DefaultDataSource implements DataSource {
dataSource = getContentDataSource();
} else if (SCHEME_RTMP.equals(scheme)) {
dataSource = getRtmpDataSource();
} else if(SCHEME_UDP.equals(scheme)){
} else if (SCHEME_UDP.equals(scheme)) {
dataSource = getUdpDataSource();
} else if (DataSchemeDataSource.SCHEME_DATA.equals(scheme)) {
dataSource = getDataSchemeDataSource();
......@@ -204,7 +205,7 @@ public final class DefaultDataSource implements DataSource {
}
}
private DataSource getUdpDataSource(){
private DataSource getUdpDataSource() {
if (udpDataSource == null) {
udpDataSource = new UdpDataSource();
addListenersToDataSource(udpDataSource);
......
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