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

Commit 9e215de2 authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Add sample data part to TrackOutput implementation 

Bug: 153662231
Test: atest CtsMediaParserTestCases
Change-Id: I4d1bc80d1cb288c13bb9ed4607fdde03c3f5cbc0
parent 12a32f35

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -1288,7 +1288,11 @@ public final class MediaParser { 
        }

        }





        @Override

        @Override

        public int sampleData(DataReader input, int length, boolean allowEndOfInput)

        public int sampleData(

                DataReader input,

                int length,

                boolean allowEndOfInput,

                @SampleDataPart int sampleDataPart)

                throws IOException {

                throws IOException {

            mScratchDataReaderAdapter.setDataReader(input, length);

            mScratchDataReaderAdapter.setDataReader(input, length);

            long positionBeforeReading = mScratchDataReaderAdapter.getPosition();

            long positionBeforeReading = mScratchDataReaderAdapter.getPosition();
@@ -1297,7 +1301,8 @@ public final class MediaParser { 
        }

        }





        @Override

        @Override

        public void sampleData(ParsableByteArray data, int length) {

        public void sampleData(

                ParsableByteArray data, int length, @SampleDataPart int sampleDataPart) {

            mScratchParsableByteArrayAdapter.resetWithByteArray(data, length);

            mScratchParsableByteArrayAdapter.resetWithByteArray(data, length);

            try {

            try {

                mOutputConsumer.onSampleDataFound(mTrackIndex, mScratchParsableByteArrayAdapter);

                mOutputConsumer.onSampleDataFound(mTrackIndex, mScratchParsableByteArrayAdapter);