From caf41fb1f1dea8f5697c05b8b712f6b6e7460972 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 11 May 2015 21:18:23 +0100
Subject: [PATCH] Bring branch up to speed with dev

---
 extensions/opus/build.gradle                                | 6 +++---
 extensions/opus/src/main/AndroidManifest.xml                | 2 +-
 .../exoplayer/ext/opus/LibopusAudioTrackRenderer.java       | 4 ++--
 extensions/opus/src/main/project.properties                 | 2 +-
 extensions/vp9/build.gradle                                 | 6 +++---
 extensions/vp9/src/main/AndroidManifest.xml                 | 2 +-
 .../android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java | 4 ++--
 extensions/vp9/src/main/project.properties                  | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 84e6483e85..443d0d6601 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 
     buildTypes {
diff --git a/extensions/opus/src/main/AndroidManifest.xml b/extensions/opus/src/main/AndroidManifest.xml
index 664abbc486..22c75aa76b 100644
--- a/extensions/opus/src/main/AndroidManifest.xml
+++ b/extensions/opus/src/main/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.ext.opus">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
 
 </manifest>
diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
index 93148870fa..92a9a25a7e 100644
--- a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
+++ b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
@@ -123,9 +123,9 @@ public class LibopusAudioTrackRenderer extends TrackRenderer {
   }
 
   @Override
-  protected int doPrepare() throws ExoPlaybackException {
+  protected int doPrepare(long positionUs) throws ExoPlaybackException {
     try {
-      boolean sourcePrepared = source.prepare();
+      boolean sourcePrepared = source.prepare(positionUs);
       if (!sourcePrepared) {
         return TrackRenderer.STATE_UNPREPARED;
       }
diff --git a/extensions/opus/src/main/project.properties b/extensions/opus/src/main/project.properties
index 905dac6228..2ed62fbfcf 100644
--- a/extensions/opus/src/main/project.properties
+++ b/extensions/opus/src/main/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-22
 android.library=true
 android.library.reference.1=../../../../library/src/main
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index 84e6483e85..443d0d6601 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 
     buildTypes {
diff --git a/extensions/vp9/src/main/AndroidManifest.xml b/extensions/vp9/src/main/AndroidManifest.xml
index 0f14a8045e..3e21f70510 100644
--- a/extensions/vp9/src/main/AndroidManifest.xml
+++ b/extensions/vp9/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.ext.vp9">
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
     <uses-feature android:glEsVersion="0x00020000"/>
 
 </manifest>
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java
index 32414a2d14..0692e7ed47 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java
@@ -152,9 +152,9 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer {
   }
 
   @Override
-  protected int doPrepare() throws ExoPlaybackException {
+  protected int doPrepare(long positionUs) throws ExoPlaybackException {
     try {
-      boolean sourcePrepared = source.prepare();
+      boolean sourcePrepared = source.prepare(positionUs);
       if (!sourcePrepared) {
         return TrackRenderer.STATE_UNPREPARED;
       }
diff --git a/extensions/vp9/src/main/project.properties b/extensions/vp9/src/main/project.properties
index 905dac6228..2ed62fbfcf 100644
--- a/extensions/vp9/src/main/project.properties
+++ b/extensions/vp9/src/main/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-21
+target=android-22
 android.library=true
 android.library.reference.1=../../../../library/src/main