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

Revert "Make MediaParser depend on the latest Exo version"

Browse Source 
Revert "Update cts to depend on new ExoPlayer version"

Revert submission 16527581-update_exoplayer_version

Reason for revert: b/213856810
Reverted Changes:
I231cf3512:Update cts to depend on new ExoPlayer version
I26f7159a7:Make MediaParser depend on the latest Exo version
Id69a309ce:Update MediaParser's ExoPlayer version

Change-Id: I84fbc379ec4868d1a81a3abcabb61ccaa919972c
This commit is contained in:
Santiago Seifert
2022-01-12 11:32:14 +00:00
parent 0688d11436
commit 91effa2ad2
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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