From b2bf9f4d0fe64ce4a63a2df1fafc91b84991e55a Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 14 Oct 2021 17:28:51 +0100 Subject: [PATCH] Fix missing import PiperOrigin-RevId: 403113286 --- .../android/exoplayer2/extractor/TrueHdSampleRechunker.java | 2 +- .../google/android/exoplayer2/extractor/mp4/AtomParsers.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrueHdSampleRechunker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrueHdSampleRechunker.java index 6bae591956..f11f237165 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrueHdSampleRechunker.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrueHdSampleRechunker.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.google.android.exoplayer2.extractor; import static com.google.android.exoplayer2.util.Assertions.checkState; import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.audio.Ac3Util; import java.io.IOException; /** diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index ee8719fe5c..b43eddf300 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -1327,8 +1327,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; parent.skipBytes(6); // sampleSize, compressionId, packetSize. sampleRate = parent.readUnsignedFixedPoint1616(); - parent.skipBytes(-4); // The sample rate has been redefined as a 32-bit value for Dolby TrueHD (MLP) streams. + parent.setPosition(parent.getPosition() - 4); sampleRateMlp = parent.readInt(); if (quickTimeSoundDescriptionVersion == 1) {