Skip to content
This repository has been archived by the owner on Dec 23, 2022. It is now read-only.

Use new (2015) syntax for setting default streams #136

Merged
merged 4 commits into from
Oct 12, 2019
Merged

Use new (2015) syntax for setting default streams #136

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4c4159
Use new (2015) syntax for setting default audio track
mjc Sep 24, 2019
6fe44eb
Attempt the same adjustment for subtitles
mjc Sep 24, 2019
d8e057f
Workaround for ffmpeg not remapping channels for libopus automatically
upekshapriya Dec 20, 2018
c855708
adjust syntax for setting subtitle title
mjc Sep 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/classes/video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ class Video {

// Set default audio
if (_self.defaultAudioIndex && _self.defaultAudioIndex === stream.index) {
_self.ffmpegCommand.outputOptions('-metadata:s:' + stream.input + ':' + stream.index, 'DISPOSITION:default=1');
_self.ffmpegCommand.outputOptions('-disposition:a:' + stream.index, 'default');
}

let extraInfo = {
Expand Down Expand Up @@ -761,9 +761,9 @@ class Video {
_self.ffmpegCommand.outputOptions('-map', stream.input + ':' + stream.index);
if (!helpers.getStreamTitle(stream) && _self.options.normalizeLevel >= 2) {
_self.encoder.logger.alert('Subtitle does not have a title. Title set to', normalizedLanguage + '.');
_self.ffmpegCommand.outputOptions('-metadata:s:' + stream.input + ':' + stream.index, 'title=' + normalizedLanguage);
_self.ffmpegCommand.outputOptions('-metadata:s:s:' + stream.index, 'title=' + normalizedLanguage);
}
_self.ffmpegCommand.outputOptions('-metadata:s:' + stream.input + ':' + stream.index, 'DISPOSITION:default=0');
_self.ffmpegCommand.outputOptions('-disposition:s:' + stream.index, 'default');
_self.encoder.logger.debug('Subtitle stream', stream.input + ':' + stream.index, 'mapped.', {
title: helpers.getStreamTitle(stream) || normalizedLanguage,
language: normalizedLanguage,
Expand Down Expand Up @@ -791,6 +791,7 @@ class Video {
if (stream.codec_name !== 'flac' || _self.options.forceHeAudio) {
_self.encoder.logger.verbose('Audio stream', colors.yellow(helpers.getStreamTitle(stream) + ' (index: ' + stream.index + ')'), 'will be encoded to HE Audio.');
_self.ffmpegCommand.outputOptions('-c:a:' + i, 'libopus');
_self.ffmpegCommand.outputOptions('-af', "aformat=channel_layouts='7.1|5.1|stereo'");
_self.ffmpegCommand.outputOptions('-frame_duration', 60);
if (_self.options.downmixHeAudio && stream.channels > 3) {
// Downmix HE Audio
Expand Down