Skip to content

Commit

Permalink
MidiExtractor: mark only the first sample as key-frame
Browse files Browse the repository at this point in the history 
This change fixes a bug with seeking forward in MIDI. When seeking forward,
the progressive media period attempts to seek within the sample queue, if a
key-frame exists before the seeking position. With MIDI, however, we can
only skip Note-On and Note-Off samples and all other samples must be sent
to the MIDI decoder.

When seeking outside the sample queue, the MidiExtractor already
instructs the player to start from the beginning of the MIDI input. With
this change, only the first output sample is a key-frame, thus the
progressive media period can no longer seek within the sample queue and
is forced to seek from the MIDI input start always.

Issue: #704

PiperOrigin-RevId: 584321443
(cherry picked from commit ec08db4)
  • Loading branch information
@christosts @microkatz
christosts authored and microkatz committed Jan 8, 2024
1 parent c9f6ad0 commit 124eb31
Show file tree
Hide file tree
Showing 9 changed files with 340 additions and 294 deletions.
2 changes: 2 additions & 0 deletions RELEASENOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
* Smooth Streaming Extension:
* RTSP Extension:
* Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
* MIDI: Fix issue where seeking forward skips the Program Change events
([#704](https://github.com/androidx/media/issues/704).
* Leanback extension:
* Cast Extension:
* Sanitize creation of a `Timeline` to not crash the app when loading
Expand Down
88 changes: 73 additions & 15 deletions libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/MidiExtractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@

import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull;
import static java.lang.annotation.ElementType.TYPE_USE;

import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.media3.common.C;
import androidx.media3.common.DataReader;
import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.ParserException;
import androidx.media3.common.util.ParsableByteArray;
import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util;
import androidx.media3.extractor.DummyTrackOutput;
import androidx.media3.extractor.Extractor;
import androidx.media3.extractor.ExtractorInput;
import androidx.media3.extractor.ExtractorOutput;
Expand All @@ -43,6 +45,7 @@
import java.lang.annotation.Target;
import java.util.ArrayList;
import java.util.PriorityQueue;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull;

/** Extracts data from MIDI containers. */
@UnstableApi
Expand Down Expand Up @@ -99,14 +102,13 @@ public final class MidiExtractor implements Extractor, SeekMap {
private int ticksPerQuarterNote;
private long currentTimestampUs;
private long startTimeUs;
private TrackOutput trackOutput;
private @MonotonicNonNull SingleKeyFrameTrackOutput trackOutput;

public MidiExtractor() {
state = STATE_INITIALIZED;
trackChunkList = new ArrayList<>();
trackPriorityQueue = new PriorityQueue<>();
midiFileData = new ParsableByteArray(/* limit= */ 512);
trackOutput = new DummyTrackOutput();
}

// Extractor implementation.
Expand All @@ -117,7 +119,7 @@ public void init(ExtractorOutput output) {
throw new IllegalStateException();
}

trackOutput = output.track(0, C.TRACK_TYPE_AUDIO);
trackOutput = new SingleKeyFrameTrackOutput(output.track(0, C.TRACK_TYPE_AUDIO));
trackOutput.format(
new Format.Builder()
.setCodecs(MimeTypes.AUDIO_MIDI)
Expand All @@ -140,6 +142,9 @@ public boolean sniff(ExtractorInput input) throws IOException {
public void seek(long position, long timeUs) {
checkState(state != STATE_RELEASED);
startTimeUs = timeUs;
if (trackOutput != null) {
trackOutput.reset();
}
if (state == STATE_LOADING) {
midiFileData.setPosition(0);
bytesRead = 0;
Expand Down Expand Up @@ -211,7 +216,8 @@ public int read(final ExtractorInput input, PositionHolder seekPosition) throws
outputEmptySample();
} else { // Event time is sooner than the maximum threshold.
currentTimestampUs = nextCommandTimestampUs;
nextChunk.outputFrontSample(trackOutput);
nextChunk.outputFrontSample(
checkStateNotNull(trackOutput), /* skipNoteEvents= */ false);
nextChunk.populateFrontTrackEvent();
}

Expand All @@ -223,9 +229,8 @@ public int read(final ExtractorInput input, PositionHolder seekPosition) throws
return result;
case STATE_INITIALIZED:
case STATE_RELEASED:
throw new IllegalStateException();
default:
throw new IllegalStateException(); // Should never happen.
throw new IllegalStateException();
}
}

Expand Down Expand Up @@ -333,12 +338,13 @@ private void onTempoChanged(int tempoBpm, long ticks) {
}

private void outputEmptySample() {
trackOutput.sampleMetadata(
currentTimestampUs,
/* flags= */ C.BUFFER_FLAG_KEY_FRAME,
/* size= */ 0,
/* offset= */ 0,
/* cryptoData= */ null);
checkStateNotNull(trackOutput)
.sampleMetadata(
currentTimestampUs,
/* flags= */ 0,
/* size= */ 0,
/* offset= */ 0,
/* cryptoData= */ null);
}

private void seekChunksTo(long seekTimeUs) throws ParserException {
Expand All @@ -347,12 +353,64 @@ private void seekChunksTo(long seekTimeUs) throws ParserException {
long nextTimestampUs = nextChunk.peekNextTimestampUs();

if (nextTimestampUs != C.TIME_UNSET && nextTimestampUs < seekTimeUs) {
nextChunk.outputFrontSample(
trackOutput, C.BUFFER_FLAG_KEY_FRAME, /* skipNoteEvents= */ true);
nextChunk.outputFrontSample(checkStateNotNull(trackOutput), /* skipNoteEvents= */ true);
nextChunk.populateFrontTrackEvent();
trackPriorityQueue.add(nextChunk);
}
}
trackPriorityQueue.addAll(trackChunkList);
}

/**
* A {@link TrackOutput} wrapper that marks only the first sample as a key-frame.
*
* <p>Only the first sample is marked as a key-frame so that seeking requires the player to seek
* to the beginning of the MIDI input and output all non Note-On and Note-Off events to the {@link
* MidiDecoder}.
*/
private static final class SingleKeyFrameTrackOutput implements TrackOutput {
private final TrackOutput trackOutput;
private int outputSampleCount;

private SingleKeyFrameTrackOutput(TrackOutput trackOutput) {
this.trackOutput = trackOutput;
}

@Override
public void format(Format format) {
trackOutput.format(format);
}

@Override
public int sampleData(
DataReader input, int length, boolean allowEndOfInput, @SampleDataPart int sampleDataPart)
throws IOException {
return trackOutput.sampleData(input, length, allowEndOfInput, sampleDataPart);
}

@Override
public void sampleData(ParsableByteArray data, int length, @SampleDataPart int sampleDataPart) {
trackOutput.sampleData(data, length, sampleDataPart);
}

@Override
public void sampleMetadata(
long timeUs,
@C.BufferFlags int flags,
int size,
int offset,
@Nullable CryptoData cryptoData) {
// No MIDI sample should be marked as key-frame
checkState((flags & C.BUFFER_FLAG_KEY_FRAME) == 0);
if (outputSampleCount == 0) {
flags |= C.BUFFER_FLAG_KEY_FRAME;
}
trackOutput.sampleMetadata(timeUs, flags, size, offset, cryptoData);
outputSampleCount++;
}

public void reset() {
outputSampleCount = 0;
}
}
}
20 changes: 3 additions & 17 deletions libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/TrackChunk.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,25 +90,13 @@ public long peekNextTimestampUs() {
ticksPerQuarterNote);
}

/**
* Outputs the front sample to {@code trackOutput}, flagged as a {@linkplain
* C#BUFFER_FLAG_KEY_FRAME key frame}.
*/
public void outputFrontSample(TrackOutput trackOutput) {
outputFrontSample(
/* trackOutput= */ trackOutput,
/* flags= */ C.BUFFER_FLAG_KEY_FRAME,
/* skipNoteEvents= */ false);
}

/**
* Outputs the current track event to {@code trackOutput}.
*
* @param trackOutput The {@link TrackOutput} to output samples to.
* @param flags {@link C.BufferFlags} to mark the buffer with.
* @param skipNoteEvents Whether note events should be skipped.
*/
public void outputFrontSample(TrackOutput trackOutput, int flags, boolean skipNoteEvents) {
public void outputFrontSample(TrackOutput trackOutput, boolean skipNoteEvents) {
if (!currentTrackEvent.isPopulated()) {
return;
}
Expand Down Expand Up @@ -149,7 +137,7 @@ public void outputFrontSample(TrackOutput trackOutput, int flags, boolean skipNo
trackOutput.sampleData(sampleData, sampleSize);
trackOutput.sampleMetadata(
lastOutputEventTimestampUs,
/* flags= */ flags,
/* flags= */ 0,
/* size= */ sampleSize,
/* offset= */ 0,
/* cryptoData= */ null);
Expand Down Expand Up @@ -207,10 +195,8 @@ public int compareTo(TrackChunk otherTrack) {
return 1;
} else if (otherTimestampUs == C.TIME_UNSET) {
return -1;
} else if (thisTimestampUs < otherTimestampUs) {
return -1;
} else {
return 1;
return Long.compare(thisTimestampUs, otherTimestampUs);
}
}

Expand Down
4 changes: 2 additions & 2 deletions libraries/decoder_midi/src/test/java/androidx/media3/decoder/midi/TrackChunkTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public void testMidNoteTempoChanges() throws IOException {
/* tempoListener= */ mock(TrackChunk.TempoChangedListener.class));

trackChunk.populateFrontTrackEvent();
trackChunk.outputFrontSample(fakeTrackOutput);
trackChunk.outputFrontSample(fakeTrackOutput, /* skipNoteEvents= */ false);
assertThat(fakeTrackOutput.getSampleTimeUs(/* index= */ 0)).isEqualTo(/* expected= */ 0);

trackChunk.addTempoChange(/* tempoBpm= */ 180, /* ticks= */ 480);
trackChunk.addTempoChange(/* tempoBpm= */ 240, /* ticks= */ 960);
trackChunk.addTempoChange(/* tempoBpm= */ 300, /* ticks= */ 1440);

trackChunk.populateFrontTrackEvent();
trackChunk.outputFrontSample(fakeTrackOutput);
trackChunk.outputFrontSample(fakeTrackOutput, /* skipNoteEvents= */ false);
assertThat(fakeTrackOutput.getSampleTimeUs(/* index= */ 1)).isEqualTo(/* expected= */ 1283333);
}
}
Loading

0 comments on commit 124eb31

Please sign in to comment.