From a67394b2308d1d65a4187f81280b8682d084410c Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Mon, 6 Jan 2020 15:21:43 +0800
Subject: [PATCH] Optimize AC-4 code and add related test cases

-- Optimize Mp4Extractor for AC-4
-- Optimize FragmentedMp4Extractor for AC-4
-- Add test case for AC-4 in MP4
-- Add test case for AC-4 in Fragmented MP4
---
 .../android/exoplayer2/audio/Ac4Util.java     |   6 +
 .../extractor/mp4/FragmentedMp4Extractor.java |  20 ++--
 .../extractor/mp4/Mp4Extractor.java           |  19 ++--
 .../core/src/test/assets/mp4/sample_ac4.mp4   | Bin 0 -> 8238 bytes
 .../src/test/assets/mp4/sample_ac4.mp4.0.dump | 107 ++++++++++++++++++
 .../src/test/assets/mp4/sample_ac4.mp4.1.dump | 107 ++++++++++++++++++
 .../src/test/assets/mp4/sample_ac4.mp4.2.dump | 107 ++++++++++++++++++
 .../src/test/assets/mp4/sample_ac4.mp4.3.dump | 107 ++++++++++++++++++
 .../test/assets/mp4/sample_ac4_fragmented.mp4 | Bin 0 -> 8404 bytes
 .../mp4/sample_ac4_fragmented.mp4.0.dump      | 107 ++++++++++++++++++
 .../mp4/sample_ac4_fragmented.mp4.1.dump      |  83 ++++++++++++++
 .../mp4/sample_ac4_fragmented.mp4.2.dump      |  59 ++++++++++
 .../mp4/sample_ac4_fragmented.mp4.3.dump      |  35 ++++++
 .../mp4/FragmentedMp4ExtractorTest.java       |   6 +
 .../extractor/mp4/Mp4ExtractorTest.java       |   5 +
 15 files changed, 744 insertions(+), 24 deletions(-)
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4.mp4
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
 create mode 100644 library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
