Prepare for Supporting Additional Video Codecs (#5634)

* Rename types and variables for generic video codec handling

* Re-Organize demuxing

src/demux/aacdemuxer.ts → src/demux/audio/aacdemuxer.ts

@@ -3,10 +3,10 @@
  */
 import BaseAudioDemuxer from './base-audio-demuxer';
 import * as ADTS from './adts';
-import { logger } from '../utils/logger';
-import * as ID3 from '../demux/id3';
-import type { HlsEventEmitter } from '../events';
-import type { HlsConfig } from '../config';
+import { logger } from '../../utils/logger';
+import * as ID3 from '../id3';
+import type { HlsEventEmitter } from '../../events';
+import type { HlsConfig } from '../../config';
 
 class AACDemuxer extends BaseAudioDemuxer {
   private readonly observer: HlsEventEmitter;

src/demux/ac3-demuxer.ts → src/demux/audio/ac3-demuxer.ts

@@ -1,7 +1,7 @@
 import BaseAudioDemuxer from './base-audio-demuxer';
-import { getID3Data, getTimeStamp } from './id3';
-import type { HlsEventEmitter } from '../events';
-import type { AudioFrame, DemuxedAudioTrack } from '../types/demuxer';
+import { getID3Data, getTimeStamp } from '../id3';
+import type { HlsEventEmitter } from '../../events';
+import type { AudioFrame, DemuxedAudioTrack } from '../../types/demuxer';
 
 export class AC3Demuxer extends BaseAudioDemuxer {
   private readonly observer: HlsEventEmitter;

src/demux/adts.ts → src/demux/audio/adts.ts

@@ -2,15 +2,15 @@
  * ADTS parser helper
  * @link https://wiki.multimedia.cx/index.php?title=ADTS
  */
-import { logger } from '../utils/logger';
-import { ErrorTypes, ErrorDetails } from '../errors';
-import type { HlsEventEmitter } from '../events';
-import { Events } from '../events';
+import { logger } from '../../utils/logger';
+import { ErrorTypes, ErrorDetails } from '../../errors';
+import type { HlsEventEmitter } from '../../events';
+import { Events } from '../../events';
 import type {
   DemuxedAudioTrack,
   AudioFrame,
   AudioSample,
-} from '../types/demuxer';
+} from '../../types/demuxer';
 
 type AudioConfig = {
   config: number[];

src/demux/base-audio-demuxer.ts → src/demux/audio/base-audio-demuxer.ts

@@ -1,19 +1,19 @@
-import * as ID3 from '../demux/id3';
+import * as ID3 from '../id3';
 import {
   DemuxerResult,
   Demuxer,
   DemuxedAudioTrack,
   AudioFrame,
   DemuxedMetadataTrack,
-  DemuxedVideoTrack,
+  DemuxedVideoTrackBase,
   DemuxedUserdataTrack,
   KeyData,
   MetadataSchema,
-} from '../types/demuxer';
-import { dummyTrack } from './dummy-demuxed-track';
-import { appendUint8Array } from '../utils/mp4-tools';
-import { sliceUint8 } from '../utils/typed-array';
-import { RationalTimestamp } from '../utils/timescale-conversion';
+} from '../../types/demuxer';
+import { dummyTrack } from '../dummy-demuxed-track';
+import { appendUint8Array } from '../../utils/mp4-tools';
+import { sliceUint8 } from '../../utils/typed-array';
+import { RationalTimestamp } from '../../utils/timescale-conversion';
 
 class BaseAudioDemuxer implements Demuxer {
   protected _audioTrack!: DemuxedAudioTrack;
@@ -138,7 +138,7 @@ class BaseAudioDemuxer implements Demuxer {
 
     return {
       audioTrack: track,
-      videoTrack: dummyTrack() as DemuxedVideoTrack,
+      videoTrack: dummyTrack() as DemuxedVideoTrackBase,
       id3Track,
       textTrack: dummyTrack() as DemuxedUserdataTrack,
     };
@@ -164,7 +164,7 @@ class BaseAudioDemuxer implements Demuxer {
 
     return {
       audioTrack: this._audioTrack,
-      videoTrack: dummyTrack() as DemuxedVideoTrack,
+      videoTrack: dummyTrack() as DemuxedVideoTrackBase,
       id3Track: this._id3Track,
       textTrack: dummyTrack() as DemuxedUserdataTrack,
     };

src/demux/mp3demuxer.ts → src/demux/audio/mp3demuxer.ts

@@ -2,8 +2,8 @@
  * MP3 demuxer
  */
 import BaseAudioDemuxer from './base-audio-demuxer';
-import * as ID3 from '../demux/id3';
-import { logger } from '../utils/logger';
+import * as ID3 from '../id3';
+import { logger } from '../../utils/logger';
 import * as MpegAudio from './mpegaudio';
 
 class MP3Demuxer extends BaseAudioDemuxer {

src/demux/mpegaudio.ts → src/demux/audio/mpegaudio.ts

@@ -1,7 +1,7 @@
 /**
  *  MPEG parser helper
  */
-import { DemuxedAudioTrack } from '../types/demuxer';
+import { DemuxedAudioTrack } from '../../types/demuxer';
 
 let chromeVersion: number | null = null;
 

src/demux/sample-aes.ts

@@ -7,9 +7,9 @@ import Decrypter from '../crypt/decrypter';
 import { HlsEventEmitter } from '../events';
 import type {
   AudioSample,
-  AvcSample,
-  AvcSampleUnit,
-  DemuxedVideoTrack,
+  VideoSample,
+  VideoSampleUnit,
+  DemuxedVideoTrackBase,
   KeyData,
 } from '../types/demuxer';
 import { discardEPB } from '../utils/mp4-tools';
@@ -128,11 +128,11 @@ class SampleAesDecrypter {
   }
 
   decryptAvcSample(
-    samples: AvcSample[],
+    samples: VideoSample[],
     sampleIndex: number,
     unitIndex: number,
     callback: () => void,
-    curUnit: AvcSampleUnit
+    curUnit: VideoSampleUnit
   ) {
     const decodedData = discardEPB(curUnit.data);
     const encryptedData = this.getAvcEncryptedData(decodedData);
@@ -149,7 +149,7 @@ class SampleAesDecrypter {
   }
 
   decryptAvcSamples(
-    samples: DemuxedVideoTrack['samples'],
+    samples: DemuxedVideoTrackBase['samples'],
     sampleIndex: number,
     unitIndex: number,
     callback: () => void

src/demux/transmuxer.ts

@@ -2,11 +2,11 @@ import type { HlsEventEmitter } from '../events';
 import { Events } from '../events';
 import { ErrorTypes, ErrorDetails } from '../errors';
 import Decrypter from '../crypt/decrypter';
-import AACDemuxer from '../demux/aacdemuxer';
+import AACDemuxer from './audio/aacdemuxer';
 import MP4Demuxer from '../demux/mp4demuxer';
 import TSDemuxer, { TypeSupported } from '../demux/tsdemuxer';
-import MP3Demuxer from '../demux/mp3demuxer';
-import { AC3Demuxer } from './ac3-demuxer';
+import MP3Demuxer from './audio/mp3demuxer';
+import { AC3Demuxer } from './audio/ac3-demuxer';
 import MP4Remuxer from '../remux/mp4-remuxer';
 import PassThroughRemuxer from '../remux/passthrough-remuxer';
 import { logger } from '../utils/logger';