summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago Seifert <aquilescanta@google.com>2020-04-29 19:49:44 +0100
committerSantiago Seifert <aquilescanta@google.com>2020-04-29 19:49:44 +0100
commit9e215de209acb079fd0c35a2b5bb9cd361b50f54 (patch)
treec0492b5b8b3a77b61c2808404b911435da1c0482
parent12a32f35d78f441401338af3f486faded5378a0c (diff)
Add sample data part to TrackOutput implementation
Bug: 153662231 Test: atest CtsMediaParserTestCases Change-Id: I4d1bc80d1cb288c13bb9ed4607fdde03c3f5cbc0
-rw-r--r--apex/media/framework/java/android/media/MediaParser.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index 2746cba76887..4fe5fa8e48b4 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -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);