Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix sidx duration #4849

Merged
merged 5 commits into from
Aug 16, 2022
Merged

fix sidx duration #4849

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92d96fa
fix sidx duration when using multiple sidx atoms per segment
nklhtv Aug 15, 2022
fee73fe
parseSegmentIndex refactored to be more cohesive
nklhtv Aug 15, 2022
d3aa4a4
Merge branch 'master' into sidx-duration
nklhtv Aug 15, 2022
b8809eb
get moov end offset only for the init segment
nklhtv Aug 16, 2022
ffd0ef6
move the comment about missing sidx before the first return
nklhtv Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/loader/playlist-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import { Events } from '../events';
import { ErrorDetails, ErrorTypes } from '../errors';
import { logger } from '../utils/logger';
import { parseSegmentIndex } from '../utils/mp4-tools';
import { parseSegmentIndex, findBox } from '../utils/mp4-tools';
import M3U8Parser from './m3u8-parser';
import type { LevelParsed } from '../types/level';
import type {
Expand Down Expand Up @@ -543,9 +543,14 @@ class PlaylistLoader {
response: LoaderResponse,
context: PlaylistLoaderContext
): void {
const sidxInfo = parseSegmentIndex(
new Uint8Array(response.data as ArrayBuffer)
);
const data = new Uint8Array(response.data as ArrayBuffer);
const moovBox = findBox(data, ['moov'])[0];
const moovEndOffset = moovBox ? moovBox.length : null; // we need this in case we need to chop of garbage of the end of current data
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these moovBox, moovEndOffset lines be moved into the if (frag.initSegment) { block below since they are not used otherwise?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Ive also deleted the comment because i think its obvious what are we trying to do now.

const sidxBox = findBox(data, ['sidx'])[0];
if (!sidxBox) {
return;
}
const sidxInfo = parseSegmentIndex(sidxBox);
// if provided fragment does not contain sidx, early return
if (!sidxInfo) {
return;
Expand All @@ -564,7 +569,7 @@ class PlaylistLoader {
);
}
if (frag.initSegment) {
frag.initSegment.setByteRange(String(sidxInfo.moovEndOffset) + '@0');
frag.initSegment.setByteRange(String(moovEndOffset) + '@0');
}
});
}
Expand Down
33 changes: 13 additions & 20 deletions src/utils/mp4-tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,10 @@ type SidxInfo = {
version: number;
referencesCount: number;
references: any[];
moovEndOffset: number | null;
};

export function parseSegmentIndex(initSegment: Uint8Array): SidxInfo | null {
const moovBox = findBox(initSegment, ['moov']);
const moov = moovBox[0];
const moovEndOffset = moov ? moov.length : null; // we need this in case we need to chop of garbage of the end of current data

const sidxBox = findBox(initSegment, ['sidx']);

if (!sidxBox || !sidxBox[0]) {
return null;
}

export function parseSegmentIndex(sidx: Uint8Array): SidxInfo | null {
const references: any[] = [];
const sidx = sidxBox[0];

const version = sidx[0];

Expand Down Expand Up @@ -179,7 +167,6 @@ export function parseSegmentIndex(initSegment: Uint8Array): SidxInfo | null {
version,
referencesCount,
references,
moovEndOffset,
};
}

Expand Down Expand Up @@ -409,13 +396,19 @@ export function getDuration(data: Uint8Array, initData: InitData) {
}
if (videoDuration === 0 && audioDuration === 0) {
// If duration samples are not available in the traf use sidx subsegment_duration
const sidx = parseSegmentIndex(data);
if (sidx?.references) {
return sidx.references.reduce(
(dur, ref) => dur + ref.info.duration || 0,
0
);
let sidxDuration = 0;
const sidxs = findBox(data, ['sidx']);
for (let i = 0; i < sidxs.length; i++) {
const sidx = parseSegmentIndex(sidxs[i]);
if (sidx?.references) {
sidxDuration += sidx.references.reduce(
(dur, ref) => dur + ref.info.duration || 0,
0
);
}
}

return sidxDuration;
}
if (videoDuration) {
return videoDuration;
Expand Down