From da26b03d9cf4e63fed9bf3f6d0115159c6b16fb0 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 3 Nov 2014 12:01:25 +0000 Subject: [PATCH 1/3] Minor setup tweaks. --- CONTRIBUTING.md | 2 +- README.md | 2 +- settings.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09cc6bdf41..12b5bcf219 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# How to contribute # +# How to Contribute # We'd love to hear your feedback. Please open new issues describing any bugs, feature requests or suggestions that you have. diff --git a/README.md b/README.md index 6faf3a264b..3a0e309a7f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ExoPlayer is an application level media player for Android. It provides an alternative to Android’s MediaPlayer API for playing audio and video both -locally and over the internet. ExoPlayer supports features not currently +locally and over the Internet. ExoPlayer supports features not currently supported by Android’s MediaPlayer API (as of KitKat), including DASH and SmoothStreaming adaptive playbacks, persistent caching and custom renderers. Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and diff --git a/settings.gradle b/settings.gradle index 6a19aced48..63dd803377 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,4 @@ // See the License for the specific language governing permissions and // limitations under the License. include ':library' -include ':demo' \ No newline at end of file +include ':demo' From 19eb7795fe27d78193808a0cccdfa6bdc0b540df Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 3 Nov 2014 12:01:53 +0000 Subject: [PATCH 2/3] Fix default startNumber. Issue: #108 --- .../dash/mpd/MediaPresentationDescriptionParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java b/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java index de5fc9bdb6..bf1ba532b7 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java @@ -362,7 +362,7 @@ public class MediaPresentationDescriptionParser extends DefaultHandler long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset", parent != null ? parent.presentationTimeOffset : 0); long duration = parseLong(xpp, "duration", parent != null ? parent.duration : -1); - int startNumber = parseInt(xpp, "startNumber", parent != null ? parent.startNumber : 0); + int startNumber = parseInt(xpp, "startNumber", parent != null ? parent.startNumber : 1); RangedUri initialization = null; List timeline = null; @@ -406,7 +406,7 @@ public class MediaPresentationDescriptionParser extends DefaultHandler long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset", parent != null ? parent.presentationTimeOffset : 0); long duration = parseLong(xpp, "duration", parent != null ? parent.duration : -1); - int startNumber = parseInt(xpp, "startNumber", parent != null ? parent.startNumber : 0); + int startNumber = parseInt(xpp, "startNumber", parent != null ? parent.startNumber : 1); UrlTemplate mediaTemplate = parseUrlTemplate(xpp, "media", parent != null ? parent.mediaTemplate : null); UrlTemplate initializationTemplate = parseUrlTemplate(xpp, "initialization", From deb7f2badd8719ea9cf55038e325d1dc75c482b9 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 3 Nov 2014 12:06:35 +0000 Subject: [PATCH 3/3] Add AAC test stream. --- .../main/java/com/google/android/exoplayer/demo/Samples.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java index 93d08af4cc..27d71a7d55 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java @@ -136,6 +136,9 @@ package com.google.android.exoplayer.demo; DemoUtil.TYPE_OTHER, false, true), new Sample("Dizzy (https->http redirect)", "uid:misc:dizzy2", "https://goo.gl/MtUDEj", DemoUtil.TYPE_OTHER, false, true), + new Sample("Apple AAC 10s", "uid:misc:appleaacseg", "https://devimages.apple.com.edgekey.net/" + + "streaming/examples/bipbop_4x3/gear0/fileSequence0.aac", + DemoUtil.TYPE_OTHER, false, true), }; private Samples() {}