From: sr55 Date: Sat, 13 Jul 2013 17:21:48 +0000 (+0000) Subject: WinGui: Make the AVFormat Muxers default. X-Git-Tag: 0.10.0~828 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b5d615c59958cb0078a6d3d8a126337335b734;p=handbrake WinGui: Make the AVFormat Muxers default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5646 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs index 0ea8dd8ba..9e57ef03a 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs @@ -467,7 +467,7 @@ namespace HandBrake.ApplicationServices.Model { get { - if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4) + if (this.OutputFormat == OutputFormat.M4V || this.OutputFormat == OutputFormat.Mp4 || this.OutputFormat == OutputFormat.av_mp4) { bool audio = this.AudioTracks.Any(item => item.Encoder == AudioEncoder.Ac3Passthrough || item.Encoder == AudioEncoder.Ac3 || item.Encoder == AudioEncoder.DtsPassthrough || item.Encoder == AudioEncoder.Passthrough); diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs index 813418264..2303e786d 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/OutputFormat.cs @@ -23,6 +23,12 @@ namespace HandBrake.ApplicationServices.Model.Encoding M4V, [Description("MKV")] - Mkv + Mkv, + + [Description("av_mkv")] + av_mkv, + + [Description("av_mp4")] + av_mp4, } } diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs index 641380e9c..b290530dd 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/Converters.cs @@ -447,11 +447,11 @@ namespace HandBrake.ApplicationServices.Utilities switch (format.ToLower()) { default: - return OutputFormat.Mp4; + return OutputFormat.av_mp4; case "m4v": - return OutputFormat.M4V; + return OutputFormat.av_mp4; case "mkv": - return OutputFormat.Mkv; + return OutputFormat.av_mkv; } } @@ -470,9 +470,9 @@ namespace HandBrake.ApplicationServices.Utilities { default: return "mp4"; - case OutputFormat.M4V: + case OutputFormat.av_mp4: return "m4v"; - case OutputFormat.Mkv: + case OutputFormat.av_mkv: return "mkv"; } } diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs index 407748027..c96d86c35 100644 --- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs +++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs @@ -96,7 +96,7 @@ namespace HandBrakeWPF.Helpers /* * File Extension */ - if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V) + if (task.OutputFormat == OutputFormat.Mp4 || task.OutputFormat == OutputFormat.M4V || task.OutputFormat == OutputFormat.av_mp4) { switch (userSettingService.GetUserSetting(UserSettingConstants.UseM4v)) { diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs index ee9b09f31..800f7e180 100644 --- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs @@ -166,7 +166,7 @@ namespace HandBrakeWPF.ViewModels { this.NotifyOfPropertyChange(() => this.Task); - if (Task.OutputFormat == OutputFormat.Mp4) + if (Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.av_mp4) { foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis)) { diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index bb9dbed9a..74f11abf2 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -622,7 +622,7 @@ namespace HandBrakeWPF.ViewModels { return new List { - OutputFormat.Mp4, OutputFormat.Mkv + OutputFormat.av_mp4, OutputFormat.av_mkv, OutputFormat.Mp4, OutputFormat.Mkv }; } } @@ -1435,13 +1435,13 @@ namespace HandBrakeWPF.ViewModels switch (Path.GetExtension(saveFileDialog.FileName)) { case ".mkv": - this.SelectedOutputFormat = OutputFormat.Mkv; + this.SelectedOutputFormat = OutputFormat.av_mkv; break; case ".mp4": - this.SelectedOutputFormat = OutputFormat.Mp4; + this.SelectedOutputFormat = OutputFormat.av_mp4; break; case ".m4v": - this.SelectedOutputFormat = OutputFormat.M4V; + this.SelectedOutputFormat = OutputFormat.av_mp4; break; } diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index feabc08f3..8b93173a2 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -385,7 +385,7 @@ namespace HandBrakeWPF.ViewModels if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub) && this.Task != null && - (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V)) + (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V || this.Task.OutputFormat == OutputFormat.av_mp4)) { this.SelectBurnedInTrack(track); } diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs index a59c9c32f..74c7a1f15 100644 --- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs @@ -852,7 +852,7 @@ namespace HandBrakeWPF.ViewModels { this.NotifyOfPropertyChange(() => this.Task); - if (Task.OutputFormat == OutputFormat.Mp4 && this.SelectedVideoEncoder == VideoEncoder.Theora) + if ((Task.OutputFormat == OutputFormat.Mp4 || Task.OutputFormat == OutputFormat.av_mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora) { this.SelectedVideoEncoder = VideoEncoder.X264; }