diff options
| author | sr55 <[email protected]> | 2014-02-23 15:59:51 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-02-23 15:59:51 +0000 |
| commit | 3c843089925a96a5a291d547be768412a1741791 (patch) | |
| tree | fe23f0bd24ac27f8d9b1910beebb85371133a030 /win/CS | |
| parent | 71c53a04fc0d43fee4ee024f854ebc6783234fd2 (diff) | |
WinGui: Enable the x265 raw muxer for testing. Note to everyone playing with this. This is highly experimental at this stage. There is no support for audio and the encoder is slow compared to x264. It's still early days.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6063 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS')
3 files changed, 8 insertions, 2 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs index 7e30009b7..d9faaa6a4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncoder.cs @@ -38,7 +38,7 @@ namespace HandBrake.Interop.Model.Encoding Theora,
[Display(Name = "H.265 (x265)")]
- [ShortName("hvec")]
+ [ShortName("x265")]
X265
}
}
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 6854656d4..32b68e9fb 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -65,6 +65,12 @@ namespace HandBrakeWPF.Converters.Video encoders.Remove(VideoEncoder.X265);
}
+ if (task != null && task.OutputFormat == OutputFormat.X265)
+ {
+ encoders.Clear();
+ encoders.Add(VideoEncoder.X265);
+ }
+
return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 4306fc7f7..fb657e686 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -615,7 +615,7 @@ namespace HandBrakeWPF.ViewModels {
return new List<OutputFormat>
{
- OutputFormat.Mp4, OutputFormat.Mkv
+ OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.X265
};
}
}
|