diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml index 766e8972d9..d277bb3cdf 100644 --- a/demos/cast/src/main/res/values/strings.xml +++ b/demos/cast/src/main/res/values/strings.xml @@ -20,6 +20,4 @@ Cast - DRM scheme not supported by this device. - diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle index 7d252332c9..7becb44d1c 100644 --- a/extensions/cast/build.gradle +++ b/extensions/cast/build.gradle @@ -26,6 +26,13 @@ android { } dependencies { + // This dependency is necessary to force the supportLibraryVersion of + // com.android.support:support-v4 to be used. Else an older version (25.2.0) + // is included via: + // com.google.android.gms:play-services-cast-framework:11.4.2 + // |-- com.google.android.gms:play-services-basement:11.4.2 + // |-- com.android.support:support-v4:25.2.0 + compile 'com.android.support:support-v4:' + supportLibraryVersion compile 'com.android.support:appcompat-v7:' + supportLibraryVersion compile 'com.android.support:mediarouter-v7:' + supportLibraryVersion compile 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle index 90c0a911d9..5038aaf5b9 100644 --- a/extensions/ima/build.gradle +++ b/extensions/ima/build.gradle @@ -28,10 +28,11 @@ android { dependencies { compile project(modulePrefix + 'library-core') // This dependency is necessary to force the supportLibraryVersion of - // com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via: - // com.google.android.gms:play-services-ads:11.2.0 - // |-- com.google.android.gms:play-services-ads-lite:11.2.0 - // |-- com.google.android.gms:play-services-basement:11.2.0 + // com.android.support:support-v4 to be used. Else an older version (25.2.0) + // is included via: + // com.google.android.gms:play-services-ads:11.4.2 + // |-- com.google.android.gms:play-services-ads-lite:11.4.2 + // |-- com.google.android.gms:play-services-basement:11.4.2 // |-- com.android.support:support-v4:25.2.0 compile 'com.android.support:support-v4:' + supportLibraryVersion compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4' diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java index d81df90b81..3cb5db30ec 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java @@ -265,7 +265,7 @@ public abstract class SegmentDownloader implements Downloader { /** * Returns a list of all segments. * - * @see #getSegments(DataSource, M, Object[], boolean)}. + * @see #getSegments(DataSource, M, Object[], boolean) */ protected abstract List getAllSegments(DataSource dataSource, M manifest, boolean allowPartialIndex) throws InterruptedException, IOException; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java index 579a70c221..3b402ec59d 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -32,6 +32,7 @@ import android.view.Display; import android.view.WindowManager; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.upstream.DataSource; import java.io.ByteArrayOutputStream; @@ -828,6 +829,8 @@ public final class Util { case C.ENCODING_PCM_32BIT: case C.ENCODING_PCM_FLOAT: return channelCount * 4; + case C.ENCODING_INVALID: + case Format.NO_VALUE: default: throw new IllegalArgumentException(); } diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java index eb9a849563..1868a54d17 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java @@ -360,7 +360,7 @@ public class DashManifestParser extends DefaultHandler String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri"); if (schemeIdUri != null) { - switch (schemeIdUri.toLowerCase()) { + switch (Util.toLowerInvariant(schemeIdUri)) { case "urn:mpeg:dash:mp4protection:2011": schemeType = xpp.getAttributeValue(null, "value"); String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID"); diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java index 558adca7bd..4c07e4874e 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java @@ -39,8 +39,8 @@ import java.util.List; /** * Helper class to download DASH streams. * - *

Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link - * #getDownloadedBytes()}, this class isn't thread safe. + *

Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and + * {@link #getDownloadedBytes()}, this class isn't thread safe. * *

Example usage: * diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java index 21cacdc6f3..5e9ae9a164 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java @@ -33,8 +33,8 @@ import java.util.List; /** * Helper class to download SmoothStreaming streams. * - *

Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link - * #getDownloadedBytes()}, this class isn't thread safe. + *

Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and + * {@link #getDownloadedBytes()}, this class isn't thread safe. * *

Example usage: * diff --git a/library/ui/src/main/res/values-v11/styles.xml b/library/ui/src/main/res/values-v11/styles.xml deleted file mode 100644 index 6f77440287..0000000000 --- a/library/ui/src/main/res/values-v11/styles.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml index 4ef8971ccd..b57cbeaddf 100644 --- a/library/ui/src/main/res/values/styles.xml +++ b/library/ui/src/main/res/values/styles.xml @@ -16,7 +16,7 @@ diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java index f0e69dfc7e..4a5beb0501 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java @@ -180,7 +180,13 @@ public class FakeSimpleExoPlayer extends SimpleExoPlayer { @SuppressWarnings("ThreadJoinLoop") public void release() { stop(); - playbackThread.quitSafely(); + playbackHandler.post(new Runnable() { + @Override + public void run () { + playbackHandler.removeCallbacksAndMessages(null); + playbackThread.quit(); + } + }); while (playbackThread.isAlive()) { try { playbackThread.join();