fix(TTML): Correctly handle multiple samples in a segment#8088
Conversation
julijane
force-pushed
the
fix-ttml-multiple-sample-issue-8087
branch
from
5f618b5 to
62877e1
Compare
theodab
added
type: bug
|
Incremental code coverage: 98.48% |
julijane
force-pushed
the
fix-ttml-multiple-sample-issue-8087
branch
from
62877e1 to
c1ffbd5
Compare
julijane
force-pushed
the
fix-ttml-multiple-sample-issue-8087
branch
from
c1ffbd5 to
862aec2
Compare
Fixes shaka-project#8087 Implements handling of multiple samples in a segment. Also fixes the testdata for the multiple MDAT test, as the prior data was invalid (not conforming to ISO14496-12).
julijane
force-pushed
the
fix-ttml-multiple-sample-issue-8087
branch
from
862aec2 to
d9900c7
Compare
|
Oops. When looking on my change again, I noticed I missed to change one line when I moved to a Map for the subSampleSizes as suggested by theodab. Just fixed that. Looks like that does not reset approvals here though? But also seems pipelines don't run again now? |
This is your first PR, I have to manually approve the tests. Sorry for the inconvenience! |
No worries, just wanted to point out that I had to make another change to the PR. One of the tests (Firefox on Windows) was failing also at the last run, but in WebVTT code, so not related to my change. |
Don't worry, it's just a bug that we have to update some screenshots, but that machine in the lab is not working right now, but I'll fix it in a few days. |
Fixes #8087 Implements handling of multiple samples in a MP4/ISOBMFF/DASH TTML segment/fragment. Such segments are allowed by ISO14496-12 and ISO23000-19. gpac creates such segments. The prior code just treated the full MDAT as one TTML XML document and tried to parse it in whole without accounting for sample(s). A testcase is included which was created by taking the testdata from ttml-segment.mp4 and splitting the subtitles into two independent TTML-XML documents, which then were put as individual samples. The testdata for the prior existing multiple MDAT testcase was invalid. It was created by taking the same ttml-segment.mp4 as a source and just duplicating the MDAT box, but without then also fixing the TRUN box. The duplicated data was thus not referenced. The test case still worked, because the prior code did not look at the TRUN box and the sample specification at all and just handled any full MDAT box = 1 sample. The testdata was replaced with a new file, which is basically the same as for the multiple samples case, but with the two samples split into two MDAT boxes.
Fixes #8087 Implements handling of multiple samples in a MP4/ISOBMFF/DASH TTML segment/fragment. Such segments are allowed by ISO14496-12 and ISO23000-19. gpac creates such segments. The prior code just treated the full MDAT as one TTML XML document and tried to parse it in whole without accounting for sample(s). A testcase is included which was created by taking the testdata from ttml-segment.mp4 and splitting the subtitles into two independent TTML-XML documents, which then were put as individual samples. The testdata for the prior existing multiple MDAT testcase was invalid. It was created by taking the same ttml-segment.mp4 as a source and just duplicating the MDAT box, but without then also fixing the TRUN box. The duplicated data was thus not referenced. The test case still worked, because the prior code did not look at the TRUN box and the sample specification at all and just handled any full MDAT box = 1 sample. The testdata was replaced with a new file, which is basically the same as for the multiple samples case, but with the two samples split into two MDAT boxes. Backported to v4.9.x
5 participants
Fixes #8087
Implements handling of multiple samples in a MP4/ISOBMFF/DASH TTML segment/fragment. Such segments are allowed by ISO14496-12 and ISO23000-19. gpac creates such segments. The prior code just treated the full MDAT as one TTML XML document and tried to parse it in whole without accounting for sample(s). A testcase is included which was created by taking the testdata from ttml-segment.mp4 and splitting the subtitles into two independent TTML-XML documents, which then were put as individual samples.
The testdata for the prior existing multiple MDAT testcase was invalid. It was created by taking the same ttml-segment.mp4 as a source and just duplicating the MDAT box, but without then also fixing the TRUN box. The duplicated data was thus not referenced. The test case still worked, because the prior code did not look at the TRUN box and the sample specification at all and just handled any full MDAT box = 1 sample. The testdata was replaced with a new file, which is basically the same as for the multiple samples case, but with the two samples split into two MDAT boxes.