ActivityPub-federated video streaming platform using P2P directly in your web browser
Correctly detect audio copy
Chocobozzz86bee302f9d3
diff --git a/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts b/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.tsindex 0adddfda18..16681c0aec 100644--- a/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts+++ b/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts@@ -3,7 +3,7 @@ import {buildStreamSuffix,ffprobePromise,getAudioStream,- getMaxAudioKBitrate,+ getCopyInfoOrMaxAudioKBitrate,getVideoStream,getVideoStreamBitrate,getVideoStreamDimensionsInfo,@@ -53,7 +53,7 @@ const defaultAACOptionsBuilder: EncoderOptionsBuilder = async ({ input, streamNuconst audioCodecName = parsedAudio.audioStream['codec_name']- const bitrate = getMaxAudioKBitrate(audioCodecName, parsedAudio.bitrate)+ const bitrate = getCopyInfoOrMaxAudioKBitrate(audioCodecName, parsedAudio.bitrate)// Force stereo as it causes some issues with HLS playback in Chromeconst base = [ '-channel_layout', 'stereo' ]@@ -117,8 +117,8 @@ export async function canDoQuickAudioTranscode (path: string, probe?: FfprobeDatconst audioBitrate = parsedAudio.bitrateif (!audioBitrate) return false- const maxAudioBitrate = getMaxAudioKBitrate('aac', audioBitrate) * 1000- if (maxAudioBitrate !== -1 && audioBitrate > maxAudioBitrate) return false+ const canCopy = getCopyInfoOrMaxAudioKBitrate('aac', audioBitrate) === -1+ if (!canCopy) return falseconst channelLayout = parsedAudio.audioStream['channel_layout']// Causes playback issues with Chromediff --git a/packages/ffmpeg/src/ffprobe.ts b/packages/ffmpeg/src/ffprobe.tsindex ad0f25da4a..bedb077b26 100644--- a/packages/ffmpeg/src/ffprobe.ts+++ b/packages/ffmpeg/src/ffprobe.ts@@ -95,7 +95,7 @@ export async function getAudioStream (videoPath: string, existingProbe?: Ffprobereturn { absolutePath: data.format.filename }}-export function getMaxAudioKBitrate (type: string, bitrate: number) {+export function getCopyInfoOrMaxAudioKBitrate (type: string, bitrate: number) {const maxKBitrate = 384// If we did not manage to get the bitrate, use an average value