index c54e3844a3..f3b3a8fc1d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java
@@ -57,6 +57,12 @@ public final class Ac4Util {
   /** The channel count of AC-4 stream. */
   // TODO: Parse AC-4 stream channel count.
   private static final int CHANNEL_COUNT_2 = 2;
+  /**
+   * The AC-4 sync frame header size for extractor.
+   * The 7 bytes are 0xAC, 0x40, 0xFF, 0xFF, sizeByte1, sizeByte2, sizeByte3.
+   * See ETSI TS 103 190-1 V1.3.1, Annex G
+   */
+  public static final int SAMPLE_HEADER_SIZE = 7;
   /**
    * The header size for AC-4 parser. Only needs to be as big as we need to read, not the full
    * header size.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
index 1172f8665a..967f71b328 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
@@ -168,7 +168,6 @@ public class FragmentedMp4Extractor implements Extractor {
   private int sampleBytesWritten;
   private int sampleCurrentNalBytesRemaining;
   private boolean processSeiNalUnitPayload;
-  private boolean isAc4HeaderRequired;
 
   // Extractor output.
   @MonotonicNonNull private ExtractorOutput extractorOutput;
@@ -302,7 +301,6 @@ public class FragmentedMp4Extractor implements Extractor {
     pendingMetadataSampleBytes = 0;
     pendingSeekTimeUs = timeUs;
     containerAtoms.clear();
-    isAc4HeaderRequired = false;
     enterReadingAtomHeaderState();
   }
 
@@ -1267,12 +1265,18 @@ public class FragmentedMp4Extractor implements Extractor {
         sampleSize -= Atom.HEADER_SIZE;
         input.skipFully(Atom.HEADER_SIZE);
       }
+      boolean isAc4HeaderRequired =
+          MimeTypes.AUDIO_AC4.equals(currentTrackBundle.track.format.sampleMimeType);
       sampleBytesWritten = currentTrackBundle.outputSampleEncryptionData();
       sampleSize += sampleBytesWritten;
+      if (isAc4HeaderRequired) {
+        Ac4Util.getAc4SampleHeader(sampleSize, scratch);
+        currentTrackBundle.output.sampleData(scratch, Ac4Util.SAMPLE_HEADER_SIZE);
+        sampleBytesWritten += Ac4Util.SAMPLE_HEADER_SIZE;
+        sampleSize += Ac4Util.SAMPLE_HEADER_SIZE;
+      }
       parserState = STATE_READING_SAMPLE_CONTINUE;
       sampleCurrentNalBytesRemaining = 0;
-      isAc4HeaderRequired =
-          MimeTypes.AUDIO_AC4.equals(currentTrackBundle.track.format.sampleMimeType);
     }
 
     TrackFragment fragment = currentTrackBundle.fragment;
@@ -1337,14 +1341,6 @@ public class FragmentedMp4Extractor implements Extractor {
         }
       }
     } else {
-      if (isAc4HeaderRequired) {
-        Ac4Util.getAc4SampleHeader(sampleSize, scratch);
-        int length = scratch.limit();
-        output.sampleData(scratch, length);
-        sampleSize += length;
-        sampleBytesWritten += length;
-        isAc4HeaderRequired = false;
-      }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = output.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
index 971cc27d13..651db26b5e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -112,7 +112,6 @@ public final class Mp4Extractor implements Extractor, SeekMap {
   private int sampleTrackIndex;
   private int sampleBytesWritten;
   private int sampleCurrentNalBytesRemaining;
-  private boolean isAc4HeaderRequired;
 
   // Extractor outputs.
   @MonotonicNonNull private ExtractorOutput extractorOutput;
@@ -162,7 +161,6 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     sampleTrackIndex = C.INDEX_UNSET;
     sampleBytesWritten = 0;
     sampleCurrentNalBytesRemaining = 0;
-    isAc4HeaderRequired = false;
     if (position == 0) {
       enterReadingAtomHeaderState();
     } else if (tracks != null) {
@@ -507,8 +505,6 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       if (sampleTrackIndex == C.INDEX_UNSET) {
         return RESULT_END_OF_INPUT;
       }
-      isAc4HeaderRequired =
-          MimeTypes.AUDIO_AC4.equals(tracks[sampleTrackIndex].track.format.sampleMimeType);
     }
     Mp4Track track = tracks[sampleTrackIndex];
     TrackOutput trackOutput = track.trackOutput;
@@ -527,6 +523,13 @@ public final class Mp4Extractor implements Extractor, SeekMap {
       sampleSize -= Atom.HEADER_SIZE;
     }
     input.skipFully((int) skipAmount);
+    if (MimeTypes.AUDIO_AC4.equals(track.track.format.sampleMimeType)) {
+      Ac4Util.getAc4SampleHeader(sampleSize, scratch);
+      int length = scratch.limit();
+      trackOutput.sampleData(scratch, length);
+      sampleSize += length;
+      sampleBytesWritten += length;
+    }
     if (track.track.nalUnitLengthFieldLength != 0) {
       // Zero the top three bytes of the array that we'll use to decode nal unit lengths, in case
       // they're only 1 or 2 bytes long.
@@ -562,14 +565,6 @@ public final class Mp4Extractor implements Extractor, SeekMap {
         }
       }
     } else {
-      if (isAc4HeaderRequired) {
-        Ac4Util.getAc4SampleHeader(sampleSize, scratch);
-        int length = scratch.limit();
-        trackOutput.sampleData(scratch, length);
-        sampleSize += length;
-        sampleBytesWritten += length;
-        isAc4HeaderRequired = false;
-      }
       while (sampleBytesWritten < sampleSize) {
         int writtenBytes = trackOutput.sampleData(input, sampleSize - sampleBytesWritten, false);
         sampleBytesWritten += writtenBytes;
diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4 b/library/core/src/test/assets/mp4/sample_ac4.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..d649632c745ef055934dda90e750e1b99f991593
GIT binary patch
literal 8238
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
b-oeDizO2Xc2Qp{?8omZ)=pUE=<}UId;b<$Z

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump b/library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump
new file mode 100644
index 0000000000..92ba157e3f
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump
@@ -0,0 +1,107 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=758]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = 622
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 7613
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 367, hash D2762FA
+  sample 1:
+    time = 40000
+    flags = 0
+    data = length 367, hash BDD3224A
+  sample 2:
+    time = 80000
+    flags = 0
+    data = length 367, hash 9302227B
+  sample 3:
+    time = 120000
+    flags = 0
+    data = length 367, hash 72996003
+  sample 4:
+    time = 160000
+    flags = 0
+    data = length 367, hash 88AE5A1B
+  sample 5:
+    time = 200000
+    flags = 0
+    data = length 367, hash E5346FE3
+  sample 6:
+    time = 240000
+    flags = 0
+    data = length 367, hash CE558362
+  sample 7:
+    time = 280000
+    flags = 0
+    data = length 367, hash 51AD3043
+  sample 8:
+    time = 320000
+    flags = 0
+    data = length 367, hash EB72E95B
+  sample 9:
+    time = 360000
+    flags = 0
+    data = length 367, hash 47F8FF23
+  sample 10:
+    time = 400000
+    flags = 0
+    data = length 367, hash 8133883D
+  sample 11:
+    time = 440000
+    flags = 0
+    data = length 495, hash E14BDFEE
+  sample 12:
+    time = 480000
+    flags = 0
+    data = length 520, hash FEE56928
+  sample 13:
+    time = 519999
+    flags = 0
+    data = length 599, hash 41F496C5
+  sample 14:
+    time = 560000
+    flags = 0
+    data = length 436, hash 76D6404
+  sample 15:
+    time = 600000
+    flags = 0
+    data = length 366, hash 56D49D4D
+  sample 16:
+    time = 640000
+    flags = 0
+    data = length 393, hash 822FC8
+  sample 17:
+    time = 680000
+    flags = 0
+    data = length 374, hash FA8AE217
+  sample 18:
+    time = 720000
+    flags = 536870912
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump b/library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump
new file mode 100644
index 0000000000..92ba157e3f
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump
@@ -0,0 +1,107 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=758]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = 622
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 7613
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 367, hash D2762FA
+  sample 1:
+    time = 40000
+    flags = 0
+    data = length 367, hash BDD3224A
+  sample 2:
+    time = 80000
+    flags = 0
+    data = length 367, hash 9302227B
+  sample 3:
+    time = 120000
+    flags = 0
+    data = length 367, hash 72996003
+  sample 4:
+    time = 160000
+    flags = 0
+    data = length 367, hash 88AE5A1B
+  sample 5:
+    time = 200000
+    flags = 0
+    data = length 367, hash E5346FE3
+  sample 6:
+    time = 240000
+    flags = 0
+    data = length 367, hash CE558362
+  sample 7:
+    time = 280000
+    flags = 0
+    data = length 367, hash 51AD3043
+  sample 8:
+    time = 320000
+    flags = 0
+    data = length 367, hash EB72E95B
+  sample 9:
+    time = 360000
+    flags = 0
+    data = length 367, hash 47F8FF23
+  sample 10:
+    time = 400000
+    flags = 0
+    data = length 367, hash 8133883D
+  sample 11:
+    time = 440000
+    flags = 0
+    data = length 495, hash E14BDFEE
+  sample 12:
+    time = 480000
+    flags = 0
+    data = length 520, hash FEE56928
+  sample 13:
+    time = 519999
+    flags = 0
+    data = length 599, hash 41F496C5
+  sample 14:
+    time = 560000
+    flags = 0
+    data = length 436, hash 76D6404
+  sample 15:
+    time = 600000
+    flags = 0
+    data = length 366, hash 56D49D4D
+  sample 16:
+    time = 640000
+    flags = 0
+    data = length 393, hash 822FC8
+  sample 17:
+    time = 680000
+    flags = 0
+    data = length 374, hash FA8AE217
+  sample 18:
+    time = 720000
+    flags = 536870912
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump b/library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump
new file mode 100644
index 0000000000..92ba157e3f
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump
@@ -0,0 +1,107 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=758]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = 622
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 7613
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 367, hash D2762FA
+  sample 1:
+    time = 40000
+    flags = 0
+    data = length 367, hash BDD3224A
+  sample 2:
+    time = 80000
+    flags = 0
+    data = length 367, hash 9302227B
+  sample 3:
+    time = 120000
+    flags = 0
+    data = length 367, hash 72996003
+  sample 4:
+    time = 160000
+    flags = 0
+    data = length 367, hash 88AE5A1B
+  sample 5:
+    time = 200000
+    flags = 0
+    data = length 367, hash E5346FE3
+  sample 6:
+    time = 240000
+    flags = 0
+    data = length 367, hash CE558362
+  sample 7:
+    time = 280000
+    flags = 0
+    data = length 367, hash 51AD3043
+  sample 8:
+    time = 320000
+    flags = 0
+    data = length 367, hash EB72E95B
+  sample 9:
+    time = 360000
+    flags = 0
+    data = length 367, hash 47F8FF23
+  sample 10:
+    time = 400000
+    flags = 0
+    data = length 367, hash 8133883D
+  sample 11:
+    time = 440000
+    flags = 0
+    data = length 495, hash E14BDFEE
+  sample 12:
+    time = 480000
+    flags = 0
+    data = length 520, hash FEE56928
+  sample 13:
+    time = 519999
+    flags = 0
+    data = length 599, hash 41F496C5
+  sample 14:
+    time = 560000
+    flags = 0
+    data = length 436, hash 76D6404
+  sample 15:
+    time = 600000
+    flags = 0
+    data = length 366, hash 56D49D4D
+  sample 16:
+    time = 640000
+    flags = 0
+    data = length 393, hash 822FC8
+  sample 17:
+    time = 680000
+    flags = 0
+    data = length 374, hash FA8AE217
+  sample 18:
+    time = 720000
+    flags = 536870912
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump b/library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump
new file mode 100644
index 0000000000..92ba157e3f
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump
@@ -0,0 +1,107 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=758]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = 622
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 7613
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 367, hash D2762FA
+  sample 1:
+    time = 40000
+    flags = 0
+    data = length 367, hash BDD3224A
+  sample 2:
+    time = 80000
+    flags = 0
+    data = length 367, hash 9302227B
+  sample 3:
+    time = 120000
+    flags = 0
+    data = length 367, hash 72996003
+  sample 4:
+    time = 160000
+    flags = 0
+    data = length 367, hash 88AE5A1B
+  sample 5:
+    time = 200000
+    flags = 0
+    data = length 367, hash E5346FE3
+  sample 6:
+    time = 240000
+    flags = 0
+    data = length 367, hash CE558362
+  sample 7:
+    time = 280000
+    flags = 0
+    data = length 367, hash 51AD3043
+  sample 8:
+    time = 320000
+    flags = 0
+    data = length 367, hash EB72E95B
+  sample 9:
+    time = 360000
+    flags = 0
+    data = length 367, hash 47F8FF23
+  sample 10:
+    time = 400000
+    flags = 0
+    data = length 367, hash 8133883D
+  sample 11:
+    time = 440000
+    flags = 0
+    data = length 495, hash E14BDFEE
+  sample 12:
+    time = 480000
+    flags = 0
+    data = length 520, hash FEE56928
+  sample 13:
+    time = 519999
+    flags = 0
+    data = length 599, hash 41F496C5
+  sample 14:
+    time = 560000
+    flags = 0
+    data = length 436, hash 76D6404
+  sample 15:
+    time = 600000
+    flags = 0
+    data = length 366, hash 56D49D4D
+  sample 16:
+    time = 640000
+    flags = 0
+    data = length 393, hash 822FC8
+  sample 17:
+    time = 680000
+    flags = 0
+    data = length 374, hash FA8AE217
+  sample 18:
+    time = 720000
+    flags = 536870912
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4 b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..2056348768808517cbbf07c417c230d701eb9d35
GIT binary patch
literal 8404
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

literal 0
HcmV?d00001

diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
new file mode 100644
index 0000000000..505c85e51f
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump
@@ -0,0 +1,107 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=685]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 7613
+  sample count = 19
+  sample 0:
+    time = 0
+    flags = 1
+    data = length 367, hash D2762FA
+  sample 1:
+    time = 40000
+    flags = 1
+    data = length 367, hash BDD3224A
+  sample 2:
+    time = 80000
+    flags = 1
+    data = length 367, hash 9302227B
+  sample 3:
+    time = 120000
+    flags = 1
+    data = length 367, hash 72996003
+  sample 4:
+    time = 160000
+    flags = 1
+    data = length 367, hash 88AE5A1B
+  sample 5:
+    time = 200000
+    flags = 1
+    data = length 367, hash E5346FE3
+  sample 6:
+    time = 240000
+    flags = 1
+    data = length 367, hash CE558362
+  sample 7:
+    time = 280000
+    flags = 1
+    data = length 367, hash 51AD3043
+  sample 8:
+    time = 320000
+    flags = 1
+    data = length 367, hash EB72E95B
+  sample 9:
+    time = 360000
+    flags = 1
+    data = length 367, hash 47F8FF23
+  sample 10:
+    time = 400000
+    flags = 1
+    data = length 367, hash 8133883D
+  sample 11:
+    time = 440000
+    flags = 1
+    data = length 495, hash E14BDFEE
+  sample 12:
+    time = 480000
+    flags = 1
+    data = length 520, hash FEE56928
+  sample 13:
+    time = 520000
+    flags = 1
+    data = length 599, hash 41F496C5
+  sample 14:
+    time = 560000
+    flags = 1
+    data = length 436, hash 76D6404
+  sample 15:
+    time = 600000
+    flags = 1
+    data = length 366, hash 56D49D4D
+  sample 16:
+    time = 640000
+    flags = 1
+    data = length 393, hash 822FC8
+  sample 17:
+    time = 680000
+    flags = 1
+    data = length 374, hash FA8AE217
+  sample 18:
+    time = 720000
+    flags = 1
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
new file mode 100644
index 0000000000..8bee343bd9
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump
@@ -0,0 +1,83 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=685]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 5411
+  sample count = 13
+  sample 0:
+    time = 240000
+    flags = 1
+    data = length 367, hash CE558362
+  sample 1:
+    time = 280000
+    flags = 1
+    data = length 367, hash 51AD3043
+  sample 2:
+    time = 320000
+    flags = 1
+    data = length 367, hash EB72E95B
+  sample 3:
+    time = 360000
+    flags = 1
+    data = length 367, hash 47F8FF23
+  sample 4:
+    time = 400000
+    flags = 1
+    data = length 367, hash 8133883D
+  sample 5:
+    time = 440000
+    flags = 1
+    data = length 495, hash E14BDFEE
+  sample 6:
+    time = 480000
+    flags = 1
+    data = length 520, hash FEE56928
+  sample 7:
+    time = 520000
+    flags = 1
+    data = length 599, hash 41F496C5
+  sample 8:
+    time = 560000
+    flags = 1
+    data = length 436, hash 76D6404
+  sample 9:
+    time = 600000
+    flags = 1
+    data = length 366, hash 56D49D4D
+  sample 10:
+    time = 640000
+    flags = 1
+    data = length 393, hash 822FC8
+  sample 11:
+    time = 680000
+    flags = 1
+    data = length 374, hash FA8AE217
+  sample 12:
+    time = 720000
+    flags = 1
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
new file mode 100644
index 0000000000..ee1cf91a57
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump
@@ -0,0 +1,59 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=685]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 3081
+  sample count = 7
+  sample 0:
+    time = 480000
+    flags = 1
+    data = length 520, hash FEE56928
+  sample 1:
+    time = 520000
+    flags = 1
+    data = length 599, hash 41F496C5
+  sample 2:
+    time = 560000
+    flags = 1
+    data = length 436, hash 76D6404
+  sample 3:
+    time = 600000
+    flags = 1
+    data = length 366, hash 56D49D4D
+  sample 4:
+    time = 640000
+    flags = 1
+    data = length 393, hash 822FC8
+  sample 5:
+    time = 680000
+    flags = 1
+    data = length 374, hash FA8AE217
+  sample 6:
+    time = 720000
+    flags = 1
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
new file mode 100644
index 0000000000..419f0444bf
--- /dev/null
+++ b/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump
@@ -0,0 +1,35 @@
+seekMap:
+  isSeekable = true
+  duration = 760000
+  getPosition(0) = [[timeUs=0, position=685]]
+numberOfTracks = 1
+track 0:
+  format:
+    bitrate = -1
+    id = 1
+    containerMimeType = null
+    sampleMimeType = audio/ac4
+    maxInputSize = -1
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = 0
+    pixelWidthHeightRatio = 1.0
+    channelCount = 2
+    sampleRate = 48000
+    pcmEncoding = -1
+    encoderDelay = 0
+    encoderPadding = 0
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = und
+    drmInitData = -
+    metadata = null
+    initializationData:
+  total output bytes = 393
+  sample count = 1
+  sample 0:
+    time = 720000
+    flags = 1
+    data = length 393, hash 8506A1B
+tracksEnded = true
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
index a29dfcc310..1f49aee293 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
@@ -51,6 +51,12 @@ public final class FragmentedMp4ExtractorTest {
     ExtractorAsserts.assertBehavior(extractorFactory, "mp4/sample_fragmented_sei.mp4");
   }
 
+  @Test
+  public void testSampleWithAc4Track() throws Exception {
+    ExtractorAsserts.assertBehavior(
+        getExtractorFactory(Collections.emptyList()), "mp4/sample_ac4_fragmented.mp4");
+  }
+
   private static ExtractorFactory getExtractorFactory(final List<Format> closedCaptionFormats) {
     return () -> new FragmentedMp4Extractor(0, null, null, null, closedCaptionFormats);
   }
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
index b5c3b26a23..6ddc74c797 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
@@ -42,4 +42,9 @@ public final class Mp4ExtractorTest {
   public void testMp4SampleWithMdatTooLong() throws Exception {
     ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_mdat_too_long.mp4");
   }
+
+  @Test
+  public void testMp4SampleWithAc4Track() throws Exception {
+    ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample_ac4.mp4");
+  }
 }