diff options
20 files changed, 65 insertions, 759 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj index 7d5c59f0d..68ba627cb 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInterop.csproj @@ -165,16 +165,12 @@ <Compile Include="HbLib\hb_error_code.cs" />
<Compile Include="HbLib\hb_filter_ids.cs" />
<Compile Include="HbLib\hb_geometry.cs" />
- <Compile Include="HbLib\hb_handle_s.cs" />
<Compile Include="HbLib\hb_image_s.cs" />
+ <Compile Include="HbLib\hb_anamorphic_mode_t.cs" />
<Compile Include="HbLib\hb_mixdown_s.cs" />
<Compile Include="HbLib\hb_rate_s.cs" />
- <Compile Include="HbLib\hb_state_s.cs" />
<Compile Include="HbLib\hb_subtitle.cs" />
- <Compile Include="HbLib\hb_subtitle_config_s.cs" />
<Compile Include="HbLib\iso639_lang_t.cs" />
- <Compile Include="HbLib\hb_job_s.cs" />
- <Compile Include="HbLib\hb_title_s.cs" />
<Compile Include="HbLib\NativeConstants.cs" />
<Compile Include="Helpers\Validate.cs" />
<Compile Include="Interfaces\IHandBrakeInstance.cs" />
@@ -225,8 +221,7 @@ <Compile Include="Model\Encoding\x265\x265Profile.cs" />
<Compile Include="Model\Encoding\x265\x265Tune.cs" />
<Compile Include="Model\Language.cs" />
- <Compile Include="Helpers\Languages.cs" />
- <Compile Include="Helpers\MarshalingConstants.cs" />
+ <Compile Include="HandBrakeLanguagesHelper.cs" />
<Compile Include="EventArgs\MessageLoggedEventArgs.cs" />
<Compile Include="Model\Cropping.cs" />
<Compile Include="Model\EncodeJob.cs" />
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeLanguagesHelper.cs index acd1506b0..bb3127f00 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Languages.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeLanguagesHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Languages.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="HandBrakeLanguagesHelper.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,11 +7,12 @@ // </summary>
// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrake.Interop.Helpers
+namespace HandBrake.Interop
{
using System.Collections.Generic;
using HandBrake.Interop.HbLib;
+ using HandBrake.Interop.Helpers;
using HandBrake.Interop.Model;
/// <summary>
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs index 8721784e8..7167b3db0 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs @@ -89,14 +89,6 @@ namespace HandBrake.Interop.HbLib [DllImport("hb.dll", EntryPoint = "hb_get_titles", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_get_titles(IntPtr hbHandle);
-
- /// Return Type: void
- ///param0: hb_job_t*
- ///ratio: double
- ///pixels: int
- [DllImport("hb.dll", EntryPoint = "hb_set_size", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_set_size(ref hb_job_s param0, double ratio, int pixels);
-
[DllImport("hb.dll", EntryPoint = "hb_set_anamorphic_size2", CallingConvention = CallingConvention.Cdecl)]
public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);
@@ -113,16 +105,6 @@ namespace HandBrake.Interop.HbLib [DllImport("hb.dll", EntryPoint = "hb_job", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_job(IntPtr hbHandle, int jobIndex);
- [DllImport("hb.dll", EntryPoint = "hb_set_job", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_set_job(IntPtr hbHandle, int title_index, ref hb_job_s job);
-
- /// Return Type: void
- ///param0: hb_handle_t*
- ///param1: hb_job_t*
- [DllImport("hb.dll", EntryPoint = "hb_add", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_add(IntPtr hbHandle, ref hb_job_s job);
-
-
/// Return Type: void
///param0: hb_handle_t*
///param1: hb_job_t*
@@ -196,13 +178,6 @@ namespace HandBrake.Interop.HbLib [DllImport("hb.dll", EntryPoint = "hb_list_close", CallingConvention = CallingConvention.Cdecl)]
public static extern void hb_list_close(IntPtr listPtrPtr);
-
- [DllImport("hb.dll", EntryPoint = "hb_subtitle_add", CallingConvention = CallingConvention.Cdecl)]
- public static extern int hb_subtitle_add(ref hb_job_s job, ref hb_subtitle_config_s subtitleConfig, int track);
-
- [DllImport("hb.dll", EntryPoint = "hb_srt_add", CallingConvention = CallingConvention.Cdecl)]
- public static extern int hb_srt_add(ref hb_job_s job, ref hb_subtitle_config_s subtitleConfig, string lang);
-
[DllImport("hb.dll", EntryPoint = "hb_subtitle_can_force", CallingConvention = CallingConvention.Cdecl)]
public static extern int hb_subtitle_can_force(int source);
@@ -369,13 +344,6 @@ namespace HandBrake.Interop.HbLib public static extern IntPtr lang_for_code2([In] [MarshalAs(UnmanagedType.LPStr)] string code2);
-
-
-
- /// void hb_autopassthru_apply_settings( hb_job_t * job )
- [DllImport("hb.dll", EntryPoint = "hb_autopassthru_apply_settings", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_autopassthru_apply_settings(ref hb_job_s job);
-
///hb_title_set_t * hb_get_title_set( hb_handle_t * );
[DllImport("hb.dll", EntryPoint = "hb_get_title_set", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_get_title_set(IntPtr hbHandle);
@@ -384,26 +352,10 @@ namespace HandBrake.Interop.HbLib [DllImport("hb.dll", EntryPoint = "hb_job_init_by_index", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_job_init_by_index(IntPtr hbHandle, int title_index);
- ///hb_job_t * hb_job_init( hb_title_t * title );
- [DllImport("hb.dll", EntryPoint = "hb_job_init", CallingConvention = CallingConvention.Cdecl)]
- public static extern hb_job_s hb_job_init(ref hb_title_s title);
-
- ///void hb_job_reset( hb_job_t * job );
- [DllImport("hb.dll", EntryPoint = "hb_job_reset", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_job_reset(ref hb_job_s job);
-
///void hb_job_close( hb_job_t ** job );
[DllImport("hb.dll", EntryPoint = "hb_job_close", CallingConvention = CallingConvention.Cdecl)]
public static extern void hb_job_close(IntPtr job);
- ///void hb_job_set_advanced_opts( hb_job_t *job, const char *advanced_opts );
- [DllImport("hb.dll", EntryPoint = "hb_job_set_encoder_options", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_job_set_encoder_options(ref hb_job_s job, IntPtr advanced_opts);
-
- ///void hb_job_set_file( hb_job_t *job, const char *file );
- [DllImport("hb.dll", EntryPoint = "hb_job_set_file", CallingConvention = CallingConvention.Cdecl)]
- public static extern void hb_job_set_file(ref hb_job_s job, IntPtr file);
-
///void hb_chapter_set_title(hb_chapter_t *chapter, const char *title);
[DllImport("hb.dll", EntryPoint = "hb_chapter_set_title", CallingConvention = CallingConvention.Cdecl)]
public static extern void hb_chapter_set_title(IntPtr chapter, [In] [MarshalAs(UnmanagedType.LPStr)] string title);
@@ -463,18 +415,10 @@ namespace HandBrake.Interop.HbLib [DllImport("hb.dll", EntryPoint = "hb_get_title_set_json", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_get_title_set_json(IntPtr hbHandle);
- // char * hb_title_to_json(const hb_title_t * title);
- [DllImport("hb.dll", EntryPoint = "hb_title_to_json", CallingConvention = CallingConvention.Cdecl)]
- public static extern IntPtr hb_title_to_json(ref hb_title_s title);
-
// char * hb_job_init_json(hb_handle_t *h, int title_index);
[DllImport("hb.dll", EntryPoint = "hb_job_init_json", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_job_init_json(IntPtr hbHandle, int title_index);
- // char * hb_job_to_json(const hb_job_t * job);
- [DllImport("hb.dll", EntryPoint = "hb_job_to_json", CallingConvention = CallingConvention.Cdecl)]
- public static extern IntPtr hb_job_to_json(ref hb_job_s hb_job_t);
-
// hb_job_t * hb_json_to_job(hb_handle_t * h, const char * json_job);
[DllImport("hb.dll", EntryPoint = "hb_json_to_job", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job);
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_anamorphic_mode_t.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_anamorphic_mode_t.cs new file mode 100644 index 000000000..41c4ff82b --- /dev/null +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_anamorphic_mode_t.cs @@ -0,0 +1,20 @@ +// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_job_s.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 hb_job_s type.
+// </summary>
+// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
+{
+ public enum hb_anamorphic_mode_t
+ {
+ HB_ANAMORPHIC_NONE,
+ HB_ANAMORPHIC_STRICT,
+ HB_ANAMORPHIC_LOOSE,
+ HB_ANAMORPHIC_CUSTOM
+ } ;
+}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs index 5d2033e19..50bacf41c 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_container_s.cs @@ -10,7 +10,7 @@ namespace HandBrake.Interop.HbLib using System.Runtime.InteropServices;
[StructLayout(LayoutKind.Sequential)]
- public struct hb_container_s
+ public struct hb_container_s
{
[MarshalAs(UnmanagedType.LPStr)]
public string name;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs index 13680ff2c..28c20fe38 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_encoder_s.cs @@ -10,7 +10,7 @@ namespace HandBrake.Interop.HbLib using System.Runtime.InteropServices;
[StructLayout(LayoutKind.Sequential)]
- public struct hb_encoder_s
+ public struct hb_encoder_s
{
[MarshalAs(UnmanagedType.LPStr)]
public string name;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_error_code.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_error_code.cs index 7c107f41c..4ed57e296 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_error_code.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_error_code.cs @@ -1,6 +1,18 @@ -namespace HandBrake.Interop.HbLib
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_error_code.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 hb_error_code type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
{
- public enum hb_error_code
+ /// <summary>
+ /// The hb_error_code.
+ /// </summary>
+ internal enum hb_error_code
{
HB_ERROR_NONE = 0,
HB_ERROR_CANCELED,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs index 90b60d846..9a34cca52 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_filter_ids.cs @@ -7,7 +7,7 @@ namespace HandBrake.Interop.HbLib
{
- public enum hb_filter_ids
+ internal enum hb_filter_ids
{
HB_FILTER_QSV_PRE = 1, // for QSV - important to have before other filters
// First, filters that may change the framerate (drop or dup frames)
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs deleted file mode 100644 index e5d8e6f7e..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_handle_s.cs +++ /dev/null @@ -1,89 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_handle_s.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 hb_handle_s type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
- using System;
- using System.Runtime.InteropServices;
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- public struct hb_handle_s
- {
- public int id;
-
- /// int
- public int build;
-
- /// char[32]
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
- public string version;
-
- /// hb_thread_t*
- public IntPtr update_thread;
-
- /// int
- public int die;
-
- /// hb_thread_t*
- public IntPtr main_thread;
-
- /// int
- public int pid;
-
- /// hb_list_t*
- public IntPtr list_title;
-
- /// hb_thread_t*
- public IntPtr scan_thread;
-
- /// hb_list_t*
- public IntPtr jobs;
-
- /// hb_job_t*
- public IntPtr current_job;
-
- /// int
- public int job_count;
-
- /// int
- public int job_count_permanent;
-
- /// int
- public int work_die;
-
- /// int
- public int work_error;
-
- /// hb_thread_t*
- public IntPtr work_thread;
-
- /// hb_lock_t*
- public IntPtr state_lock;
-
- /// hb_state_t->hb_state_s
- public hb_state_s state;
-
- /// int
- public int paused;
-
- /// hb_lock_t*
- public IntPtr pause_lock;
-
- /// int
- public int scanCount;
-
- // volatile int scan_die; missing
-
- /// hb_interjob_t*
- public IntPtr interjob;
-
- // void *system_sleep_opaque; missing
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_image_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_image_s.cs index 60c5251ca..1ef96225c 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_image_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_image_s.cs @@ -1,10 +1,22 @@ -namespace HandBrake.Interop.HbLib
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="hb_image_s.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 hb_image_s type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.HbLib
{
using System;
using System.Runtime.InteropServices;
- public struct hb_image_s - { + /// <summary>
+ /// The hb_image_s.
+ /// </summary>
+ internal struct hb_image_s
+ {
public int format;
public int width;
public int height;
@@ -14,7 +26,10 @@ public image_plane[] plane;
}
- public struct image_plane
+ /// <summary>
+ /// The image_plane.
+ /// </summary>
+ internal struct image_plane
{
public IntPtr data;
public int width;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs deleted file mode 100644 index ebd2d16cb..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ /dev/null @@ -1,240 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_job_s.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 hb_job_s type.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
- using System;
- using System.Runtime.InteropServices;
-
- using HandBrake.Interop.Helpers;
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_job_s
- {
- /// int
- public int sequence_id;
-
- /// hb_title_t*
- public IntPtr title;
-
- public int feature;
-
- /// int
- public int chapter_start;
-
- /// int
- public int chapter_end;
-
- /// int
- public int chapter_markers;
-
- /// int[4]
- [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
- public int[] crop;
-
- /// int
- public int deinterlace;
-
- /// hb_list_t*
- public IntPtr list_filter;
-
- /// int
- public int width;
-
- /// int
- public int height;
-
- /// int
- public int grayscale;
-
- public hb_anamorphic_substruct anamorphic;
-
- public int modulus;
-
- /// int
- public int maxWidth;
-
- /// int
- public int maxHeight;
-
- /// int
- public int vcodec;
-
- /// float
- public float vquality;
-
- /// int
- public int vbitrate;
-
- /// int
- public int vrate;
-
- /// int
- public int vrate_base;
-
- /// int
- public int cfr;
-
- /// int
- public int pass;
-
- public int fastfirstpass;
-
- public IntPtr encoder_preset;
-
- public IntPtr encoder_tune;
-
- public IntPtr encoder_options;
-
- public IntPtr encoder_profile;
-
- public IntPtr encoder_level;
-
- /// int
- public int areBframes;
-
- public int color_matrix_code;
-
- public int color_prim;
-
- public int color_transfer;
-
- /// int
- public int color_matrix;
-
- public IntPtr list_chapter;
-
- /// hb_list_t*
- public IntPtr list_audio;
-
- public int acodec_copy_mask;
- public int acodec_fallback;
-
- /// hb_list_t*
- public IntPtr list_subtitle;
-
- public IntPtr list_attachment;
-
- public IntPtr metadata;
-
- /// int
- public int mux;
-
- /// char*
- /// UTF-8 encoded
- public IntPtr file;
-
- /// int
- public int largeFileSize;
-
- /// int
- public int mp4_optimize;
-
- /// int
- public int ipod_atom;
-
- /// int
- public int indepth_scan;
-
- /// hb_subtitle_config_t->hb_subtitle_config_s
- public hb_subtitle_config_s select_subtitle_config;
-
- /// int
- public int angle;
-
- public int frame_to_start;
-
- public long pts_to_start;
-
- /// int
- public int frame_to_stop;
-
- /// int64_t->int
- public long pts_to_stop;
-
- /// int
- public int start_at_preview;
-
- /// int
- public int seek_points;
-
- /// uint32_t->unsigned int
- public uint frames_to_skip;
-
- public int use_opencl;
-
- public int use_hwd;
-
- public int use_decomb;
-
- public int use_detelecine;
-
- public qsv_s qsv;
-
- // Padding for the part of the struct we don't care about marshaling.
- [MarshalAs(UnmanagedType.ByValArray, SizeConst = MarshalingConstants.JobPaddingBytes, ArraySubType = UnmanagedType.U1)]
- public byte[] padding;
- }
-
- public enum hb_anamorphic_mode_t
- {
- HB_ANAMORPHIC_NONE,
- HB_ANAMORPHIC_STRICT,
- HB_ANAMORPHIC_LOOSE,
- HB_ANAMORPHIC_CUSTOM
- } ;
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_anamorphic_substruct
- {
- /// int
- public hb_anamorphic_mode_t mode;
-
- /// int
- public int itu_par;
-
- /// int
- public int par_width;
-
- /// int
- public int par_height;
-
- /// int
- public int dar_width;
-
- /// int
- public int dar_height;
-
- /// int
- public int keep_display_aspect;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct qsv_enc_info_s
- {
- public int pic_struct;
- public int align_width;
- public int align_height;
- public int is_init_done;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct qsv_s
- {
- public int decode;
-
- public int async_depth;
-
- /// av_qsv_context*
- public IntPtr ctx;
-
- public qsv_enc_info_s enc_info;
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_state_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_state_s.cs deleted file mode 100644 index d687a2810..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_state_s.cs +++ /dev/null @@ -1,96 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_state_s.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>
-// <auto-generated>Disable Stylecop Warnings for this file</auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
- using System.Runtime.InteropServices;
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_state_s
- {
- /// int
- public int state;
- public hb_state_param_u param;
- }
-
- [StructLayout(LayoutKind.Explicit)]
- public struct hb_state_param_u
- {
- [FieldOffset(0)]
- public hb_state_scanning_anon scanning;
-
- [FieldOffset(0)]
- public hb_state_working_anon working;
-
- [FieldOffset(0)]
- public hb_state_workdone_anon workdone;
-
- [FieldOffset(0)]
- public hb_state_muxing_anon muxing;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_state_scanning_anon
- {
- public float progress;
-
- public int preview_cur;
-
- public int preview_count;
-
- /// int
- public int title_cur;
-
- /// int
- public int title_count;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_state_working_anon
- {
- /// float
- public float progress;
-
- /// int
- public int job_cur;
-
- /// int
- public int job_count;
-
- /// float
- public float rate_cur;
-
- /// float
- public float rate_avg;
-
- /// int
- public int hours;
-
- /// int
- public int minutes;
-
- /// int
- public int seconds;
-
- /// int
- public int sequence_id;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_state_workdone_anon
- {
- /// int
- public hb_error_code error;
- }
-
- [StructLayout(LayoutKind.Sequential)]
- public struct hb_state_muxing_anon
- {
- /// float
- public float progress;
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs index 77c21a190..a6691aeb3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle.cs @@ -7,13 +7,6 @@ namespace HandBrake.Interop.HbLib
{
- public enum hb_subtitle_s_subtype
- {
- PICTURESUB,
-
- TEXTSUB,
- }
-
public enum hb_subtitle_s_subsource
{
VOBSUB,
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_config_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_config_s.cs deleted file mode 100644 index 2e3502a24..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_subtitle_config_s.cs +++ /dev/null @@ -1,42 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_subtitle_config_s.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>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
- using System.Runtime.InteropServices;
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- public struct hb_subtitle_config_s
- {
- /// hb_subtitle_config_s_subdest
- public hb_subtitle_config_s_subdest dest;
-
- /// int
- public int force;
-
- /// int
- public int default_track;
-
- /// char[128]
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
- public string src_filename;
-
- /// char[40]
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 40)]
- public string src_codeset;
-
- /// int64_t->int
- public long offset;
- }
-
- public enum hb_subtitle_config_s_subdest
- {
- RENDERSUB,
-
- PASSTHRUSUB,
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs deleted file mode 100644 index 2e9d49868..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs +++ /dev/null @@ -1,173 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_title_s.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>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.HbLib
-{
- using System;
- using System.Runtime.InteropServices;
-
- [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
- public struct hb_title_s
- {
- /// Anonymous_990d28ea_6cf3_4fbc_8143_4df9513e9550
- public hb_title_type_anon type;
-
- public uint reg_desc;
-
- /// char[1024]
- [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024)]
- public byte[] path;
-
- /// char[1024]
- [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
- public string name;
-
- /// int
- public int index;
-
- public int playlist;
-
- /// int
- public int vts;
-
- /// int
- public int ttn;
-
- /// int
- public int cell_start;
-
- /// int
- public int cell_end;
-
- /// int
- public ulong block_start;
-
- /// int
- public ulong block_end;
-
- /// int
- public ulong block_count;
-
- /// int
- public int angle_count;
-
- public IntPtr opaque_priv;
-
- /// int
- public int hours;
-
- /// int
- public int minutes;
-
- /// int
- public int seconds;
-
- /// uint64_t->unsigned int
- public ulong duration;
-
- public int has_resolution_change;
-
- public hb_geometry_s geometry;
-
- public hb_rational_t dar;
-
- public hb_rational_t container_dar;
-
- public int color_prim;
- public int color_transfer;
- public int color_matrix;
-
- /// int
- public hb_rational_t vrate;
-
- /// int[4]
- [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
- public int[] crop;
-
- public hb_title_demuxer_anon demuxer;
-
- /// int
- public int detected_interlacing;
-
- public int pcr_pid;
-
- /// int
- public int video_id;
-
- /// int
- public int video_codec;
-
- public uint video_stream_type;
-
- /// int
- public int video_codec_param;
-
- /// char*
- [MarshalAs(UnmanagedType.LPStr)]
- public string video_codec_name;
-
- /// int
- public int video_bitrate;
-
- /// char*
- [MarshalAs(UnmanagedType.LPStr)]
- public string container_name;
-
- /// int
- public int data_rate;
-
- /// int
- public int video_decode_support;
-
- /// hb_metadata_t*
- public IntPtr metadata;
-
- /// hb_list_t*
- public IntPtr list_chapter;
-
- /// hb_list_t*
- public IntPtr list_audio;
-
- /// hb_list_t*
- public IntPtr list_subtitle;
-
- /// hb_list_t*
- public IntPtr list_attachment;
-
- /// hb_job_t*
- public IntPtr job;
-
- /// uint32_t->unsigned int
- public uint flags;
-
- public int opencl_support;
-
- public int hwd_support;
- }
-
- public enum hb_title_type_anon
- {
- HB_DVD_TYPE,
-
- HB_BD_TYPE,
-
- HB_STREAM_TYPE,
-
- HB_FF_STREAM_TYPE,
- }
-
- public enum hb_title_demuxer_anon
- {
- HB_DVD_DEMUXER = 0,
-
- HB_TS_DEMUXER,
-
- HB_PS_DEMUXER,
-
- HB_NULL_DEMUXER,
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs index 6399beee2..6edc115e3 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/InteropUtilities.cs @@ -20,7 +20,7 @@ namespace HandBrake.Interop.Helpers /// <summary>
/// Helper utilities for native interop.
/// </summary>
- public static class InteropUtilities
+ internal static class InteropUtilities
{
/// <summary>
/// Reads the given native structure pointer.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs deleted file mode 100644 index 8f56e9380..000000000 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs +++ /dev/null @@ -1,32 +0,0 @@ -// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MarshalingConstants.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 MarshalingConstants type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Helpers
-{
- /// <summary>
- /// The marshaling constants.
- /// </summary>
- public static class MarshalingConstants
- {
-#if X64
- public const int JobPaddingBytes = 49272;
- public const int AudioPaddingBytes = 49208;
-#else
- /// <summary>
- /// Job Padding Bytes
- /// </summary>
- public const int JobPaddingBytes = 49220;
-
- /// <summary>
- /// Audio Padding Bytes
- /// </summary>
- public const int AudioPaddingBytes = 49180;
-#endif
- }
-}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs index d21f84ed4..cada6ab75 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/NativeList.cs @@ -19,7 +19,7 @@ namespace HandBrake.Interop.Helpers /// <summary>
/// Represents a HandBrake style native list.
/// </summary>
- public class NativeList : IDisposable
+ internal class NativeList : IDisposable
{
/// <summary>
/// Initializes a new instance of the NativeList class.
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs index ef450c62d..efb8ee3dd 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Utilities.cs @@ -9,12 +9,10 @@ namespace HandBrake.Interop.Helpers
{
- using HandBrake.Interop.Model.Encoding;
-
/// <summary>
/// The utilities.
/// </summary>
- public static class Utilities
+ internal static class Utilities
{
/// <summary>
/// Get the Greatest Common Factor
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Validate.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Validate.cs index d3c7d8136..49501432a 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Validate.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/Validate.cs @@ -14,7 +14,7 @@ namespace HandBrake.Interop.Helpers /// <summary>
/// The validate.
/// </summary>
- public class Validate
+ internal class Validate
{
/// <summary>
/// The not null.
|