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

Commit bd60b7b7 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Replace data source with data reader" into rvc-dev am: edaedb06 

Change-Id: I4cdfe11ffb40fa6601542fc843bc205461d56929
parents c590fbc6 edaedb06

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

+5 −34
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.StringDef;

import android.annotation.StringDef;

import android.media.MediaCodec.CryptoInfo;

import android.media.MediaCodec.CryptoInfo;

import android.net.Uri;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Pair;

import android.util.Pair;

import android.util.SparseArray;

import android.util.SparseArray;
@@ -52,9 +51,6 @@ import com.google.android.exoplayer2.extractor.ts.PsExtractor; 
import com.google.android.exoplayer2.extractor.ts.TsExtractor;

import com.google.android.exoplayer2.extractor.ts.TsExtractor;

import com.google.android.exoplayer2.extractor.wav.WavExtractor;

import com.google.android.exoplayer2.extractor.wav.WavExtractor;

import com.google.android.exoplayer2.upstream.DataReader;

import com.google.android.exoplayer2.upstream.DataReader;

import com.google.android.exoplayer2.upstream.DataSource;

import com.google.android.exoplayer2.upstream.DataSpec;

import com.google.android.exoplayer2.upstream.TransferListener;

import com.google.android.exoplayer2.util.ParsableByteArray;

import com.google.android.exoplayer2.util.ParsableByteArray;

import com.google.android.exoplayer2.util.Util;

import com.google.android.exoplayer2.util.Util;

import com.google.android.exoplayer2.video.ColorInfo;

import com.google.android.exoplayer2.video.ColorInfo;
@@ -847,7 +843,7 @@ public final class MediaParser { 
    private final OutputConsumer mOutputConsumer;

    private final OutputConsumer mOutputConsumer;

    private final String[] mParserNamesPool;

    private final String[] mParserNamesPool;

    private final PositionHolder mPositionHolder;

    private final PositionHolder mPositionHolder;

    private final InputReadingDataSource mDataSource;

    private final InputReadingDataReader mExoDataReader;

    private final DataReaderAdapter mScratchDataReaderAdapter;

    private final DataReaderAdapter mScratchDataReaderAdapter;

    private final ParsableByteArrayAdapter mScratchParsableByteArrayAdapter;

    private final ParsableByteArrayAdapter mScratchParsableByteArrayAdapter;

    private String mParserName;

    private String mParserName;
@@ -950,11 +946,11 @@ public final class MediaParser { 
            // clearBuffers() method, or similar.

            // clearBuffers() method, or similar.

            mExtractorInput =

            mExtractorInput =

                    new DefaultExtractorInput(

                    new DefaultExtractorInput(

                            mDataSource,

                            mExoDataReader,

                            seekableInputReader.getPosition(),

                            seekableInputReader.getPosition(),

                            seekableInputReader.getLength());

                            seekableInputReader.getLength());

        }

        }

        mDataSource.mInputReader = seekableInputReader;

        mExoDataReader.mInputReader = seekableInputReader;





        // TODO: Apply parameters when creating extractor instances.

        // TODO: Apply parameters when creating extractor instances.

        if (mExtractor == null) {

        if (mExtractor == null) {
@@ -1046,7 +1042,7 @@ public final class MediaParser { 
        mParserNamesPool = parserNamesPool;

        mParserNamesPool = parserNamesPool;

        mParserName = sniff ? PARSER_NAME_UNKNOWN : parserNamesPool[0];

        mParserName = sniff ? PARSER_NAME_UNKNOWN : parserNamesPool[0];

        mPositionHolder = new PositionHolder();

        mPositionHolder = new PositionHolder();

        mDataSource = new InputReadingDataSource();

        mExoDataReader = new InputReadingDataReader();

        removePendingSeek();

        removePendingSeek();

        mScratchDataReaderAdapter = new DataReaderAdapter();

        mScratchDataReaderAdapter = new DataReaderAdapter();

        mScratchParsableByteArrayAdapter = new ParsableByteArrayAdapter();

        mScratchParsableByteArrayAdapter = new ParsableByteArrayAdapter();
@@ -1181,39 +1177,14 @@ public final class MediaParser { 




    // Private classes.

    // Private classes.





    private static final class InputReadingDataSource implements DataSource {

    private static final class InputReadingDataReader implements DataReader {





        public InputReader mInputReader;

        public InputReader mInputReader;





        @Override

        public void addTransferListener(TransferListener transferListener) {

            // Do nothing.

        }



        @Override

        public long open(DataSpec dataSpec) {

            throw new UnsupportedOperationException();

        }



        @Override

        @Override

        public int read(byte[] buffer, int offset, int readLength) throws IOException {

        public int read(byte[] buffer, int offset, int readLength) throws IOException {

            return mInputReader.read(buffer, offset, readLength);

            return mInputReader.read(buffer, offset, readLength);

        }

        }



        @Override

        public Uri getUri() {

            return null;

        }



        @Override

        public Map<String, List<String>> getResponseHeaders() {

            return null;

        }



        @Override

        public void close() {

            throw new UnsupportedOperationException();

        }

    }

    }





    private final class ExtractorOutputAdapter implements ExtractorOutput {

    private final class ExtractorOutputAdapter implements ExtractorOutput {