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

Commit 90a8cac4 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 am: 308a746f

Change-Id: I2de285202ab319064af5cf4c143434ae498f2fe1
parents ab6ba866 308a746f

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