diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-01-13 03:12:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-01-13 03:12:39 +0000 |
| commit | 317d5231441b0f98778b4f34d19fe58b7db9654d (patch) | |
| tree | bec8332dbf30398d421079243f285a54da99d56e | |
| parent | 55ca7a144fc006a5471b7edce293524738beca2a (diff) | |
| parent | 7119bff1c743371ef347e0a03a941acfe90b457c (diff) | |
| download | Media-317d5231441b0f98778b4f34d19fe58b7db9654d.tar.gz | |
Merge "Revert "Make MediaParser depend on the latest Exo version""
| -rw-r--r-- | apex/framework/jarjar_rules.txt | 2 | ||||
| -rw-r--r-- | apex/framework/java/android/media/MediaParser.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/apex/framework/jarjar_rules.txt b/apex/framework/jarjar_rules.txt index 1bd5b36..91489dc 100644 --- a/apex/framework/jarjar_rules.txt +++ b/apex/framework/jarjar_rules.txt @@ -1,4 +1,2 @@ rule com.android.modules.** android.media.internal.@1 rule com.google.android.exoplayer2.** android.media.internal.exo.@1 -rule com.google.common.** android.media.internal.guava_common.@1 -rule com.google.thirdparty.** android.media.internal.guava_thirdparty.@1 diff --git a/apex/framework/java/android/media/MediaParser.java b/apex/framework/java/android/media/MediaParser.java index 7daebd0..b6f85c7 100644 --- a/apex/framework/java/android/media/MediaParser.java +++ b/apex/framework/java/android/media/MediaParser.java @@ -62,8 +62,8 @@ import com.google.android.exoplayer2.extractor.wav.WavExtractor; import com.google.android.exoplayer2.upstream.DataReader; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.TimestampAdjuster; +import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.video.ColorInfo; -import com.google.common.base.Ascii; import java.io.EOFException; import java.io.IOException; @@ -978,7 +978,7 @@ public final class MediaParser { @ParserName public static List<String> getParserNames(@NonNull MediaFormat mediaFormat) { String mimeType = mediaFormat.getString(MediaFormat.KEY_MIME); - mimeType = mimeType == null ? null : Ascii.toLowerCase(mimeType); + mimeType = mimeType == null ? null : Util.toLowerInvariant(mimeType.trim()); if (TextUtils.isEmpty(mimeType)) { // No MIME type provided. Return all. return Collections.unmodifiableList( @@ -1420,7 +1420,7 @@ public final class MediaParser { int flags = 0; TimestampAdjuster timestampAdjuster = null; if (mIgnoreTimestampOffset) { - timestampAdjuster = new TimestampAdjuster(TimestampAdjuster.MODE_NO_OFFSET); + timestampAdjuster = new TimestampAdjuster(TimestampAdjuster.DO_NOT_OFFSET); } switch (parserName) { case PARSER_NAME_MATROSKA: |