From a4c7cc0d354de3d551283b87142c27b27b28b769 Mon Sep 17 00:00:00 2001 From: dumbmoron Date: Tue, 17 Oct 2023 16:48:51 +0000 Subject: [PATCH 1/3] youtube: unify quality matching --- src/modules/processing/services/youtube.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js index 4e58e5eb..342cd93e 100644 --- a/src/modules/processing/services/youtube.js +++ b/src/modules/processing/services/youtube.js @@ -90,12 +90,12 @@ export default async function(o) { filenameAttributes: filenameAttributes, fileMetadata: fileMetadata } - let checkSingle = (i) => ((qual(i) === quality || qual(i) === bestQuality) && i["mime_type"].includes(c[o.format].codec)), - checkBestVideo = (i) => (i["has_video"] && !i["has_audio"] && qual(i) === bestQuality), - checkRightVideo = (i) => (i["has_video"] && !i["has_audio"] && qual(i) === quality); + const matchingQuality = Number(quality) > Number(bestQuality) ? bestQuality : quality, + checkSingle = i => qual(i) === matchingQuality && i.mime_type.includes(c[o.format].codec), + checkRender = i => i.has_video && !i.has_audio && qual(i) === matchingQuality; if (!o.isAudioOnly && !o.isAudioMuted && o.format === 'h264') { - let single = info.streaming_data.formats.find(i => checkSingle(i)); + let single = info.streaming_data.formats.find(checkSingle); if (single) { filenameAttributes.qualityLabel = single.quality_label; filenameAttributes.resolution = `${single.width}x${single.height}`; @@ -110,7 +110,7 @@ export default async function(o) { } } - let video = adaptive_formats.find(i => ((Number(quality) > Number(bestQuality)) ? checkBestVideo(i) : checkRightVideo(i))); + let video = adaptive_formats.find(checkRender); if (video && audio) { filenameAttributes.qualityLabel = video.quality_label; filenameAttributes.resolution = `${video.width}x${video.height}`; From 946bec68c149a55951690d2c2b5e47d2fc09e3b9 Mon Sep 17 00:00:00 2001 From: dumbmoron Date: Tue, 17 Oct 2023 16:54:46 +0000 Subject: [PATCH 2/3] youtube: slight cleanup & deduplication --- src/modules/processing/services/youtube.js | 39 ++++++++++------------ 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js index 342cd93e..2efc4681 100644 --- a/src/modules/processing/services/youtube.js +++ b/src/modules/processing/services/youtube.js @@ -92,35 +92,30 @@ export default async function(o) { } const matchingQuality = Number(quality) > Number(bestQuality) ? bestQuality : quality, checkSingle = i => qual(i) === matchingQuality && i.mime_type.includes(c[o.format].codec), - checkRender = i => i.has_video && !i.has_audio && qual(i) === matchingQuality; + checkRender = i => qual(i) === matchingQuality && i.has_video && !i.has_audio; + let match, type, urls; if (!o.isAudioOnly && !o.isAudioMuted && o.format === 'h264') { - let single = info.streaming_data.formats.find(checkSingle); - if (single) { - filenameAttributes.qualityLabel = single.quality_label; - filenameAttributes.resolution = `${single.width}x${single.height}`; - filenameAttributes.extension = c[o.format].container; - filenameAttributes.youtubeFormat = o.format; - return { - type: "bridge", - urls: single.url, - filenameAttributes: filenameAttributes, - fileMetadata: fileMetadata - } - } + match = info.streaming_data.formats.find(checkSingle); + type = "bridge"; + urls = match?.url; } - let video = adaptive_formats.find(checkRender); - if (video && audio) { - filenameAttributes.qualityLabel = video.quality_label; - filenameAttributes.resolution = `${video.width}x${video.height}`; + const video = adaptive_formats.find(checkRender); + if (!match && video) { + match = video; + type = "render"; + urls = [video.url, audio.url]; + } + + if (match) { + filenameAttributes.qualityLabel = match.quality_label; + filenameAttributes.resolution = `${match.width}x${match.height}`; filenameAttributes.extension = c[o.format].container; filenameAttributes.youtubeFormat = o.format; return { - type: "render", - urls: [video.url, audio.url], - filenameAttributes: filenameAttributes, - fileMetadata: fileMetadata + type, urls, + filenameAttributes, fileMetadata } } From e85b2ace1415ca01b5d7f5f988b91f5cd974f21f Mon Sep 17 00:00:00 2001 From: wukko Date: Wed, 31 Jan 2024 17:10:02 +0600 Subject: [PATCH 3/3] youtube: clean up --- src/modules/processing/services/youtube.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/modules/processing/services/youtube.js b/src/modules/processing/services/youtube.js index 2efc4681..aa1d90e5 100644 --- a/src/modules/processing/services/youtube.js +++ b/src/modules/processing/services/youtube.js @@ -40,22 +40,22 @@ export default async function(o) { if (info.basic_info.is_live) return { error: 'ErrorLiveVideo' }; let bestQuality, hasAudio, adaptive_formats = info.streaming_data.adaptive_formats.filter(e => - e["mime_type"].includes(c[o.format].codec) || e["mime_type"].includes(c[o.format].aCodec) + e.mime_type.includes(c[o.format].codec) || e.mime_type.includes(c[o.format].aCodec) ).sort((a, b) => Number(b.bitrate) - Number(a.bitrate)); - bestQuality = adaptive_formats.find(i => i["has_video"]); - hasAudio = adaptive_formats.find(i => i["has_audio"]); + bestQuality = adaptive_formats.find(i => i.has_video); + hasAudio = adaptive_formats.find(i => i.has_audio); if (bestQuality) bestQuality = qual(bestQuality); if (!bestQuality && !o.isAudioOnly || !hasAudio) return { error: 'ErrorYTTryOtherCodec' }; if (info.basic_info.duration > maxVideoDuration / 1000) return { error: ['ErrorLengthLimit', maxVideoDuration / 60000] }; - let checkBestAudio = (i) => (i["has_audio"] && !i["has_video"]), - audio = adaptive_formats.find(i => checkBestAudio(i) && !i["is_dubbed"]); + let checkBestAudio = (i) => (i.has_audio && !i.has_video), + audio = adaptive_formats.find(i => checkBestAudio(i) && !i.is_dubbed); if (o.dubLang) { let dubbedAudio = adaptive_formats.find(i => - checkBestAudio(i) && i["language"] === o.dubLang && i["audio_track"] && !i["audio_track"].audio_is_default + checkBestAudio(i) && i.language === o.dubLang && i.audio_track && !i.audio_track.audio_is_default ); if (dubbedAudio) { audio = dubbedAudio; @@ -114,8 +114,10 @@ export default async function(o) { filenameAttributes.extension = c[o.format].container; filenameAttributes.youtubeFormat = o.format; return { - type, urls, - filenameAttributes, fileMetadata + type, + urls, + filenameAttributes, + fileMetadata } }