From b8415dba599ef681f371f25b2fc9df21ed2bc9e0 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Mon, 27 Oct 2014 10:51:45 +0000 Subject: [PATCH] Parse all UUID boxes, not just the first one. --- .../exoplayer/parser/mp4/FragmentedMp4Extractor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java index 0fc1e1b200..a1994f7c67 100644 --- a/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer/parser/mp4/FragmentedMp4Extractor.java @@ -751,9 +751,12 @@ public final class FragmentedMp4Extractor implements Extractor { parseSenc(senc.data, out); } - LeafAtom uuid = traf.getLeafAtomOfType(Atom.TYPE_uuid); - if (uuid != null) { - parseUuid(uuid.data, out, extendedTypeScratch); + int childrenSize = traf.children.size(); + for (int i = 0; i < childrenSize; i++) { + Atom atom = traf.children.get(i); + if (atom.type == Atom.TYPE_uuid) { + parseUuid(((LeafAtom) atom).data, out, extendedTypeScratch); + } } }