Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91effa2a authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Revert "Make MediaParser depend on the latest Exo version" 

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
parent 0688d114

apex/media/framework/jarjar_rules.txt

+0 −2
Original line number Diff line number Diff line 
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

apex/media/framework/java/android/media/MediaParser.java

+3 −3
Original line number Diff line number Diff line
@@ -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: