diff --git a/packages/server/src/audio-encoder.ts b/packages/server/src/audio-encoder.ts index bc84184..2ed051e 100644 --- a/packages/server/src/audio-encoder.ts +++ b/packages/server/src/audio-encoder.ts @@ -1,10 +1,9 @@ -import { AudioCodec, AudioSample, CustomAudioEncoder, MaybePromise, QUALITY_MEDIUM } from 'mediabunny'; +import { AudioCodec, AudioSample, CustomAudioEncoder, MaybePromise, QUALITY_MEDIUM, EncodedPacket } from 'mediabunny'; import * as NodeAv from 'node-av'; import { CODEC_TO_CODEC_ID, fromAudioSampleFormat, getChannelLayout } from './misc'; import { assert, toUint8Array } from '../../../src/misc'; import { NodeAvFrameAudioSampleResource } from './audio-sample'; import { AdtsHeaderTemplate, buildAdtsHeaderTemplate, parseAacAudioSpecificConfig } from '../../../shared/aac-misc'; -import { EncodedPacket } from 'mediabunny'; const AAC_SAMPLE_RATES = [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350]; diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index ca6bcba..770de18 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -4,7 +4,7 @@ import { NodeAvVideoDecoder } from './video-decoder'; import { NodeAvVideoEncoder } from './video-encoder'; import { NodeAvAudioDecoder } from './audio-decoder'; import { NodeAvAudioEncoder } from './audio-encoder'; -import { transformSample } from './video-sample'; +import { transformVideoSample } from './video-sample'; const SERVER_LOADED_SYMBOL = Symbol.for('@mediabunny/server loaded'); if ((globalThis as Record)[SERVER_LOADED_SYMBOL]) { @@ -34,5 +34,5 @@ export const registerMediabunnyServer = () => { registerDecoder(NodeAvAudioDecoder); registerEncoder(NodeAvAudioEncoder); - registerVideoSampleTransformer(transformSample); + registerVideoSampleTransformer(transformVideoSample); }; diff --git a/packages/server/src/video-sample.ts b/packages/server/src/video-sample.ts index 3d05459..411dafa 100644 --- a/packages/server/src/video-sample.ts +++ b/packages/server/src/video-sample.ts @@ -5,10 +5,12 @@ import { VideoSampleColorSpace, SetRequired, VideoSampleInit, + VideoSample, + VideoDataPlane, + VideoSampleTransformationDescription, } from 'mediabunny'; import * as NodeAv from 'node-av'; import { MaybePromise, toUint8Array } from '../../../src/misc'; -import { VideoSampleTransformationDescription, VideoDataPlane, VideoSample } from '../../../src/sample'; import { toPixelFormat, unmapColorPrimaries, @@ -165,7 +167,7 @@ export const copyVideoSampleToAvFrame = async (sample: VideoSample, frame: NodeA return lastBuffer; }; -export const transformSample = async ( +export const transformVideoSample = async ( sample: VideoSample, description: VideoSampleTransformationDescription, ): Promise => {