loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-14 02:59:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add TYPE_M4A, which is equivalent to TYPE_MP4.

Browse Source
This commit is contained in:
Oliver Woodman 2015-05-05 20:31:34 +01:00
parent 9dcb17f21a
commit d2ba5cfd97
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
View File

@ -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;

1
demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
View File

@ -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());