Add WebM support (#1822)

Note that since webm has no official subtitle support, only burned in subtitles can be used with this muxer at this time.

16 files changed, 204 insertions, 23 deletions

diff --git a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
index 8950d2b92..9ceeb6132 100644
--- a/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
+++ b/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs
@@ -24,6 +24,8 @@ namespace HandBrake.Interop.Interop.Model.Encoding
         [DisplayName("MP4")]
         MP4,
         [DisplayName("MKV")]
-        MKV
+        MKV,
+        [DisplayName("WebM")]
+        WebM
     }
 }
diff --git a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
index 7216c6fe4..cc317c14c 100644
--- a/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs
@@ -64,7 +64,7 @@ namespace HandBrakeWPF.Converters.Audio
                     encoders.Remove(AudioEncoder.fdkheaac);

                 }

 

-                if (task != null && task.OutputFormat != OutputFormat.Mkv)

+                if (task != null && task.OutputFormat == OutputFormat.Mp4)

                 {

                     encoders.Remove(AudioEncoder.Vorbis);

                     encoders.Remove(AudioEncoder.ffflac);

@@ -74,6 +74,10 @@ namespace HandBrakeWPF.Converters.Audio
 

                     encoders.Remove(AudioEncoder.TrueHDPassthrough);

                 }

+                else if (task != null && task.OutputFormat == OutputFormat.WebM)

+                {

+                    encoders.RemoveAll(ae => !(ae.Equals(AudioEncoder.Vorbis) || ae.Equals(AudioEncoder.Opus)));

+                }

 

                 // Hide the Passthru options and show the "None" option

                 if (parameter != null && parameter.ToString() == "True")

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index 12ce80eca..21db31b8a 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -79,12 +79,16 @@ namespace HandBrakeWPF.Converters.Video
                     encoders.Remove(VideoEncoder.X265_12);

                 }

 

-                if (task != null && task.OutputFormat != OutputFormat.Mkv)

+                if (task != null && task.OutputFormat == OutputFormat.Mp4)

                 {

                     encoders.Remove(VideoEncoder.Theora);

                     encoders.Remove(VideoEncoder.VP8);

                     encoders.Remove(VideoEncoder.VP9);

                 }

+                else if (task != null && task.OutputFormat == OutputFormat.WebM)

