Merge pull request #113 from google/dev

dev -> dev-l

CONTRIBUTING.md

-# How to contribute #
+# How to Contribute #
 
 
 We'd love to hear your feedback. Please open new issues describing any bugs,
 We'd love to hear your feedback. Please open new issues describing any bugs,
 feature requests or suggestions that you have.
 feature requests or suggestions that you have.

README.md

@@ -4,7 +4,7 @@
 
 
 ExoPlayer is an application level media player for Android. It provides an
 ExoPlayer is an application level media player for Android. It provides an
 alternative to Android’s MediaPlayer API for playing audio and video both
 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
 supported by Android’s MediaPlayer API (as of KitKat), including DASH and
 SmoothStreaming adaptive playbacks, persistent caching and custom renderers.
 SmoothStreaming adaptive playbacks, persistent caching and custom renderers.
 Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and
 Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and

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),
         DemoUtil.TYPE_OTHER, false, true),
     new Sample("Dizzy (https->http redirect)", "uid:misc:dizzy2", "https://goo.gl/MtUDEj",
     new Sample("Dizzy (https->http redirect)", "uid:misc:dizzy2", "https://goo.gl/MtUDEj",
         DemoUtil.TYPE_OTHER, false, true),
         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() {}
   private Samples() {}

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",
     long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset",
         parent != null ? parent.presentationTimeOffset : 0);
         parent != null ? parent.presentationTimeOffset : 0);
     long duration = parseLong(xpp, "duration", parent != null ? parent.duration : -1);
     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;
     RangedUri initialization = null;
     List<SegmentTimelineElement> timeline = null;
     List<SegmentTimelineElement> timeline = null;
@@ -406,7 +406,7 @@ public class MediaPresentationDescriptionParser extends DefaultHandler
     long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset",
     long presentationTimeOffset = parseLong(xpp, "presentationTimeOffset",
         parent != null ? parent.presentationTimeOffset : 0);
         parent != null ? parent.presentationTimeOffset : 0);
     long duration = parseLong(xpp, "duration", parent != null ? parent.duration : -1);
     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",
     UrlTemplate mediaTemplate = parseUrlTemplate(xpp, "media",
         parent != null ? parent.mediaTemplate : null);
         parent != null ? parent.mediaTemplate : null);
     UrlTemplate initializationTemplate = parseUrlTemplate(xpp, "initialization",
     UrlTemplate initializationTemplate = parseUrlTemplate(xpp, "initialization",

settings.gradle

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 include ':library'
 include ':library'
-include ':demo'
+include ':demo'
\ No newline at end of file