Skip to content

Commit

Permalink
Merge pull request #6036 from angelrc96:dev-v2
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 253228214
  • Loading branch information
tonihei committed Jun 14, 2019
2 parents 30ac71d + 28ee05f commit da1f3f0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
* <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
Expand Down Expand Up @@ -164,7 +165,7 @@ public long open(DataSpec dataSpec) throws IOException {
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();
Expand Down Expand Up @@ -204,7 +205,7 @@ public void close() throws IOException {
}
}

private DataSource getUdpDataSource(){
private DataSource getUdpDataSource() {
if (udpDataSource == null) {
udpDataSource = new UdpDataSource();
addListenersToDataSource(udpDataSource);
Expand Down

0 comments on commit da1f3f0

Please sign in to comment.