Commit d2ba5cfd by Oliver Woodman

Add TYPE_M4A, which is equivalent to TYPE_MP4.

parent 9dcb17f2
...@@ -50,6 +50,7 @@ public class DemoUtil { ...@@ -50,6 +50,7 @@ public class DemoUtil {
public static final int TYPE_TS = 6; public static final int TYPE_TS = 6;
public static final int TYPE_AAC = 7; public static final int TYPE_AAC = 7;
public static final int TYPE_OTHER = 8; public static final int TYPE_OTHER = 8;
public static final int TYPE_M4A = 9;
private static final CookieManager defaultCookieManager; private static final CookieManager defaultCookieManager;
......
...@@ -231,6 +231,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -231,6 +231,7 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
new WidevineTestMediaDrmCallback(contentId), debugTextView, audioCapabilities); new WidevineTestMediaDrmCallback(contentId), debugTextView, audioCapabilities);
case DemoUtil.TYPE_HLS: case DemoUtil.TYPE_HLS:
return new HlsRendererBuilder(this, userAgent, contentUri.toString(), debugTextView); 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: case DemoUtil.TYPE_MP4:
return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView, return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView,
new Mp4Extractor()); new Mp4Extractor());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment