Fix bug with null in aviTracks, add FourCC FMP4

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/AviExtractor.java

@@ -471,9 +471,10 @@ public class AviExtractor implements Extractor {
   }
   }
 
 
   @Nullable
   @Nullable
-  private AviTrack getAviTrack(int chunkId) {
+  @VisibleForTesting
+  AviTrack getAviTrack(int chunkId) {
     for (AviTrack aviTrack : aviTracks) {
     for (AviTrack aviTrack : aviTracks) {
-      if (aviTrack.handlesChunkId(chunkId)) {
+      if (aviTrack != null && aviTrack.handlesChunkId(chunkId)) {
         return aviTrack;
         return aviTrack;
       }
       }
     }
     }

library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/VideoFormat.java

@@ -28,7 +28,7 @@ public class VideoFormat {
     STREAM_MAP.put(XVID, mimeType);
     STREAM_MAP.put(XVID, mimeType);
     STREAM_MAP.put('D' | ('X' << 8) | ('5' << 16) | ('0' << 24), mimeType);
     STREAM_MAP.put('D' | ('X' << 8) | ('5' << 16) | ('0' << 24), mimeType);
     STREAM_MAP.put('d' | ('i' << 8) | ('v' << 16) | ('x' << 24), mimeType);
     STREAM_MAP.put('d' | ('i' << 8) | ('v' << 16) | ('x' << 24), mimeType);
-
+    STREAM_MAP.put('F' | ('M' << 8) | ('P' << 16) | ('4' << 24), mimeType);
     STREAM_MAP.put('M' | ('J' << 8) | ('P' << 16) | ('G' << 24), MimeTypes.VIDEO_MJPEG);
     STREAM_MAP.put('M' | ('J' << 8) | ('P' << 16) | ('G' << 24), MimeTypes.VIDEO_MJPEG);
     STREAM_MAP.put('m' | ('j' << 8) | ('p' << 16) | ('g' << 24), MimeTypes.VIDEO_MJPEG);
     STREAM_MAP.put('m' | ('j' << 8) | ('p' << 16) | ('g' << 24), MimeTypes.VIDEO_MJPEG);
   }
   }

library/extractor/src/test/java/com/google/android/exoplayer2/extractor/avi/AviExtractorTest.java

@@ -464,4 +464,11 @@ public class AviExtractorTest {
     Assert.assertEquals(aviSeekMap.seekIndexes[aviTrack.id][1], aviTrack.getClock().getIndex());
     Assert.assertEquals(aviSeekMap.seekIndexes[aviTrack.id][1], aviTrack.getClock().getIndex());
   }
   }
 
 
+  @Test
+  public void getAviTrack_givenListWithNull() {
+    final AviExtractor aviExtractor = new AviExtractor();
+    final AviTrack aviTrack = DataHelper.getAudioAviTrack(9);
+    aviExtractor.setAviTracks(new AviTrack[]{null, aviTrack});
+    Assert.assertSame(aviTrack, aviExtractor.getAviTrack(aviTrack.chunkId));
+  }
 }
 }
\ No newline at end of file