Make encrypted aac files work

Oscar Rydhé · Jimmy Dahlqvist · commit 1b8b95344cb2 · 2015-04-29T13:54:01.000+02:00
Encrypted aac tracks was not detected as aac and couldn't
be played. Fixed that.
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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2419,7 +2419,7 @@ private boolean parseESDS(byte[] esds) {`
`2419`	`2419`	`return false;`
`2420`	`2420`	`}`
`2421`	`2421`
`2422`		`- if (boxIsUnder(BOX_ID_MP4A)) {`
	`2422`	`+ if (boxIsUnder(BOX_ID_MP4A) \|\| boxIsUnder(BOX_ID_ENCA)) {`
`2423`	`2423`	`if (esds[offset] == 0x6B) {`
`2424`	`2424`	`mCurrentMediaFormat.setString(MediaFormat.KEY_MIME, MimeType.MPEG_AUDIO);`
`2425`	`2425`	`mCurrentTrack.getMetaData().addValue(KEY_MIME_TYPE, MimeType.MPEG_AUDIO);`