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

Commit a061b67f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix CTS tests" into rvc-dev am: 881b688f am: 2402bf11 

Change-Id: I9a39c83e5a86a809ec5880201d15ff503e1028f2
parents 4ac9c80f 2402bf11

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

+25 −21
Original line number Original line Diff line number Diff line
@@ -700,11 +700,14 @@ public final class MediaParser { 
        mDataSource.mInputReader = seekableInputReader;

        mDataSource.mInputReader = seekableInputReader;





        // TODO: Apply parameters when creating extractor instances.

        // TODO: Apply parameters when creating extractor instances.

        if (mExtractor == null) {

            if (mExtractorName != null) {

            if (mExtractorName != null) {

                mExtractor = EXTRACTOR_FACTORIES_BY_NAME.get(mExtractorName).createInstance();

                mExtractor = EXTRACTOR_FACTORIES_BY_NAME.get(mExtractorName).createInstance();

        } else if (mExtractor == null) {

                mExtractor.init(new ExtractorOutputAdapter());

            } else {

                for (String parserName : mParserNamesPool) {

                for (String parserName : mParserNamesPool) {

                Extractor extractor = EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance();

                    Extractor extractor =

                            EXTRACTOR_FACTORIES_BY_NAME.get(parserName).createInstance();

                    try {

                    try {

                        if (extractor.sniff(mExtractorInput)) {

                        if (extractor.sniff(mExtractorInput)) {

                            mExtractorName = parserName;

                            mExtractorName = parserName;
@@ -725,6 +728,7 @@ public final class MediaParser { 
                }

                }

                return true;

                return true;

            }

            }

        }





        if (isPendingSeek()) {

        if (isPendingSeek()) {

            mExtractor.seek(mPendingSeekPosition, mPendingSeekTimeUs);

            mExtractor.seek(mPendingSeekPosition, mPendingSeekTimeUs);