Re-Organize demuxing

video-dev · Jul 7, 2023 · 73d1592 · 73d1592
1 parent fdea0b0
commit 73d1592
Show file tree

Hide file tree

Showing 13 changed files with 449 additions and 403 deletions.
diff --git a/src/demux/aacdemuxer.ts → src/demux/audio/aacdemuxer.ts b/src/demux/aacdemuxer.ts → src/demux/audio/aacdemuxer.ts
@@ -2,11 +2,11 @@
  * AAC demuxer
  */
 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 * as ADTS from '../adts';
+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;

diff --git a/src/demux/ac3-demuxer.ts → src/demux/audio/ac3-demuxer.ts b/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;

diff --git a/src/demux/base-audio-demuxer.ts → src/demux/audio/base-audio-demuxer.ts b/src/demux/base-audio-demuxer.ts → src/demux/audio/base-audio-demuxer.ts
@@ -1,4 +1,4 @@
-import * as ID3 from '../demux/id3';
+import * as ID3 from '../id3';
 import {
   DemuxerResult,
   Demuxer,
@@ -9,11 +9,11 @@ import {
   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;

diff --git a/src/demux/mp3demuxer.ts → src/demux/audio/mp3demuxer.ts b/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 {

diff --git a/src/demux/mpegaudio.ts → src/demux/audio/mpegaudio.ts b/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;
 

diff --git a/src/demux/transmuxer.ts b/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';