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

fix for packet header split over 2 PES packets

Browse source
This commit is contained in:
Rohit Singh 2024-04-26 10:38:32 +02:00
parent 3d974793f9
commit c34c3db87f
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java
View file

@ -77,6 +77,7 @@ public final class MpeghReader implements ElementaryStreamReader {
private final ParsableBitArray headerScratchBits; private final ParsableBitArray headerScratchBits;
private final ParsableByteArray dataScratchBytes; private final ParsableByteArray dataScratchBytes;
private boolean headerDataFinished;
private int payloadBytesRead; private int payloadBytesRead;
private int frameBytes; private int frameBytes;
@ -99,6 +100,7 @@ public final class MpeghReader implements ElementaryStreamReader {
standardFrameLength = C.LENGTH_UNSET; standardFrameLength = C.LENGTH_UNSET;
mainStreamLabel = C.INDEX_UNSET; mainStreamLabel = C.INDEX_UNSET;
rapPending = true; rapPending = true;
headerDataFinished = true;
timeUs = C.TIME_UNSET; timeUs = C.TIME_UNSET;
timeUsPending = C.TIME_UNSET; timeUsPending = C.TIME_UNSET;
} }
@ -116,6 +118,7 @@ public final class MpeghReader implements ElementaryStreamReader {
mainStreamLabel = C.INDEX_UNSET; mainStreamLabel = C.INDEX_UNSET;
configFound = false; configFound = false;
dataPending = false; dataPending = false;
headerDataFinished = true;
rapPending = true; rapPending = true;
timeUs = C.TIME_UNSET; timeUs = C.TIME_UNSET;
timeUsPending = C.TIME_UNSET; timeUsPending = C.TIME_UNSET;
@ -134,7 +137,7 @@ public final class MpeghReader implements ElementaryStreamReader {
this.flags = flags; this.flags = flags;
// check if data is pending (an MPEG-H frame could not be completed) // check if data is pending (an MPEG-H frame could not be completed)
if (!rapPending && frameBytes != 0) { if (!rapPending && (frameBytes != 0 || !headerDataFinished)) {
dataPending = true; dataPending = true;
} }
@ -172,11 +175,19 @@ public final class MpeghReader implements ElementaryStreamReader {
// Prepare dataScratchBytes to read new MHAS packet // Prepare dataScratchBytes to read new MHAS packet
dataScratchBytes.reset(header.packetLength); dataScratchBytes.reset(header.packetLength);
// Signalize packet header processed completely
headerDataFinished = true;
// MHAS packet header finished -> obtain the packet payload // MHAS packet header finished -> obtain the packet payload
state = STATE_READING_PACKET_PAYLOAD; state = STATE_READING_PACKET_PAYLOAD;
} else if (headerScratchBytes.limit() < MAX_MHAS_PACKET_HEADER_SIZE) { } else if (headerScratchBytes.limit() < MAX_MHAS_PACKET_HEADER_SIZE) {
headerScratchBytes.setLimit(headerScratchBytes.limit() + 1); headerScratchBytes.setLimit(headerScratchBytes.limit() + 1);
// Signalize pending packet header processing
headerDataFinished = false;
} }
} else {
// Signalize pending packet header processing
headerDataFinished = false;
} }
break; break;
case STATE_READING_PACKET_PAYLOAD: case STATE_READING_PACKET_PAYLOAD: