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

Commit e75a360d 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: 29c87029

Change-Id: Ie8b47e618c700029f223452779ac0f4a09029602
parents e10078a9 29c87029

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