From 1b8b95344cb2457d26524b5b6a24db56a8f22bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oscar=20Rydh=C3=A9?= Date: Wed, 29 Apr 2015 13:43:54 +0200 Subject: [PATCH] Make encrypted aac files work Encrypted aac tracks was not detected as aac and couldn't be played. Fixed that. --- .../com/sonymobile/android/media/internal/ISOBMFFParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/sonymobile/android/media/internal/ISOBMFFParser.java b/library/src/main/java/com/sonymobile/android/media/internal/ISOBMFFParser.java index bdce528..5718fc0 100644 --- a/library/src/main/java/com/sonymobile/android/media/internal/ISOBMFFParser.java +++ b/library/src/main/java/com/sonymobile/android/media/internal/ISOBMFFParser.java @@ -2419,7 +2419,7 @@ private boolean parseESDS(byte[] esds) { return false; } - if (boxIsUnder(BOX_ID_MP4A)) { + if (boxIsUnder(BOX_ID_MP4A) || boxIsUnder(BOX_ID_ENCA)) { if (esds[offset] == 0x6B) { mCurrentMediaFormat.setString(MediaFormat.KEY_MIME, MimeType.MPEG_AUDIO); mCurrentTrack.getMetaData().addValue(KEY_MIME_TYPE, MimeType.MPEG_AUDIO);