Fix transcoding resolutions when audio is enabled
This commit is contained in:
parent
18d9858109
commit
7d5d7f22ff
|
@ -290,6 +290,23 @@ describe('Test video transcoding limits', function () {
|
||||||
expect(video.files[0].resolution.id).to.equal(720)
|
expect(video.files[0].resolution.id).to.equal(720)
|
||||||
expect(hlsFiles[0].resolution.id).to.equal(720)
|
expect(hlsFiles[0].resolution.id).to.equal(720)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('Should keep input resolution if only upper resolutions are enabled', async function () {
|
||||||
|
this.timeout(120_000)
|
||||||
|
|
||||||
|
await servers[0].config.enableTranscoding({ resolutions: [ 0, 1080 ], keepOriginal: false })
|
||||||
|
|
||||||
|
const { uuid } = await servers[0].videos.quickUpload({ name: 'video', fixture: 'video_short.webm' })
|
||||||
|
await waitJobs(servers)
|
||||||
|
|
||||||
|
const video = await servers[0].videos.get({ id: uuid })
|
||||||
|
const hlsFiles = video.streamingPlaylists[0].files
|
||||||
|
|
||||||
|
expect(video.files).to.have.lengthOf(2)
|
||||||
|
expect(hlsFiles).to.have.lengthOf(2)
|
||||||
|
|
||||||
|
expect(getAllFiles(video).map(f => f.resolution.id)).to.have.members([ 720, 720, 0, 0 ])
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
after(async function () {
|
after(async function () {
|
||||||
|
|
|
@ -16,7 +16,10 @@ export function buildOriginalFileResolution (inputResolution: number) {
|
||||||
hasAudio: true
|
hasAudio: true
|
||||||
})
|
})
|
||||||
|
|
||||||
if (resolutions.length === 0) {
|
if (
|
||||||
|
resolutions.length === 0 ||
|
||||||
|
(resolutions.length === 1 && resolutions[0] === VideoResolution.H_NOVIDEO)
|
||||||
|
) {
|
||||||
return toEven(inputResolution)
|
return toEven(inputResolution)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +61,7 @@ export function computeResolutionsToTranscode (options: {
|
||||||
if (input < resolution) continue
|
if (input < resolution) continue
|
||||||
// We only want lower resolutions than input file
|
// We only want lower resolutions than input file
|
||||||
if (strictLower && input === resolution) continue
|
if (strictLower && input === resolution) continue
|
||||||
// Audio resolutio but no audio in the video
|
// Audio resolution but no audio in the video
|
||||||
if (resolution === VideoResolution.H_NOVIDEO && !hasAudio) continue
|
if (resolution === VideoResolution.H_NOVIDEO && !hasAudio) continue
|
||||||
|
|
||||||
resolutionsEnabled.add(resolution)
|
resolutionsEnabled.add(resolution)
|
||||||
|
|
Loading…
Reference in New Issue