Merge pull request #447 from google/dev

dev -> dev-webm-vp9-opus

README.md

@@ -5,29 +5,29 @@
 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
-supported by Android’s MediaPlayer API (as of KitKat), including DASH and
+supported by Android’s MediaPlayer API, including DASH and SmoothStreaming
-SmoothStreaming adaptive playbacks, persistent caching and custom renderers.
+adaptive playbacks. Unlike the MediaPlayer API, ExoPlayer is easy to
-Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and
+customize and extend, and can be updated through Play Store application
-can be updated through Play Store application updates.
+updates.
 
-## Blog ##
+## News ##
 
-Read news, hints and tips in the ExoPlayer [blog][].
+Read news, hints and tips on the [news][] page.
 
-[blog]: https://google.github.io/ExoPlayer/blog.html
+[news]: https://google.github.io/ExoPlayer/news.html
 
 ## Developer guide ##
 
-The ExoPlayer [developer guide][] provides a wealth of information to help
+The [developer guide][] provides a wealth of information to help you get
-you get started.
+started.
 
 [developer guide]: https://google.github.io/ExoPlayer/guide.html
 
 ## Reference documentation ##
 
-The Exoplayer [class reference][] documents the ExoPlayer library classes.
+The [class reference][] documents the ExoPlayer library classes.
 
-[class reference]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/package-summary.html
+[class reference]: https://google.github.io/ExoPlayer/doc/reference
 
 ## Project branches ##
 

build.gradle

@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.novoda:bintray-release:0.2.7'
     }
 }

library/build.gradle

@@ -54,6 +54,21 @@ android.libraryVariants.all { variant ->
     artifacts.add('archives', task);
 }
 
+android.libraryVariants.all { variant ->
+    task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
+        title = "ExoPlayer library"
+        description "Generates Javadoc for $variant.name."
+        source = variant.javaCompile.source
+        classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
+        options {
+            links "http://docs.oracle.com/javase/7/docs/api/"
+            linksOffline "https://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+        }
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
+    }
+}
+
 publish {
     repoName = 'exoplayer'
     userOrg = 'google'

library/src/main/java/com/google/android/exoplayer/ExoPlayer.java

@@ -52,7 +52,7 @@ import android.os.Looper;
  * <h3>Threading model</h3>
  *
  * <p>The figure below shows the {@link ExoPlayer} threading model.</p>
- * <p align="center"><img src="../../../../../doc_src/images/exoplayer_threading_model.png"
+ * <p align="center"><img src="../../../../../images/exoplayer_threading_model.png"
  *     alt="MediaPlayer state diagram"
  *     border="0"/></p>
  *
@@ -79,14 +79,14 @@ import android.os.Looper;
  * have been performed asynchronously by the playback thread. In contrast, the playback state
  * accessed by {@link #getPlaybackState()} is only ever changed as a result of operations
  * completing on the playback thread, as illustrated below.</p>
- * <p align="center"><img src="../../../../../doc_src/images/exoplayer_state.png"
+ * <p align="center"><img src="../../../../../images/exoplayer_state.png"
  *     alt="ExoPlayer state"
  *     border="0"/></p>
  *
  * <p>The possible playback state transitions are shown below. Transitions can be triggered either
  * by changes in the state of the {@link TrackRenderer}s being used, or as a result of
  * {@link #prepare(TrackRenderer[])}, {@link #stop()} or {@link #release()} being invoked.</p>
- * <p align="center"><img src="../../../../../doc_src/images/exoplayer_playbackstate.png"
+ * <p align="center"><img src="../../../../../images/exoplayer_playbackstate.png"
  *     alt="ExoPlayer playback state transitions"
  *     border="0"/></p>
  */

library/src/main/java/com/google/android/exoplayer/TrackRenderer.java

@@ -25,7 +25,7 @@ import com.google.android.exoplayer.util.Assertions;
  * will transition its renderers through various states as the overall playback state changes. The
  * valid state transitions are shown below, annotated with the methods that are invoked during each
  * transition.
- * <p align="center"><img src="../../../../../doc_src/images/trackrenderer_state.png"
+ * <p align="center"><img src="../../../../../images/trackrenderer_state.png"
  *     alt="TrackRenderer state transitions"
  *     border="0"/></p>
  */