sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MpegAudioChunkHandler seek fixes

Browse source
This commit is contained in:
Dustin 2022-02-05 10:19:26 -07:00
parent 247b57692e
commit 71f094f259
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/avi/MpegAudioChunkHandler.java
View file

@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.audio.MpegAudioUtil; import com.google.android.exoplayer2.audio.MpegAudioUtil;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException; import java.io.IOException;
@ -104,7 +105,9 @@ public class MpegAudioChunkHandler extends ChunkHandler {
} }
scratch.skipBytes(-3); scratch.skipBytes(-3);
} }
toRead = Math.min(chunkRemaining, 128); // 16 is small, but if we end up reading multiple frames into scratch, things get complicated.
// We should only loop on seek, so this is the lesser of the evils.
toRead = Math.min(chunkRemaining, 16);
} }
return false; return false;
} }
@ -140,11 +143,17 @@ public class MpegAudioChunkHandler extends ChunkHandler {
public void setIndex(int index) { public void setIndex(int index) {
super.setIndex(index); super.setIndex(index);
syncTime(); syncTime();
if (frameRemaining != 0) {
// We have a partial frame in the output, no way to clear it, so just send it as is.
// Next frame should be key frame, so the codec should recover.
trackOutput.sampleMetadata(timeUs, 0, header.frameSize - frameRemaining,
0, null);
frameRemaining = 0;
}
} }
private void syncTime() { private void syncTime() {
timeUs = clock.getUs(); timeUs = clock.getUs();
frameRemaining = 0;
} }
@VisibleForTesting(otherwise = VisibleForTesting.NONE) @VisibleForTesting(otherwise = VisibleForTesting.NONE)