+
star
If you have the watcher disabled you will need to re-scan this audiobook afterwards.
@@ -180,7 +199,13 @@ export default {
isFinished: false,
toneObject: null,
selectedTool: 'embed',
- isCancelingEncode: false
+ isCancelingEncode: false,
+ showEncodeOptions: false,
+ encodingOptions: {
+ bitrate: '64k',
+ channels: '2',
+ codec: 'aac'
+ }
}
},
watch: {
@@ -193,6 +218,12 @@ export default {
}
},
computed: {
+ isEmbedTool() {
+ return this.selectedTool === 'embed'
+ },
+ isM4BTool() {
+ return this.selectedTool === 'm4b'
+ },
libraryItemId() {
return this.libraryItem.id
},
@@ -260,9 +291,23 @@ export default {
})
},
encodeM4bClick() {
+ if (this.$refs.bitrateInput) this.$refs.bitrateInput.blur()
+ if (this.$refs.channelsInput) this.$refs.channelsInput.blur()
+ if (this.$refs.codecInput) this.$refs.codecInput.blur()
+
+ let queryStr = ''
+ if (this.showEncodeOptions) {
+ const options = []
+ if (this.encodingOptions.bitrate) options.push(`bitrate=${this.encodingOptions.bitrate}`)
+ if (this.encodingOptions.channels) options.push(`channels=${this.encodingOptions.channels}`)
+ if (this.encodingOptions.codec) options.push(`codec=${this.encodingOptions.codec}`)
+ if (options.length) {
+ queryStr = `?${options.join('&')}`
+ }
+ }
this.processing = true
this.$axios
- .$post(`/api/tools/item/${this.libraryItemId}/encode-m4b`)
+ .$post(`/api/tools/item/${this.libraryItemId}/encode-m4b${queryStr}`)
.then(() => {
console.log('Ab m4b merge started')
})
diff --git a/server/controllers/ToolsController.js b/server/controllers/ToolsController.js
index fad81c70..b0433b26 100644
--- a/server/controllers/ToolsController.js
+++ b/server/controllers/ToolsController.js
@@ -26,7 +26,8 @@ class ToolsController {
return res.status(500).send('Invalid audiobook: no audio tracks')
}
- this.abMergeManager.startAudiobookMerge(req.user, req.libraryItem)
+ const options = req.query || {}
+ this.abMergeManager.startAudiobookMerge(req.user, req.libraryItem, options)
res.sendStatus(200)
}
diff --git a/server/managers/AbMergeManager.js b/server/managers/AbMergeManager.js
index d5c33970..d59c284e 100644
--- a/server/managers/AbMergeManager.js
+++ b/server/managers/AbMergeManager.js
@@ -45,7 +45,7 @@ class AbMergeManager {
this.downloadDirPathExist = true
}
- async startAudiobookMerge(user, libraryItem) {
+ async startAudiobookMerge(user, libraryItem, options = {}) {
const task = new Task()
const audiobookDirname = Path.basename(libraryItem.path)
@@ -72,20 +72,28 @@ class AbMergeManager {
await fs.mkdir(taskData.itemCachePath)
}
- this.runAudiobookMerge(libraryItem, task)
+ this.runAudiobookMerge(libraryItem, task, options || {})
}
- async runAudiobookMerge(libraryItem, task) {
+ async runAudiobookMerge(libraryItem, task, encodingOptions) {
+ const audioBitrate = encodingOptions.bitrate || '64k'
+ const audioCodec = encodingOptions.codec || 'aac'
+ const audioChannels = encodingOptions.channels || 2
+
// If changing audio file type then encoding is needed
- var audioTracks = libraryItem.media.tracks
- var audioRequiresEncode = audioTracks[0].metadata.ext !== '.m4b'
- var firstTrackIsM4b = audioTracks[0].metadata.ext.toLowerCase() === '.m4b'
- var isOneTrack = audioTracks.length === 1
+ const audioTracks = libraryItem.media.tracks
+
+ // TODO: Updated in 2.2.11 to always encode even if merging multiple m4b. This is because just using the file extension as was being done before is not enough. This can be an option or do more to check if a concat is possible.
+ // const audioRequiresEncode = audioTracks[0].metadata.ext !== '.m4b'
+ const audioRequiresEncode = true
+
+ const firstTrackIsM4b = audioTracks[0].metadata.ext.toLowerCase() === '.m4b'
+ const isOneTrack = audioTracks.length === 1
const ffmpegInputs = []
if (!isOneTrack) {
- var concatFilePath = Path.join(task.data.itemCachePath, 'files.txt')
+ const concatFilePath = Path.join(task.data.itemCachePath, 'files.txt')
await writeConcatFile(audioTracks, concatFilePath)
ffmpegInputs.push({
input: concatFilePath,
@@ -99,15 +107,15 @@ class AbMergeManager {
}
const logLevel = process.env.NODE_ENV === 'production' ? 'error' : 'warning'
- var ffmpegOptions = [`-loglevel ${logLevel}`]
- var ffmpegOutputOptions = ['-f mp4']
+ let ffmpegOptions = [`-loglevel ${logLevel}`]
+ const ffmpegOutputOptions = ['-f mp4']
if (audioRequiresEncode) {
ffmpegOptions = ffmpegOptions.concat([
'-map 0:a',
- '-acodec aac',
- '-ac 2',
- '-b:a 64k'
+ `-acodec ${audioCodec}`,
+ `-ac ${audioChannels}`,
+ `-b:a ${audioBitrate}`
])
} else {
ffmpegOptions.push('-max_muxing_queue_size 1000')
@@ -119,7 +127,7 @@ class AbMergeManager {
}
}
- var toneJsonPath = null
+ let toneJsonPath = null
try {
toneJsonPath = Path.join(task.data.itemCachePath, 'metadata.json')
await toneHelpers.writeToneMetadataJsonFile(libraryItem, libraryItem.media.chapters, toneJsonPath, 1)
@@ -133,16 +141,16 @@ class AbMergeManager {
'TrackNumber': 1,
}
- var workerData = {
+ const workerData = {
inputs: ffmpegInputs,
options: ffmpegOptions,
outputOptions: ffmpegOutputOptions,
output: task.data.tempFilepath
}
- var worker = null
+ let worker = null
try {
- var workerPath = Path.join(global.appRoot, 'server/utils/downloadWorker.js')
+ const workerPath = Path.join(global.appRoot, 'server/utils/downloadWorker.js')
worker = new workerThreads.Worker(workerPath, { workerData })
} catch (error) {
Logger.error(`[AbMergeManager] Start worker thread failed`, error)