Fix bug for failing tests

Author: rohitjoins

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java

@@ -645,6 +645,9 @@ private boolean readAtomHeader(ExtractorInput input) throws IOException {
 
     if (shouldParseContainerAtom(atomType)) {
       long endPosition = input.getPosition() + atomSize - Mp4Box.HEADER_SIZE;
+      if (atomSize != atomHeaderBytesRead && atomType == Mp4Box.TYPE_meta) {
+        maybeSkipRemainingMetaAtomHeaderBytes(input);
+      }
       containerAtoms.push(new ContainerBox(atomType, endPosition));
       if (atomSize == atomHeaderBytesRead) {
         processAtomEnded(endPosition);
@@ -677,6 +680,14 @@ private boolean readAtomHeader(ExtractorInput input) throws IOException {
     return true;
   }
 
+  private void maybeSkipRemainingMetaAtomHeaderBytes(ExtractorInput input) throws IOException {
+    scratch.reset(Mp4Box.HEADER_SIZE);
+    input.peekFully(scratch.getData(), 0, Mp4Box.HEADER_SIZE);
+    BoxParser.maybeSkipRemainingMetaBoxHeaderBytes(scratch);
+    input.skipFully(scratch.getPosition());
+    input.resetPeekPosition();
+  }
+
   private void readAtomPayload(ExtractorInput input) throws IOException {
     int atomPayloadSize = (int) (atomSize - atomHeaderBytesRead);
     @Nullable ParsableByteArray atomData = this.atomData;
@@ -1931,6 +1942,7 @@ private static boolean shouldParseLeafAtom(int atom) {
         || atom == Mp4Box.TYPE_mehd
         || atom == Mp4Box.TYPE_emsg
         || atom == Mp4Box.TYPE_udta
+        || atom == Mp4Box.TYPE_keys
         || atom == Mp4Box.TYPE_ilst;
   }
 

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java

@@ -1085,8 +1085,8 @@ private void processEndOfStreamReadingAtomHeader() {
   }
 
   private void maybeSkipRemainingMetaAtomHeaderBytes(ExtractorInput input) throws IOException {
-    scratch.reset(8);
-    input.peekFully(scratch.getData(), 0, 8);
+    scratch.reset(Mp4Box.HEADER_SIZE);
+    input.peekFully(scratch.getData(), 0, Mp4Box.HEADER_SIZE);
     BoxParser.maybeSkipRemainingMetaBoxHeaderBytes(scratch);
     input.skipFully(scratch.getPosition());
     input.resetPeekPosition();