+                {

+                    encoders.RemoveAll(ve => !(ve.Equals(VideoEncoder.VP9) || ve.Equals(VideoEncoder.VP8)));

+                }

 

                 if (!isQsvEnabled || !SystemInfo.IsQsvAvailableH264)

                 {

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 0b000eff7..fa6f71b96 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -172,6 +172,10 @@ namespace HandBrakeWPF.Helpers
                 {

                     destinationFilename += ".mkv";

                 }

+                else if (task.OutputFormat == OutputFormat.WebM)

+                {

+                    destinationFilename += ".webm";

+                }

 

                 /*

                  * File Destination Path

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b9c05191f..54f78fe92 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -4617,6 +4617,28 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to WebM in HandBrake only supports burned subtitles.
+        ///
+        ///You should change your subtitle selections.
+        ///
+        ///If you continue, your non-burned subtitles will be lost..
+        /// </summary>
+        public static string Subtitles_WebmSubtitleIncompatibilityError {
+            get {
+                return ResourceManager.GetString("Subtitles_WebmSubtitleIncompatibilityError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to WebM Subtitle Compatibility.
+        /// </summary>
+        public static string Subtitles_WebmSubtitleIncompatibilityHeader {
+            get {
+                return ResourceManager.GetString("Subtitles_WebmSubtitleIncompatibilityHeader", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Add Closed Captions when available.
         /// </summary>
         public static string SubtitlesView_AddCC {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 1cf4cfc4e..d6117ac7b 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -372,6 +372,16 @@ Foreign Audio Track - The Foreign Audio track will be burned in if available.
 First Track - The first track will be burned in.

 Foreign Audio Preferred, else First - If the foreign audio track exists, it will be burned in, otherwise the first track will be chosen.</value>

   </data>

+  <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">

+    <value>WebM Subtitle Compatibility</value>

+  </data>

+  <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">

+    <value>WebM in HandBrake only supports burned subtitles.

+

+You should change your subtitle selections.

+

+If you continue, your non-burned subtitles will be lost.</value>

+  </data>

   <data name="Main_ScanNoTitlesFound" xml:space="preserve">

     <value>No valid source or titles found.</value>

   </data>

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
index dc4f00480..e9eb3c53a 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
@@ -23,5 +23,9 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
         [DisplayName("MKV")]
         [ShortName("mkv")]
         Mkv,
+
+        [DisplayName("WebM")]
+        [ShortName("webm")]
+        WebM
     }
 }
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 90a3d249f..9af13bc71 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -209,6 +209,14 @@ namespace HandBrakeWPF.ViewModels
                 }

             }

 

+            if (this.Task.OutputFormat == OutputFormat.WebM)

+            {

+                foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder != AudioEncoder.Vorbis && track.Encoder != AudioEncoder.Opus))

+                {

+                    track.Encoder = AudioEncoder.Vorbis;

+                }

+            }

+

             this.AudioDefaultsViewModel.RefreshTask();

         }

 

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
index c5f0f5e3c..4889332ee 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs
@@ -28,5 +28,15 @@ namespace HandBrakeWPF.ViewModels.Interfaces
         /// String array of files.

         /// </param>

         void Import(string[] subtitleFiles);

+

+        /// <summary>

+        /// Trigger a Notify Property Changed on the Task to force various UI elements to update.

+        /// </summary>

+        void RefreshTask();

+

+        /// <summary>

+        /// Checks the configuration of the subtitles and warns the user about any potential issues.

+        /// </summary>

+        bool ValidateSubtitles();

     }

 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index de7070d3d..2f0baa730 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -556,7 +556,7 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Gets RangeMode.

         /// </summary>

-        public IEnumerable<OutputFormat> OutputFormats => new List<OutputFormat> { OutputFormat.Mp4, OutputFormat.Mkv };

+        public IEnumerable<OutputFormat> OutputFormats => new List<OutputFormat> { OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.WebM };

 

         /// <summary>

         /// Gets or sets Destination.

@@ -608,6 +608,9 @@ namespace HandBrakeWPF.ViewModels
                             case ".m4v":

                                 this.SummaryViewModel.SetContainer(OutputFormat.Mp4);

                                 break;

+                            case ".webm":

+                                this.SummaryViewModel.SetContainer(OutputFormat.WebM);

+                                break;

                         }

                     }

                     else

@@ -1154,6 +1157,7 @@ namespace HandBrakeWPF.ViewModels
 

             this.VideoViewModel.RefreshTask();

             this.AudioViewModel.RefreshTask();

+            this.SubtitleViewModel.RefreshTask();

         }

 

         public void Shutdown()

@@ -1377,6 +1381,12 @@ namespace HandBrakeWPF.ViewModels
                 return new AddQueueError(Resources.Main_MatchingFileOverwriteWarning, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);

             }

 

+            // defer to subtitle's validation messages

+            if (!this.SubtitleViewModel.ValidateSubtitles())

+            {

+                return false;

+            }

+

             QueueTask task = new QueueTask(new EncodeTask(this.CurrentTask), HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, this.SelectedPreset);

 

             if (!this.queueProcessor.CheckForDestinationPathDuplicates(task.Task.Destination))

@@ -1731,7 +1741,7 @@ namespace HandBrakeWPF.ViewModels
         {

             SaveFileDialog saveFileDialog = new SaveFileDialog

             {

-                Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv", 

+                Filter = "mp4|*.mp4;*.m4v|mkv|*.mkv|webm|*.webm", 

                 CheckPathExists = true, 

                 AddExtension = true, 

                 DefaultExt = ".mp4", 

@@ -1743,7 +1753,9 @@ namespace HandBrakeWPF.ViewModels
             saveFileDialog.FilterIndex = !string.IsNullOrEmpty(this.CurrentTask.Destination)

                                          && !string.IsNullOrEmpty(extension)

                                              ? (extension == ".mp4" || extension == ".m4v" ? 1 : 2)

-                                             : (this.CurrentTask.OutputFormat == OutputFormat.Mkv ? 2 : 0);

+                                             : (this.CurrentTask.OutputFormat == OutputFormat.Mkv 

+                                                 ? 2 

+                                                 : (this.CurrentTask.OutputFormat == OutputFormat.WebM ? 3 : 0));

 

             string mruDir = this.GetMru(Constants.FileSaveMru);

             if (!string.IsNullOrEmpty(mruDir))

@@ -1781,6 +1793,9 @@ namespace HandBrakeWPF.ViewModels
                         case ".m4v":

                             this.SummaryViewModel.SetContainer(OutputFormat.Mp4);

                             break;

+                        case ".webm":

+                            this.SummaryViewModel.SetContainer(OutputFormat.WebM);

+                            break;

                     }

 

                     this.NotifyOfPropertyChange(() => this.CurrentTask);

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index d8ad6e9b9..5a9c38383 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -570,7 +570,21 @@ namespace HandBrakeWPF.ViewModels
             // Filename handling.

             if (string.IsNullOrEmpty(encodeTask.Destination))

             {

-                string filename = Path.ChangeExtension(Path.GetTempFileName(), encodeTask.OutputFormat == OutputFormat.Mkv ? "m4v" : "mkv");

+                string formatExtension;

+                switch (encodeTask.OutputFormat)

+                {

+                    case OutputFormat.WebM:

+                        formatExtension = "webm";

+                        break;

+                    case OutputFormat.Mp4:

+                        formatExtension = "m4v";

+                        break;

+                    case OutputFormat.Mkv:

+                    default:

+                        formatExtension = "mkv";

+                        break;

+                }

+                string filename = Path.ChangeExtension(Path.GetTempFileName(), formatExtension);

                 encodeTask.Destination = filename;

                 this.CurrentlyPlaying = filename;

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index e164f1192..432e15f51 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -14,6 +14,7 @@ namespace HandBrakeWPF.ViewModels
     using System.IO;

     using System.Linq;

     using System.Runtime.CompilerServices;

+    using System.Windows;

 

     using Caliburn.Micro;

 

@@ -22,6 +23,7 @@ namespace HandBrakeWPF.ViewModels
     using HandBrakeWPF.EventArgs;

     using HandBrakeWPF.Model.Subtitles;

     using HandBrakeWPF.Properties;

+    using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Services.Presets.Model;

     using HandBrakeWPF.Services.Scan.Model;

     using HandBrakeWPF.ViewModels.Interfaces;

@@ -38,6 +40,7 @@ namespace HandBrakeWPF.ViewModels
     /// </summary>

     public class SubtitlesViewModel : ViewModelBase, ISubtitlesViewModel

     {

+        private readonly IErrorService errorService;

         private readonly IWindowManager windowManager;

 

         #region Constants and Fields

@@ -52,11 +55,15 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.SubtitlesViewModel"/> class.

         /// </summary>

+        /// <param name="errorService">

+        /// The Error Service

+        /// </param>

         /// <param name="windowManager">

         /// The window Manager.

         /// </param>

-        public SubtitlesViewModel(IWindowManager windowManager)

+        public SubtitlesViewModel(IErrorService errorService, IWindowManager windowManager)

         {

+            this.errorService = errorService;

             this.windowManager = windowManager;

             this.SubtitleDefaultsViewModel = new SubtitlesDefaultsViewModel();

             this.Task = new EncodeTask();

@@ -144,6 +151,14 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

+        public bool IsBurnableOnly

+        {

+            get

+            {

+                return this.Task.OutputFormat == OutputFormat.WebM;

+            }

+        }

+

         #endregion

 

         #region Public Methods

@@ -453,6 +468,26 @@ namespace HandBrakeWPF.ViewModels
             this.AutomaticSubtitleSelection();

         }

 

+        /// <summary>

+        /// Trigger a Notify Property Changed on the Task to force various UI elements to update.

+        /// </summary>

+        public void RefreshTask()

+        {

+            this.NotifyOfPropertyChange(() => this.Task);

+            this.NotifyOfPropertyChange(() => this.IsBurnableOnly);

+

+            if (this.IsBurnableOnly)

+            {

+                foreach (var subtitleTrack in this.Task.SubtitleTracks)

+                {

+                    if (subtitleTrack.Default)

+                    {

+                        subtitleTrack.Default = false;

+                    }

+                }

+            }

+        }

+

         #endregion

 

         #region Implemented Interfaces

@@ -553,6 +588,43 @@ namespace HandBrakeWPF.ViewModels
             this.AutomaticSubtitleSelection();

         }

 

+        /// <summary>

+        /// Checks the configuration of the subtitles and warns the user about any potential issues.

+        /// </summary>

+        public bool ValidateSubtitles()

+        {

+            var nonBurnedSubtitles = this.Task.SubtitleTracks.Where(subtitleTrack => !subtitleTrack.Burned).ToList();

+

+            if (nonBurnedSubtitles.Count > 0 && this.IsBurnableOnly)

+            {

+                MessageBoxResult result = this.errorService.ShowMessageBox(

+                    Resources.Subtitles_WebmSubtitleIncompatibilityError,

+                    Resources.Subtitles_WebmSubtitleIncompatibilityHeader,

+                    MessageBoxButton.OKCancel,

+                    MessageBoxImage.Warning);

+                if (result == MessageBoxResult.OK)

+                {

+                    foreach (var subtitleTrack in nonBurnedSubtitles)

+                    {

+                        if (!subtitleTrack.Burned)

+                        {

+                            this.Remove(subtitleTrack);

+                        }

+                    }

+                }

+                else if (result == MessageBoxResult.Cancel)

+                {

+                    return false;

+                }

+                else

+                {

+                    return false;

+                }

+            }

+

+            return true;

+        }

+

         #endregion

 

         #region Methods

diff --git a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
index 0da1fc70b..b5f711e5a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs
@@ -123,7 +123,7 @@ namespace HandBrakeWPF.ViewModels
             {
                 return new List<OutputFormat>
                        {
-                           OutputFormat.Mp4, OutputFormat.Mkv
+                           OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.WebM
                        };
             }
         }
@@ -211,8 +211,9 @@ namespace HandBrakeWPF.ViewModels
                     this.Task.OutputFormat = value;
                     this.NotifyOfPropertyChange(() => this.SelectedOutputFormat);
                     this.NotifyOfPropertyChange(() => this.Task.OutputFormat);
-                    this.NotifyOfPropertyChange(() => this.IsMkv);
+                    this.NotifyOfPropertyChange(() => this.IsMkvOrWebm);
                     this.SetExtension(string.Format(".{0}", this.Task.OutputFormat.ToString().ToLower()));
+                    this.UpdateDisplayedInfo(); // output format may coreced to another due to container incompatibility
 
                     this.OnOutputFormatChanged(new OutputFormatChangedEventArgs(null));
                     this.OnTabStatusChanged(null);
@@ -221,13 +222,13 @@ namespace HandBrakeWPF.ViewModels
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether IsMkv.
+        /// Gets or sets a value indicating whether IsMkvOrWebm.
         /// </summary>
-        public bool IsMkv
+        public bool IsMkvOrWebm
         {
             get
             {
-                return this.SelectedOutputFormat == OutputFormat.Mkv;
+                return this.SelectedOutputFormat == OutputFormat.Mkv || this.SelectedOutputFormat == OutputFormat.WebM;
             }
         }
 
@@ -316,8 +317,8 @@ namespace HandBrakeWPF.ViewModels
             this.UpdateDisplayedInfo();
 
             this.NotifyOfPropertyChange(() => this.SelectedOutputFormat);
-            this.NotifyOfPropertyChange(() => this.IsMkv);
-
+            this.NotifyOfPropertyChange(() => this.IsMkvOrWebm);
+ 
             this.NotifyOfPropertyChange(() => this.OptimizeMP4);
             this.NotifyOfPropertyChange(() => this.IPod5GSupport);
             this.NotifyOfPropertyChange(() => this.AlignAVStart);
@@ -454,14 +455,14 @@ namespace HandBrakeWPF.ViewModels
             }
 
             // Now disable controls that are not required. The Following are for MP4 only!
-            if (newExtension == ".mkv")
+            if (newExtension == ".mkv" || newExtension == ".webm")
             {
                 this.OptimizeMP4 = false;
                 this.IPod5GSupport = false;
                 this.AlignAVStart = false;
             }
 
-            this.NotifyOfPropertyChange(() => this.IsMkv);
+            this.NotifyOfPropertyChange(() => this.IsMkvOrWebm);
 
             // Update The browse file extension display
             if (Path.HasExtension(newExtension))
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 72b74ffa1..3280b9424 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -1115,10 +1115,17 @@ namespace HandBrakeWPF.ViewModels
         {

             this.NotifyOfPropertyChange(() => this.Task);

 

-            if ((Task.OutputFormat == OutputFormat.Mp4) && this.SelectedVideoEncoder == VideoEncoder.Theora)

+            VideoEncoder[] allowableWebmEncoders = { VideoEncoder.VP8, VideoEncoder.VP9 };

+

+            if ((Task.OutputFormat == OutputFormat.Mp4) && (this.SelectedVideoEncoder == VideoEncoder.Theora || allowableWebmEncoders.Contains(this.SelectedVideoEncoder)))

             {

                 this.SelectedVideoEncoder = VideoEncoder.X264;

             }

+

+            if ((Task.OutputFormat == OutputFormat.WebM) && !allowableWebmEncoders.Contains(this.SelectedVideoEncoder))

+            {

+                this.SelectedVideoEncoder = VideoEncoder.VP8;

+            }

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 01195259a..1fedb3962 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -11,12 +11,14 @@
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"

              xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

              xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"

+             xmlns:viewModels="clr-namespace:HandBrakeWPF.ViewModels"

              d:DesignHeight="350"

              d:DesignWidth="500"

              mc:Ignorable="d"

              x:Name="subTab">

     <UserControl.Resources>

         <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />

+        <Converters:BooleanConverter x:Key="booleanConverter" />

         <subtitles:CanBurnSubtitleConverter x:Key="canBurnSubtitleConverter" />

 

         <Style x:Key="LongToolTip" TargetType="TextBlock">

@@ -190,7 +192,8 @@
                                 </i:Interaction.Triggers>

                             </CheckBox>

 

-                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="{x:Static Properties:Resources.SubtitlesView_Default}" FontWeight="Bold">

+                            <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="{x:Static Properties:Resources.SubtitlesView_Default}" FontWeight="Bold"

+                                      IsEnabled="{Binding DataContext.IsBurnableOnly, Converter={StaticResource booleanConverter}, ConverterParameter=true, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SelectDefaultTrack">

@@ -251,7 +254,8 @@
                                 </i:Interaction.Triggers>

                             </CheckBox>

 

-                            <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold">

+                            <CheckBox Grid.Column="9" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold"

+                                      IsEnabled="{Binding DataContext.IsBurnableOnly, Converter={StaticResource booleanConverter}, ConverterParameter=true, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">

                                 <i:Interaction.Triggers>

                                     <i:EventTrigger EventName="Click">

                                         <cal:ActionMessage MethodName="SelectDefaultTrack">

diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index 10027f60e..8aad4a3a2 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -65,17 +65,17 @@
                               Content="{x:Static Properties:Resources.MainView_WebOptimized}"
                               IsChecked="{Binding Path=OptimizeMP4}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"
-                              Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+                              Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
             <CheckBox Name="AlignAVStart" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"
                               Content="{x:Static Properties:Resources.MainView_AlignAVStart}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AlignAVStart}"
                               IsChecked="{Binding Path=AlignAVStart}"
-                              Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+                              Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
             <CheckBox Name="iPod5G" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"
                               Content="{x:Static Properties:Resources.MainView_iPod5G}"
                               ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"
                               IsChecked="{Binding Path=IPod5GSupport}"
-                              Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter},  ConverterParameter=true}" />
+                              Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter},  ConverterParameter=true}" />
 
             <TextBlock Text="Tracks:" FontWeight="Bold" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" />
             <TextBlock Text="{Binding VideoTrackInfo}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" />