diff options
| author | sr55 <[email protected]> | 2014-02-21 22:06:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-02-21 22:06:24 +0000 |
| commit | f2ca02b9220a88a018759932dd9608b2de8a91cf (patch) | |
| tree | 0f3c3cd02a9f137f61f0359f6d96295c7109f728 /win/CS | |
| parent | 24dafeb39495eaf0081160bd642d8da10d0b9995 (diff) | |
WinGui: Some tidy up and refactoring in the interop library. Few small internal namespace changes.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6053 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS')
30 files changed, 632 insertions, 286 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs index c8095f9c1..67f243432 100644 --- a/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs +++ b/win/CS/HandBrake.ApplicationServices/Utilities/InteropModelCreator.cs @@ -130,10 +130,10 @@ namespace HandBrake.ApplicationServices.Utilities {
case OutputFormat.Mp4:
case OutputFormat.M4V:
- profile.OutputFormat = Container.Mp4;
+ profile.ContainerName = "av_mp4"; // TODO make part of enum.
break;
case OutputFormat.Mkv:
- profile.OutputFormat = Container.Mkv;
+ profile.ContainerName = "av_mkv"; // TODO make part of enum.
break;
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs index 57c19659a..7a45d6334 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Converters.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Converters/Converters.cs @@ -7,18 +7,19 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Converters
{
- using System;
- using System.Collections.Generic;
- using System.Globalization;
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
- using HandBrake.Interop.HbLib;
- using HandBrake.Interop.Model.Encoding;
- using HandBrake.Interop.SourceData;
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
+ using HandBrake.Interop.Model;
+ using HandBrake.Interop.Model.Encoding;
+ using HandBrake.Interop.SourceData;
- /// <summary>
+ /// <summary>
/// Converters for various encoding values.
/// </summary>
public static class Converters
@@ -125,19 +126,19 @@ namespace HandBrake.Interop public static HBAudioEncoder NativeToAudioEncoder(hb_encoder_s encoder)
{
var result = new HBAudioEncoder
- {
- Id = encoder.codec,
- ShortName = encoder.short_name,
- DisplayName = encoder.name,
- CompatibleContainers = encoder.muxers
- };
-
- result.QualityLimits = Encoders.GetAudioQualityLimits(encoder.codec);
- result.DefaultQuality = HBFunctions.hb_audio_quality_get_default((uint)encoder.codec);
- result.CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.codec);
- result.DefaultCompression = HBFunctions.hb_audio_compression_get_default((uint)encoder.codec);
-
- return result;
+ {
+ Id = encoder.codec,
+ ShortName = encoder.short_name,
+ DisplayName = encoder.name,
+ CompatibleContainers = encoder.muxers,
+ QualityLimits = Encoders.GetAudioQualityLimits(encoder.codec),
+ DefaultQuality = HBFunctions.hb_audio_quality_get_default((uint)encoder.codec),
+ CompressionLimits = Encoders.GetAudioCompressionLimits(encoder.codec),
+ DefaultCompression =
+ HBFunctions.hb_audio_compression_get_default((uint)encoder.codec)
+ };
+
+ return result;
}
/// <summary>
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index a9c610bb4..b231d9239 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -20,6 +20,7 @@ namespace HandBrake.Interop using HandBrake.Interop.EventArgs;
using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
using HandBrake.Interop.Interfaces;
using HandBrake.Interop.Model;
using HandBrake.Interop.Model.Encoding;
@@ -1175,7 +1176,7 @@ namespace HandBrake.Interop }
nativeJob.vrate = 27000000;
- nativeJob.vrate_base = Converters.FramerateToVrate(profile.Framerate);
+ nativeJob.vrate_base = Converters.Converters.FramerateToVrate(profile.Framerate);
}
string vfrSettings = string.Format(CultureInfo.InvariantCulture, "{0}:{1}:{2}", nativeJob.cfr, nativeJob.vrate, nativeJob.vrate_base);
@@ -1498,17 +1499,6 @@ namespace HandBrake.Interop nativeJob.qsv.decode = profile.QsvDecode ? 1 : 0;
nativeJob.use_hwd = job.DxvaDecoding ? 1 : 0;
-#pragma warning disable 612, 618
- if (profile.OutputFormat == Container.Mp4)
- {
- nativeJob.mux = HBFunctions.hb_container_get_from_name("av_mp4");
- }
- else if (profile.OutputFormat == Container.Mkv)
- {
- nativeJob.mux = HBFunctions.hb_container_get_from_name("av_mkv");
- }
-#pragma warning restore 612, 618
-
if (profile.ContainerName != null)
{
nativeJob.mux = HBFunctions.hb_container_get_from_name(profile.ContainerName);
@@ -1790,7 +1780,7 @@ namespace HandBrake.Interop Playlist = title.playlist,
Resolution = new Size(title.width, title.height),
ParVal = new Size(title.pixel_aspect_width, title.pixel_aspect_height),
- Duration = Converters.PtsToTimeSpan(title.duration),
+ Duration = Converters.Converters.PtsToTimeSpan(title.duration),
DurationPts = title.duration,
AutoCropDimensions = new Cropping
{
@@ -1885,7 +1875,7 @@ namespace HandBrake.Interop var newAudio = new AudioTrack
{
TrackNumber = currentAudioTrack,
- Codec = Converters.NativeToAudioCodec(audio.config.input.codec),
+ Codec = Converters.Converters.NativeToAudioCodec(audio.config.input.codec),
CodecParam = audio.config.input.codec_param,
CodecId = audio.config.input.codec,
Language = audio.config.lang.simple,
@@ -1908,7 +1898,7 @@ namespace HandBrake.Interop {
Name = chapter.title,
ChapterNumber = chapter.index,
- Duration = Converters.PtsToTimeSpan(chapter.duration),
+ Duration = Converters.Converters.PtsToTimeSpan(chapter.duration),
DurationPts = chapter.duration
};
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index b195c54a0..b6e60faad 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -125,7 +125,7 @@ </ItemGroup>
<ItemGroup>
<Compile Include="Attributes\ShortName.cs" />
- <Compile Include="Converters.cs" />
+ <Compile Include="Converters\Converters.cs" />
<Compile Include="EventArgs\EncodeCompletedEventArgs.cs" />
<Compile Include="EventArgs\EncodeProgressEventArgs.cs" />
<Compile Include="HandBrakeUtils.cs" />
@@ -150,10 +150,10 @@ <Compile Include="HbLib\hb_title_s.cs" />
<Compile Include="HbLib\NativeConstants.cs" />
<Compile Include="Interfaces\IHandBrakeInstance.cs" />
- <Compile Include="InteropUtilities.cs" />
- <Compile Include="Language.cs" />
- <Compile Include="Languages.cs" />
- <Compile Include="MarshalingConstants.cs" />
+ <Compile Include="Helpers\InteropUtilities.cs" />
+ <Compile Include="Model\Language.cs" />
+ <Compile Include="Helpers\Languages.cs" />
+ <Compile Include="Helpers\MarshalingConstants.cs" />
<Compile Include="EventArgs\MessageLoggedEventArgs.cs" />
<Compile Include="Model\Cropping.cs" />
<Compile Include="Model\EncodeJob.cs" />
@@ -192,7 +192,7 @@ <Compile Include="Model\Subtitles.cs" />
<Compile Include="Model\VideoQualityLimits.cs" />
<Compile Include="Model\VideoRangeType.cs" />
- <Compile Include="NativeList.cs" />
+ <Compile Include="Helpers\NativeList.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="EventArgs\ScanProgressEventArgs.cs" />
<Compile Include="SourceData\AudioCodec.cs" />
@@ -203,7 +203,7 @@ <Compile Include="SourceData\SubtitleSource.cs" />
<Compile Include="SourceData\SubtitleType.cs" />
<Compile Include="SourceData\Title.cs" />
- <Compile Include="Utilities.cs" />
+ <Compile Include="Helpers\Utilities.cs" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs index b065293ba..03150d1e8 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeUtils.cs @@ -104,8 +104,8 @@ namespace HandBrake.Interop if (loggingCallback == null)
{
// Keep the callback as a member to prevent it from being garbage collected.
- loggingCallback = new LoggingCallback(LoggingHandler);
- errorCallback = new LoggingCallback(ErrorHandler);
+ loggingCallback = LoggingHandler;
+ errorCallback = ErrorHandler;
HBFunctions.hb_register_logger(loggingCallback);
HBFunctions.hb_register_error_handler(errorCallback);
}
@@ -151,7 +151,12 @@ namespace HandBrake.Interop /// <summary>
/// Gets the standard x264 option name given the starting point.
/// </summary>
- /// <returns>The standard x264 option name.</returns>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <returns>
+ /// The standard x264 option name.
+ /// </returns>
public static string SanitizeX264OptName(string name)
{
IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
@@ -224,7 +229,6 @@ namespace HandBrake.Interop string x264Settings = Marshal.PtrToStringAnsi(ptr);
-
return x264Settings;
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs index f0627670d..c6bc59fb3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs @@ -13,7 +13,9 @@ namespace HandBrake.Interop.HbLib using System;
using System.Runtime.InteropServices;
- [StructLayout(LayoutKind.Sequential)]
+ using HandBrake.Interop.Helpers;
+
+ [StructLayout(LayoutKind.Sequential)]
public struct hb_audio_s
{
/// int
@@ -26,8 +28,8 @@ namespace HandBrake.Interop.HbLib [MarshalAs(UnmanagedType.ByValArray, SizeConst = MarshalingConstants.AudioPaddingBytes, ArraySubType = UnmanagedType.U1)]
public byte[] padding;
- /// Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545
- //public Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545 priv;
+ // Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545
+ // public Anonymous_e6c7b779_b5a3_4e80_9fa8_13619d14f545 priv;
}
[StructLayout(LayoutKind.Sequential)]
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs index 5f41366c1..a3ea3dbb3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs @@ -13,7 +13,9 @@ namespace HandBrake.Interop.HbLib using System;
using System.Runtime.InteropServices;
- [StructLayout(LayoutKind.Sequential)]
+ using HandBrake.Interop.Helpers;
+
+ [StructLayout(LayoutKind.Sequential)]
public struct hb_job_s
{
/// int
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs index 0dac9be4a..0019aa2d2 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/InteropUtilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs @@ -7,16 +7,17 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Helpers
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Runtime.InteropServices;
- using System.Text;
- using HandBrake.Interop.HbLib;
-
- /// <summary>
+ using System;
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Runtime.InteropServices;
+ using System.Text;
+
+ using HandBrake.Interop.HbLib;
+
+ /// <summary>
/// Helper utilities for native interop.
/// </summary>
public static class InteropUtilities
@@ -59,7 +60,12 @@ namespace HandBrake.Interop /// <summary>
/// Creates a pointer to a UTF-8 null-terminated string.
/// </summary>
- /// <param name="str">The string to encode.</param>
+ /// <param name="str">
+ /// The string to encode.
+ /// </param>
+ /// <returns>
+ /// The <see cref="IntPtr"/>.
+ /// </returns>
public static IntPtr CreateUtf8Ptr(string str)
{
byte[] bytes = Encoding.UTF8.GetBytes(str);
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Languages.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs index f8d3db624..b89e190eb 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Languages.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LanguageCodes.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="Languages.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
// <summary>
@@ -7,12 +7,14 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Helpers
{
- using System.Collections.Generic;
- using HbLib;
+ using System.Collections.Generic;
- /// <summary>
+ using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Model;
+
+ /// <summary>
/// Contains utilities for converting language codes.
/// </summary>
public static class Languages
@@ -29,14 +31,9 @@ namespace HandBrake.Interop {
get
{
- if (allLanguages == null)
- {
- allLanguages = InteropUtilities.GetListFromIterator<iso639_lang_t, Language>(
- HBFunctions.lang_get_next,
- Converters.NativeToLanguage);
- }
-
- return allLanguages;
+ return allLanguages
+ ?? (allLanguages =
+ InteropUtilities.GetListFromIterator<iso639_lang_t, Language>(HBFunctions.lang_get_next, Converters.Converters.NativeToLanguage));
}
}
@@ -48,7 +45,7 @@ namespace HandBrake.Interop public static Language Get(string code)
{
iso639_lang_t language = InteropUtilities.ReadStructure<iso639_lang_t>(HBFunctions.lang_for_code2(code));
- return Converters.NativeToLanguage(language);
+ return Converters.Converters.NativeToLanguage(language);
}
}
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs index 05261251a..98ed5048f 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/MarshalingConstants.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Helpers
{
/// <summary>
/// The marshaling constants.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/NativeList.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs index 1e24f9ce4..c77c58cb9 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/NativeList.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs @@ -7,15 +7,15 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Helpers
{
- using System;
- using System.Collections.Generic;
- using System.Runtime.InteropServices;
+ using System;
+ using System.Collections.Generic;
+ using System.Runtime.InteropServices;
- using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.HbLib;
- /// <summary>
+ /// <summary>
/// Represents a HandBrake style native list.
/// </summary>
public class NativeList : IDisposable
@@ -32,10 +32,10 @@ namespace HandBrake.Interop /// <summary>
/// The list of native memory locations allocated for this list.
/// </summary>
- private List<IntPtr> allocatedMemory = new List<IntPtr>();
+ private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
/// <summary>
- /// Gets or sets the pointer to the native list.
+ /// Gets the pointer to the native list.
/// </summary>
public IntPtr Ptr { get; private set; }
@@ -57,7 +57,7 @@ namespace HandBrake.Interop {
get
{
- return allocatedMemory;
+ return this.allocatedMemory;
}
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs index 11246230c..77106f72d 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Utilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Helpers
{
using HandBrake.Interop.Model.Encoding;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs index ba6a1ebd6..593c1015f 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoders.cs @@ -13,7 +13,9 @@ namespace HandBrake.Interop.Model using System.Collections.Generic;
using System.Linq;
+ using HandBrake.Interop.Converters;
using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
using HandBrake.Interop.Model.Encoding;
using HandBrake.Interop.SourceData;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs index 0c798457b..42e4428ed 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Anamorphic.cs @@ -11,7 +11,10 @@ namespace HandBrake.Interop.Model.Encoding {
using System.ComponentModel.DataAnnotations;
- public enum Anamorphic
+ /// <summary>
+ /// The anamorphic.
+ /// </summary>
+ public enum Anamorphic
{
[Display(Name = "None")]
None = 0,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs index ca162a47f..6017b872c 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/AudioEncodeRateType.cs @@ -1,17 +1,18 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="AudioEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioEncodeRateType.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The audio encode rate type.
+// </summary>
// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.Interop.Model.Encoding -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - public enum AudioEncodeRateType +{
+ /// <summary>
+ /// The audio encode rate type.
+ /// </summary>
+ public enum AudioEncodeRateType { Bitrate, Quality diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs index 2a526170e..08f33caff 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Container.cs @@ -1,15 +1,21 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Container.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Container type.
+// </summary>
// -------------------------------------------------------------------------------------------------------------------- namespace HandBrake.Interop.Model.Encoding { using System; - using System.ComponentModel.DataAnnotations; - - [Flags] + using System.ComponentModel.DataAnnotations;
+
+ /// <summary>
+ /// The container.
+ /// </summary>
+ [Flags] public enum Container { None = 0x0, diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs index 64f68a476..e7c8da445 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/CroppingType.cs @@ -2,6 +2,9 @@ // <copyright file="CroppingType.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
+// <summary>
+// The type of cropping to apply.
+// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.Interop.Model.Encoding
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs index a376ef893..c205545b3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Decomb.cs @@ -9,7 +9,10 @@ namespace HandBrake.Interop.Model.Encoding
{
- public enum Decomb
+ /// <summary>
+ /// The decomb.
+ /// </summary>
+ public enum Decomb
{
Off = 0,
Default = 2,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs index ec64d9e75..a2ab0f0a4 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Denoise.cs @@ -9,7 +9,10 @@ namespace HandBrake.Interop.Model.Encoding
{
- public enum Denoise
+ /// <summary>
+ /// The denoise.
+ /// </summary>
+ public enum Denoise
{
Off = 0,
Weak = 2,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs index af7930973..c69350684 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/Detelecine.cs @@ -9,7 +9,10 @@ namespace HandBrake.Interop.Model.Encoding
{
- public enum Detelecine
+ /// <summary>
+ /// The detelecine.
+ /// </summary>
+ public enum Detelecine
{
Off = 0,
Default = 2,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs index 81a1b8afd..f37766281 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/EncodingProfile.cs @@ -9,82 +9,288 @@ namespace HandBrake.Interop.Model.Encoding
{
- using System;
- using System.Collections.Generic;
+ using System.Collections.Generic;
using HandBrake.Interop.Model;
- public class EncodingProfile
+ /// <summary>
+ /// The encoding profile.
+ /// </summary>
+ public class EncodingProfile
{
- public EncodingProfile()
+ /// <summary>
+ /// Initializes a new instance of the <see cref="EncodingProfile"/> class.
+ /// </summary>
+ public EncodingProfile()
{
this.Cropping = new Cropping();
}
- [Obsolete("Use ContainerName instead.")]
- public Container OutputFormat { get; set; }
-
- public string ContainerName { get; set; }
- public OutputExtension PreferredExtension { get; set; }
- public bool IncludeChapterMarkers { get; set; }
- public bool LargeFile { get; set; }
- public bool Optimize { get; set; }
- public bool IPod5GSupport { get; set; }
-
- public int Width { get; set; }
- public int Height { get; set; }
- public int MaxWidth { get; set; }
- public int MaxHeight { get; set; }
- public ScaleMethod ScaleMethod { get; set; }
- public CroppingType CroppingType { get; set; }
- public Cropping Cropping { get; set; }
- public Anamorphic Anamorphic { get; set; }
- public bool UseDisplayWidth { get; set; }
- public int DisplayWidth { get; set; }
- public bool KeepDisplayAspect { get; set; }
- public int PixelAspectX { get; set; }
- public int PixelAspectY { get; set; }
- public int Modulus { get; set; }
-
- public Deinterlace Deinterlace { get; set; }
- public string CustomDeinterlace { get; set; }
- public Decomb Decomb { get; set; }
- public string CustomDecomb { get; set; }
- public Detelecine Detelecine { get; set; }
- public string CustomDetelecine { get; set; }
- public Denoise Denoise { get; set; }
- public string CustomDenoise { get; set; }
- public int Deblock { get; set; }
- public bool Grayscale { get; set; }
-
- public string VideoEncoder { get; set; }
- public string X264Options { get; set; }
- public string X264Profile { get; set; }
- public string X264Preset { get; set; }
-
- public List<string> X264Tunes { get; set; }
- public string QsvPreset { get; set; }
- public bool QsvDecode { get; set; }
- public string H264Level { get; set; }
- public VideoEncodeRateType VideoEncodeRateType { get; set; }
- public double Quality { get; set; }
- public int TargetSize { get; set; }
- public int VideoBitrate { get; set; }
- public bool TwoPass { get; set; }
- public bool TurboFirstPass { get; set; }
- public double Framerate { get; set; }
- public bool ConstantFramerate { get; set; }
-
- public List<AudioEncoding> AudioEncodings { get; set; }
- public string AudioEncoderFallback { get; set; }
-
- public EncodingProfile Clone()
+ #region Destination and Output Settings
+
+ /// <summary>
+ /// Gets or sets the container name.
+ /// </summary>
+ public string ContainerName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the preferred extension.
+ /// </summary>
+ public OutputExtension PreferredExtension { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether include chapter markers.
+ /// </summary>
+ public bool IncludeChapterMarkers { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether large file.
+ /// </summary>
+ public bool LargeFile { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether optimize.
+ /// </summary>
+ public bool Optimize { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether i pod 5 g support.
+ /// </summary>
+ public bool IPod5GSupport { get; set; }
+ #endregion
+
+ #region Picture Settings
+
+ /// <summary>
+ /// Gets or sets the width.
+ /// </summary>
+ public int Width { get; set; }
+
+ /// <summary>
+ /// Gets or sets the height.
+ /// </summary>
+ public int Height { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max width.
+ /// </summary>
+ public int MaxWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the max height.
+ /// </summary>
+ public int MaxHeight { get; set; }
+
+ /// <summary>
+ /// Gets or sets the scale method.
+ /// </summary>
+ public ScaleMethod ScaleMethod { get; set; }
+
+ /// <summary>
+ /// Gets or sets the cropping type.
+ /// </summary>
+ public CroppingType CroppingType { get; set; }
+
+ /// <summary>
+ /// Gets or sets the cropping.
+ /// </summary>
+ public Cropping Cropping { get; set; }
+
+ /// <summary>
+ /// Gets or sets the anamorphic.
+ /// </summary>
+ public Anamorphic Anamorphic { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether use display width.
+ /// </summary>
+ public bool UseDisplayWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display width.
+ /// </summary>
+ public int DisplayWidth { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether keep display aspect.
+ /// </summary>
+ public bool KeepDisplayAspect { get; set; }
+
+ /// <summary>
+ /// Gets or sets the pixel aspect x.
+ /// </summary>
+ public int PixelAspectX { get; set; }
+
+ /// <summary>
+ /// Gets or sets the pixel aspect y.
+ /// </summary>
+ public int PixelAspectY { get; set; }
+
+ /// <summary>
+ /// Gets or sets the modulus.
+ /// </summary>
+ public int Modulus { get; set; }
+ #endregion
+
+ #region Filters
+
+ /// <summary>
+ /// Gets or sets the deinterlace.
+ /// </summary>
+ public Deinterlace Deinterlace { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom deinterlace.
+ /// </summary>
+ public string CustomDeinterlace { get; set; }
+
+ /// <summary>
+ /// Gets or sets the decomb.
+ /// </summary>
+ public Decomb Decomb { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom decomb.
+ /// </summary>
+ public string CustomDecomb { get; set; }
+
+ /// <summary>
+ /// Gets or sets the detelecine.
+ /// </summary>
+ public Detelecine Detelecine { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom detelecine.
+ /// </summary>
+ public string CustomDetelecine { get; set; }
+
+ /// <summary>
+ /// Gets or sets the denoise.
+ /// </summary>
+ public Denoise Denoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets the custom denoise.
+ /// </summary>
+ public string CustomDenoise { get; set; }
+
+ /// <summary>
+ /// Gets or sets the deblock.
+ /// </summary>
+ public int Deblock { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether grayscale.
+ /// </summary>
+ public bool Grayscale { get; set; }
+ #endregion
+
+ #region Video
+
+ /// <summary>
+ /// Gets or sets the video encoder.
+ /// </summary>
+ public string VideoEncoder { get; set; }
+
+ /// <summary>
+ /// Gets or sets the x 264 options.
+ /// </summary>
+ public string X264Options { get; set; }
+
+ /// <summary>
+ /// Gets or sets the x 264 profile.
+ /// </summary>
+ public string X264Profile { get; set; }
+
+ /// <summary>
+ /// Gets or sets the x 264 preset.
+ /// </summary>
+ public string X264Preset { get; set; }
+
+ /// <summary>
+ /// Gets or sets the x 264 tunes.
+ /// </summary>
+ public List<string> X264Tunes { get; set; }
+
+ /// <summary>
+ /// Gets or sets the qsv preset.
+ /// </summary>
+ public string QsvPreset { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether qsv decode.
+ /// </summary>
+ public bool QsvDecode { get; set; }
+
+ /// <summary>
+ /// Gets or sets the h 264 level.
+ /// </summary>
+ public string H264Level { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video encode rate type.
+ /// </summary>
+ public VideoEncodeRateType VideoEncodeRateType { get; set; }
+
+ /// <summary>
+ /// Gets or sets the quality.
+ /// </summary>
+ public double Quality { get; set; }
+
+ /// <summary>
+ /// Gets or sets the target size.
+ /// </summary>
+ public int TargetSize { get; set; }
+
+ /// <summary>
+ /// Gets or sets the video bitrate.
+ /// </summary>
+ public int VideoBitrate { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether two pass.
+ /// </summary>
+ public bool TwoPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether turbo first pass.
+ /// </summary>
+ public bool TurboFirstPass { get; set; }
+
+ /// <summary>
+ /// Gets or sets the framerate.
+ /// </summary>
+ public double Framerate { get; set; }
+
+ /// <summary>
+ /// Gets or sets a value indicating whether constant framerate.
+ /// </summary>
+ public bool ConstantFramerate { get; set; }
+ #endregion
+
+ #region Audio
+
+ /// <summary>
+ /// Gets or sets the audio encodings.
+ /// </summary>
+ public List<AudioEncoding> AudioEncodings { get; set; }
+
+ /// <summary>
+ /// Gets or sets the audio encoder fallback.
+ /// </summary>
+ public string AudioEncoderFallback { get; set; }
+ #endregion
+
+ /// <summary>
+ /// The clone.
+ /// </summary>
+ /// <returns>
+ /// The <see cref="EncodingProfile"/>.
+ /// </returns>
+ public EncodingProfile Clone()
{
var profile = new EncodingProfile
{
-#pragma warning disable 612, 618
- OutputFormat = this.OutputFormat,
-#pragma warning restore 612, 618
ContainerName = this.ContainerName,
PreferredExtension = this.PreferredExtension,
IncludeChapterMarkers = this.IncludeChapterMarkers,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs index a3a95ab33..478e309a6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBAudioEncoder.cs @@ -1,53 +1,96 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrake.Interop.Model.Encoding -{ - using HandBrake.Interop.HbLib; - - public class HBAudioEncoder - { - public string ShortName { get; set; } - - public string DisplayName { get; set; } - - public int Id { get; set; } - - public int CompatibleContainers { get; set; } - - public bool SupportsQuality - { - get - { - return this.QualityLimits.High >= 0; - } - } - - public RangeLimits QualityLimits { get; set; } - - public float DefaultQuality { get; set; } - - public bool SupportsCompression - { - get - { - return this.CompressionLimits.High >= 0; - } - } - - public RangeLimits CompressionLimits { get; set; } - - public float DefaultCompression { get; set; } - - public bool IsPassthrough - { - get - { - return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0; - } - } - } -} +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb audio encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ using HandBrake.Interop.HbLib;
+
+ /// <summary>
+ /// The hb audio encoder.
+ /// </summary>
+ public class HBAudioEncoder
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; set; }
+
+ /// <summary>
+ /// Gets or sets the compression limits.
+ /// </summary>
+ public RangeLimits CompressionLimits { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default compression.
+ /// </summary>
+ public float DefaultCompression { get; set; }
+
+ /// <summary>
+ /// Gets or sets the default quality.
+ /// </summary>
+ public float DefaultQuality { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether is passthrough.
+ /// </summary>
+ public bool IsPassthrough
+ {
+ get
+ {
+ return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the quality limits.
+ /// </summary>
+ public RangeLimits QualityLimits { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether supports compression.
+ /// </summary>
+ public bool SupportsCompression
+ {
+ get
+ {
+ return this.CompressionLimits.High >= 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether supports quality.
+ /// </summary>
+ public bool SupportsQuality
+ {
+ get
+ {
+ return this.QualityLimits.High >= 0;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs index 136006075..3b6feea48 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBContainer.cs @@ -1,18 +1,41 @@ -using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBContainer.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb container.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.Interop.Model.Encoding
{
- public class HBContainer
- {
- public string ShortName { get; set; }
+ /// <summary>
+ /// The hb container.
+ /// </summary>
+ public class HBContainer
+ {
+ #region Public Properties
- public string DisplayName { get; set; }
+ /// <summary>
+ /// Gets or sets the default extension.
+ /// </summary>
+ public string DefaultExtension { get; set; }
- public string DefaultExtension { get; set; }
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
- public int Id { get; set; }
- }
-}
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs index 493beb9fa..94d9dc24b 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBMixdown.cs @@ -1,22 +1,36 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrake.Interop.Model.Encoding -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - - public class HBMixdown - { - public string ShortName { get; set; } - - public string DisplayName { get; set; } - - public int Id { get; set; } - } -} +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb mixdown.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ /// <summary>
+ /// The hb mixdown.
+ /// </summary>
+ public class HBMixdown
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBRate.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBRate.cs index 2862574dc..b8dfabbc3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBRate.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBRate.cs @@ -2,6 +2,9 @@ // <copyright file="HBRate.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
+// <summary>
+// Represents a rate in HandBrake: audio sample rate or video framerate.
+// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.Interop.Model.Encoding
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs index 6bc04a5be..98bbcc319 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/HBVideoEncoder.cs @@ -1,19 +1,41 @@ -// -------------------------------------------------------------------------------------------------------------------- -// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)"> -// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License. -// </copyright> -// -------------------------------------------------------------------------------------------------------------------- - -namespace HandBrake.Interop.Model.Encoding -{ - public class HBVideoEncoder - { - public string ShortName { get; set; } - - public string DisplayName { get; set; } - - public int Id { get; set; } - - public int CompatibleContainers { get; set; } - } -} +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Model.Encoding
+{
+ /// <summary>
+ /// The hb video encoder.
+ /// </summary>
+ public class HBVideoEncoder
+ {
+ #region Public Properties
+
+ /// <summary>
+ /// Gets or sets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; set; }
+
+ /// <summary>
+ /// Gets or sets the display name.
+ /// </summary>
+ public string DisplayName { get; set; }
+
+ /// <summary>
+ /// Gets or sets the id.
+ /// </summary>
+ public int Id { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ #endregion
+ }
+}
\ No newline at end of file diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs index ff8e89fda..f4b2415fa 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/OutputExtension.cs @@ -9,7 +9,10 @@ namespace HandBrake.Interop.Model.Encoding
{
- public enum OutputExtension
+ /// <summary>
+ /// The output extension.
+ /// </summary>
+ public enum OutputExtension
{
Mp4,
M4v
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/ScaleMethod.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/ScaleMethod.cs index 31c624893..f0c840085 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/ScaleMethod.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/ScaleMethod.cs @@ -1,7 +1,10 @@ // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Deinterlace.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="ScaleMethod.cs" company="HandBrake Project (http://handbrake.fr)">
// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
// </copyright>
+// <summary>
+// Scaling Method
+// </summary>
// --------------------------------------------------------------------------------------------------------------------
namespace HandBrake.Interop.Model.Encoding
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs index 7bf052efb..4afeb7123 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Encoding/VideoEncodeRateType.cs @@ -9,7 +9,10 @@ namespace HandBrake.Interop.Model.Encoding
{
- public enum VideoEncodeRateType
+ /// <summary>
+ /// The video encode rate type.
+ /// </summary>
+ public enum VideoEncodeRateType
{
TargetSize = 0,
AverageBitrate = 1,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Language.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Language.cs index c2f17281e..9d731ed69 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Language.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Language.cs @@ -7,7 +7,7 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop
+namespace HandBrake.Interop.Model
{
/// <summary>
/// Represents a language.
|