diff options
| -rw-r--r-- | apex/media/framework/jarjar_rules.txt | 2 | ||||
| -rw-r--r-- | apex/media/framework/java/android/media/MediaParser.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apex/media/framework/jarjar_rules.txt b/apex/media/framework/jarjar_rules.txt index 91489dcee0a1..1bd5b3616693 100644 --- a/apex/media/framework/jarjar_rules.txt +++ b/apex/media/framework/jarjar_rules.txt @@ -1,2 +1,4 @@ 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/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java index b6f85c7eac6f..7daebd0155a1 100644 --- a/apex/media/framework/java/android/media/MediaParser.java +++ b/apex/media/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 : Util.toLowerInvariant(mimeType.trim()); + mimeType = mimeType == null ? null : Ascii.toLowerCase(mimeType); 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.DO_NOT_OFFSET); + timestampAdjuster = new TimestampAdjuster(TimestampAdjuster.MODE_NO_OFFSET); } switch (parserName) { case PARSER_NAME_MATROSKA: |