loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring branch up to speed with dev

Browse Source
This commit is contained in:
Oliver Woodman 2015-05-11 21:18:23 +01:00
parent dd41d14ac3
commit caf41fb1f1
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/opus/build.gradle
View File

@ -14,12 +14,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 22
buildToolsVersion "21.1.2" buildToolsVersion "22.0.1"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 21 targetSdkVersion 22
} }
buildTypes { buildTypes {

2
extensions/opus/src/main/AndroidManifest.xml
View File

@ -17,6 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.ext.opus"> package="com.google.android.exoplayer.ext.opus">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="22"/>
</manifest> </manifest>

4
extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
View File

@ -123,9 +123,9 @@ public class LibopusAudioTrackRenderer extends TrackRenderer {
} }
@Override @Override
protected int doPrepare() throws ExoPlaybackException { protected int doPrepare(long positionUs) throws ExoPlaybackException {
try { try {
boolean sourcePrepared = source.prepare(); boolean sourcePrepared = source.prepare(positionUs);
if (!sourcePrepared) { if (!sourcePrepared) {
return TrackRenderer.STATE_UNPREPARED; return TrackRenderer.STATE_UNPREPARED;
} }

2
extensions/opus/src/main/project.properties
View File

@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-21 target=android-22
android.library=true android.library=true
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main

6
extensions/vp9/build.gradle
View File

@ -14,12 +14,12 @@
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
android { android {
compileSdkVersion 21 compileSdkVersion 22
buildToolsVersion "21.1.2" buildToolsVersion "22.0.1"
defaultConfig { defaultConfig {
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 21 targetSdkVersion 22
} }
buildTypes { buildTypes {

2
extensions/vp9/src/main/AndroidManifest.xml
View File

@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.exoplayer.ext.vp9"> 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"/> <uses-feature android:glEsVersion="0x00020000"/>
</manifest> </manifest>

4
extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java
View File

@ -152,9 +152,9 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer {
} }
@Override @Override
protected int doPrepare() throws ExoPlaybackException { protected int doPrepare(long positionUs) throws ExoPlaybackException {
try { try {
boolean sourcePrepared = source.prepare(); boolean sourcePrepared = source.prepare(positionUs);
if (!sourcePrepared) { if (!sourcePrepared) {
return TrackRenderer.STATE_UNPREPARED; return TrackRenderer.STATE_UNPREPARED;
} }

2
extensions/vp9/src/main/project.properties
View File

@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-21 target=android-22
android.library=true android.library=true
android.library.reference.1=../../../../library/src/main android.library.reference.1=../../../../library/src/main