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

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

Merge "Add sample data part to TrackOutput implementation" into rvc-dev am:... 

Merge "Add sample data part to TrackOutput implementation" into rvc-dev am: f09d6319 am: d678d57e

Change-Id: I5f945e3e2e76b8b2520ec432ccd2cb2535581432
parents 884f57c8 d678d57e

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);