Merge tag r1.5.13 from upstream https://github.com/google/ExoPlayer

brightcove · Jan 18, 2017 · 2380f66 · 2380f66
2 parents 81e1d82 + 965a155
commit 2380f66
Show file tree

Hide file tree

Showing 92 changed files with 2,953 additions and 1,030 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,23 @@
 # Release notes #
 
+### r1.5.13 ###
+
+* Improvements to the upstream cache package.
+* MP4: Support `.mp3` tracks
+  ([2066](https://github.com/google/ExoPlayer/issues/2066)).
+* SubRip: Don't fail playbacks if SubRip file contains negative timestamps
+  ([2145](https://github.com/google/ExoPlayer/issues/2145)).
+* MPEG-TS: Avoid failure when expected ID3 header not found
+  ([1966](https://github.com/google/ExoPlayer/issues/1966)).
+* Misc bugfixes.
+
+### r1.5.12 ###
+
+* Improvements to Cronet network stack extension.
+* Fix bug in demo app introduced in r1.5.11 that caused L3 Widevine
+  provisioning requests to fail.
+* Misc bugfixes.
+
 ### r1.5.11 ###
 
 * Cronet network stack extension.

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.demo"
-    android:versionCode="1511"
-    android:versionName="1.5.11"
+    android:versionCode="1513"
+    android:versionName="1.5.13"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java b/demo/src/main/java/com/google/android/exoplayer/demo/WidevineTestMediaDrmCallback.java
@@ -47,7 +47,7 @@ public WidevineTestMediaDrmCallback(String contentId, String provider) {
   @Override
   public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throws IOException {
     String url = request.getDefaultUrl() + "&signedRequest=" + new String(request.getData());
-    return Util.executePost(url, null, REQUEST_PROPERTIES);
+    return Util.executePost(url, null, null);
   }
 
   @Override

diff --git a/demo_ext/src/main/AndroidManifest.xml b/demo_ext/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.demo.ext"
-    android:versionCode="1511"
-    android:versionName="1.5.11"
+    android:versionCode="1513"
+    android:versionName="1.5.13"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
@@ -21,8 +21,9 @@ git clone https://github.com/google/ExoPlayer.git
 
 1. Find the latest Cronet release [here][] and navigate to its `Release/cronet`
    directory
-1. Download `cronet.jar`, `cronet_api.jar` and the `libs` directory
-1. Copy the two jar files into the `libs` directory of this extension
+1. Download `cronet_api.jar`, `cronet_impl_common_java.jar`,
+   `cronet_impl_native_java.jar` and the `libs` directory
+1. Copy the three jar files into the `libs` directory of this extension
 1. Copy the content of the downloaded `libs` directory into the `jniLibs`
    directory of this extension
 

diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
@@ -42,7 +42,8 @@ android {
 dependencies {
     compile project(':library')
     compile files('libs/cronet_api.jar')
-    compile files('libs/cronet.jar')
+    compile files('libs/cronet_impl_common_java.jar')
+    compile files('libs/cronet_impl_native_java.jar')
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
     androidTestCompile 'org.mockito:mockito-core:1.9.5'

diff --git a/extensions/cronet/libs/README.md b/extensions/cronet/libs/README.md
@@ -0,0 +1 @@
+Copy cronet.jar and cronet_api.jar here.