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

Commit d2bc96d6 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: f09d6319 

Change-Id: I42116f27e710dd595cb5ef05a14f6c91e7252ad4
parents 54850c9f f09d6319

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

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



        @Override

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

        public int sampleData(

                DataReader input,

                int length,

                boolean allowEndOfInput,

                @SampleDataPart int sampleDataPart)

                throws IOException {

            mScratchDataReaderAdapter.setDataReader(input, length);

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



        @Override

        public void sampleData(ParsableByteArray data, int length) {

        public void sampleData(

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

            mScratchParsableByteArrayAdapter.resetWithByteArray(data, length);

            try {

                mOutputConsumer.onSampleDataFound(mTrackIndex, mScratchParsableByteArrayAdapter);