arcodange/mediabunny
1
0
Fork 0
mirror of https://github.com/arcodange-org/mediabunny.git synced 2026-09-30 12:23:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove createInputFrom, changed meaning of PathedSource, add CustomPathedSource

Browse Source
This commit is contained in:
Vanilagy
2026-04-21 13:22:10 +02:00
parent d12c48562c
commit 2b3e5f45c6
16 changed files with 349 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hls/hls-demuxer.ts
+9 -9
View File
@@ -31,8 +31,8 @@ import {
TAG_STREAM_INF,
} from './hls-misc';
import { HlsSegmentedInput } from './hls-segmented-input';
import { PathedSource } from '../source';
import { SegmentedInputTrackDeclaration } from '../segmented-input';
import { PathedSource } from '../source';
type InternalTrack = {
id: number;
@@ -76,8 +76,8 @@ export class HlsDemuxer extends Demuxer {
readMetadata() {
return this.metadataPromise ??= (async () => {
assert(this.input._source instanceof PathedSource);
const source = this.input._source;
assert(this.input._rootSource instanceof PathedSource);
const { rootPath } = this.input._rootSource;
const slice = await this.input._reader.requestEntireFile();
assert(slice);
@@ -107,7 +107,7 @@ export class HlsDemuxer extends Demuxer {
throw new Error('Incorrect M3U8 file; a line must follow the #EXT-X-STREAM-INF tag.');
}
const fullPath = joinPaths(source.rootPath, playlistPath);
const fullPath = joinPaths(rootPath, playlistPath);
const attributes = new AttributeList(line.slice(TAG_STREAM_INF.length));
const bandwidth = attributes.getAsNumber('bandwidth');
@@ -142,7 +142,7 @@ export class HlsDemuxer extends Demuxer {
);
}
const fullPath = joinPaths(source.rootPath, playlistPath);
const fullPath = joinPaths(rootPath, playlistPath);
variantStreams.push({
fullPath,
@@ -170,7 +170,7 @@ export class HlsDemuxer extends Demuxer {
let fullPath: string | null = null;
const uri = attributes.get('uri');
if (uri !== null) {
fullPath = joinPaths(source.rootPath, uri);
fullPath = joinPaths(rootPath, uri);
}
mediaTags.push({ fullPath, attributes, lineNumber: i });
@@ -178,7 +178,7 @@ export class HlsDemuxer extends Demuxer {
// iFramesOnlyTagFound = true;
} else if (line.startsWith(TAG_EXTINF)) {
// This is a media playlist, not a master playlist
const segmentedInput = new HlsSegmentedInput(this, source.rootPath, null, lines);
const segmentedInput = new HlsSegmentedInput(this, rootPath, null, lines);
this.segmentedInputs = [segmentedInput];
this.hasMasterPlaylist = false;
@@ -258,7 +258,7 @@ export class HlsDemuxer extends Demuxer {
break outer;
}
const fullPath = joinPaths(source.rootPath, uri);
const fullPath = joinPaths(rootPath, uri);
const segmentedInput = this.getSegmentedInputForPath(fullPath);
const trackBackings = await segmentedInput.getTrackBackings();
const videoTrack = trackBackings.find(x => x.getType() === 'video');
@@ -299,7 +299,7 @@ export class HlsDemuxer extends Demuxer {
break outer;
}
const fullPath = joinPaths(source.rootPath, uri);
const fullPath = joinPaths(rootPath, uri);
const segmentedInput = this.getSegmentedInputForPath(fullPath);
const trackBackings = await segmentedInput.getTrackBackings();
const audioTrack = trackBackings.find(x => x.getType() === 'audio');
src/hls/hls-segmented-input.ts
+3 -7
View File
@@ -11,7 +11,7 @@ import { ENCRYPTION_KEY_CACHE_GROUP, Input } from '../input';
import { Segment, SegmentedInput, SegmentedInputTrackDeclaration, SegmentRetrievalOptions } from '../segmented-input';
import { toDataView, joinPaths, last, assert, binarySearchLessOrEqual, arrayArgmin, wait } from '../misc';
import { readAllLines, readBytes, Reader } from '../reader';
import { PathedSource, ReadableStreamSource, SourceRef } from '../source';
import { CustomPathedSource, ReadableStreamSource, SourceRef } from '../source';
import { HlsDemuxer } from './hls-demuxer';
import {
AttributeList,
@@ -540,14 +540,10 @@ export class HlsSegmentedInput extends SegmentedInput {
}
const input = new Input({
source: new PathedSource(
source: new CustomPathedSource(
hlsSegment.location.path,
async (request) => {
if (request.path !== hlsSegment.location.path) {
// This code technically allows for recursive .m3u8 files for example. Uncached because the
// added input adds its own layer of caching, so here we just do a passthrough.
return this.input._getSourceUncached(request);
}
assert(request.isRoot); // Shouldn't fail since we don't allow recursive HLS
let ref: SourceRef;
const needsSlice = hlsSegment.location.offset > 0 || hlsSegment.location.length !== null;