Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make MediaParser depend on the latest Exo version"

Browse Source
This commit is contained in:
Santiago Seifert
2021-12-24 19:35:57 +00:00
committed by Android (Google) Code Review
parent 368fe9230c 0688d11436
commit 93e2313c93
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/media/framework/jarjar_rules.txt
View File

@@ -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

6
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -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: