diff --git a/src/index.ts b/src/index.ts index 42ebbbe..b5754a2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -202,21 +202,8 @@ export const makeTransmuxer = async ({ } return workerDestroy() }, - read: () =>{ - // console.log('read') - return workerRead() - }, + read: () => workerRead(), seek: (time: number) => workerSeek(Math.max(0, time) * 1000), - // seek: (time: number) => { - // console.log('seek', streamResultPromiseReject) - // if (streamResultPromiseReject) { - // console.log('cancel seek') - // streamResultPromiseReject(new Error('Seeking to a new position.')) - // reader?.cancel() - // console.log('cancelled seek') - // } - // return workerSeek(Math.max(0, time) * 1000) - // }, getInfo: () => getInfo() as Promise<{ input: MediaInfo, output: MediaInfo }> } diff --git a/src/test.ts b/src/test.ts index af41288..72520b4 100644 --- a/src/test.ts +++ b/src/test.ts @@ -88,7 +88,6 @@ fetch(VIDEO_URL, { headers: { Range: `bytes=0-1` } }) bufferSize: BUFFER_SIZE, length: contentLength, getStream: async (offset, size) => { - // console.log('get stream', offset, size, slow) if (slow && size !== BUFFER_SIZE) { await new Promise(resolve => setTimeout(resolve, 5000)) } @@ -130,41 +129,6 @@ fetch(VIDEO_URL, { headers: { Range: `bytes=0-1` } }) const video = document.createElement('video') video.width = 1440 - const allVideoEvents = [ - 'abort', - 'canplay', - 'canplaythrough', - 'durationchange', - 'emptied', - 'encrypted', - 'ended', - 'error', - 'interruptbegin', - 'interruptend', - 'loadeddata', - 'loadedmetadata', - 'loadstart', - 'mozaudioavailable', - 'pause', - 'play', - 'playing', - 'progress', - 'ratechange', - 'seeked', - 'seeking', - 'stalled', - 'suspend', - // 'timeupdate', - 'volumechange', - 'waiting' - ] - - // for (const event of allVideoEvents) { - // video.addEventListener(event, ev => { - // console.log('video event', event, ev) - // }) - // } - const seconds = document.createElement('div') video.controls = true video.volume = 0 @@ -344,38 +308,11 @@ fetch(VIDEO_URL, { headers: { Range: `bytes=0-1` } }) seconds.textContent = video.currentTime.toString() }, 100) - // setInterval(async () => { - // console.log('time ranges', getTimeRanges(), chunks) - // }, 1000) - setTimeout(async () => { - // await video.pause() - // video.currentTime = 587.618314 - // await new Promise(resolve => setTimeout(resolve, 500)) - // video.playbackRate = 5 - - // video.pause() - - // console.log('START SLOW SEEK') slow = true video.currentTime = 400 - // console.log('SLOW SEEK STARTED') await new Promise(resolve => setTimeout(resolve, 1000)) slow = false - // console.log('START END SEEK') video.currentTime = 300 - // console.log('END SEEK STARTED') - - - // await new Promise(resolve => setTimeout(resolve, 1000)) - // video.currentTime = 500 - // await new Promise(resolve => setTimeout(resolve, 1000)) - // video.currentTime = 600 - // await new Promise(resolve => setTimeout(resolve, 1000)) - // video.currentTime = 300 - // await new Promise(resolve => setTimeout(resolve, 1000)) - // video.currentTime = 534.953306 - // await new Promise(resolve => setTimeout(resolve, 1000)) - // video.currentTime = 100 }, 2_000) }) diff --git a/src/utils.ts b/src/utils.ts index 5090bc3..301c1ae 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -142,14 +142,10 @@ export const toStreamChunkSize = (SIZE: number) => (stream: ReadableStream) => this.reader = stream.getReader() }, async pull(controller) { - // console.log('pull', this.reader, this.leftOverData?.byteLength) const { leftOverData }: { leftOverData: Uint8Array | undefined } = this const accumulate = async ({ buffer = new Uint8Array(SIZE), currentSize = 0 } = {}): Promise<{ buffer?: Uint8Array, currentSize?: number, done: boolean }> => { - // console.log('accumulate') const { value: newBuffer, done } = await this.reader!.read() - // console.log('accumulate2', newBuffer, done) - if (currentSize === 0 && leftOverData) { buffer.set(leftOverData) currentSize += leftOverData.byteLength