From d2ba5cfd97499429821bd0c863a642bf531d9fe8 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 5 May 2015 20:31:34 +0100 Subject: [PATCH] Add TYPE_M4A, which is equivalent to TYPE_MP4. --- .../main/java/com/google/android/exoplayer/demo/DemoUtil.java | 1 + .../java/com/google/android/exoplayer/demo/PlayerActivity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java index 880e45df47..ef43fe969b 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java @@ -50,6 +50,7 @@ public class DemoUtil { public static final int TYPE_TS = 6; public static final int TYPE_AAC = 7; public static final int TYPE_OTHER = 8; + public static final int TYPE_M4A = 9; private static final CookieManager defaultCookieManager; diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java index 6ca5273865..520470f881 100644 --- a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java +++ b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java @@ -231,6 +231,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, new WidevineTestMediaDrmCallback(contentId), debugTextView, audioCapabilities); case DemoUtil.TYPE_HLS: return new HlsRendererBuilder(this, userAgent, contentUri.toString(), debugTextView); + case DemoUtil.TYPE_M4A: // There are no file format differences between M4A and MP4. case DemoUtil.TYPE_MP4: return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView, new Mp4Extractor());