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

H264Reader: Add missing propagation of max_num_reorder_frames

Browse source 
This method is already called below in the
`else if (sps.isCompleted())` block which applies when
`hasOutputFormat == true`, but this is only ever entered if we are
parsing SPS and PPS NAL units **after** we've emitted a format, which
is only the case if
`DefaultTsPayloadReaderFactory.FLAG_DETECT_ACCESS_UNITS` is set (which
it isn't by default).

The equivalent call in `H265Reader` is already inside the
`if (!hasOutputFormat)` block, so doesn't need a similar fix.

#cherrypick

PiperOrigin-RevId: 689809529
(cherry picked from commit 39c734963f)
This commit is contained in:
ibaker 2024-10-25 09:10:29 -07:00 committed by Iván Budnik
parent 895c69c08f
commit 8d8a5211dd
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASENOTES.md
View file

@ -18,6 +18,9 @@
* Audio: * Audio:
* Video: * Video:
* Text: * Text:
* Fix CEA-608 subtitles in H.264 MPEG-TS streams not being output (this
was broken in `1.5.0-alpha01` by
https://github.com/androidx/media/commit/03a205f220ecf7681f85f8a752227e3986e257ff).
* Metadata: * Metadata:
* Image: * Image:
* DRM: * DRM:

1
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java
View file

@ -233,6 +233,7 @@ public final class H264Reader implements ElementaryStreamReader {
.setMaxNumReorderSamples(spsData.maxNumReorderFrames) .setMaxNumReorderSamples(spsData.maxNumReorderFrames)
.build()); .build());
hasOutputFormat = true; hasOutputFormat = true;
seiReader.setReorderingQueueSize(spsData.maxNumReorderFrames);
sampleReader.putSps(spsData); sampleReader.putSps(spsData);
sampleReader.putPps(ppsData); sampleReader.putPps(ppsData);
sps.reset(); sps.reset();