diff options
| author | sr55 <[email protected]> | 2014-12-18 21:30:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-12-18 21:30:24 +0000 |
| commit | aee0ccc0e4d624f88c0d7f3effda3a8a085def74 (patch) | |
| tree | 8770df03472655675facf0c8cd5e62c72c1c2f06 /win/CS/HandBrake.Interop/HandBrakeInterop/HbLib | |
| parent | 6dac5a9af13ffee95a448cdbe9d1971fb35d3266 (diff) | |
WinGui: Update the libhb scan code to work with the updated API. See rev6602 for API changes.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6608 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop/HandBrakeInterop/HbLib')
4 files changed, 14 insertions, 42 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs index 449d7f023..243632ba9 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/HbFunctions.cs @@ -115,7 +115,7 @@ namespace HandBrake.Interop.HbLib public static extern void hb_set_anamorphic_size(ref hb_job_s job, ref int output_width, ref int output_height, ref int output_par_width, ref int output_par_height);
[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_ui_geometry_s uiGeometry, ref hb_geometry_s result);
+ public static extern void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);
/// Return Type: int
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs index c6bc59fb3..7814fb27b 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_audio.cs @@ -60,9 +60,9 @@ namespace HandBrake.Interop.HbLib /// int
public int bitrate;
- public float quality;
+ public double quality;
- public float compression_level;
+ public double compression_level;
/// double
public double dynamic_range_compression;
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_geometry.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_geometry.cs index 6a0001ff7..857b9eca0 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_geometry.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_geometry.cs @@ -38,7 +38,7 @@ namespace HandBrake.Interop.HbLib /// The hb_ui_geometry_s.
/// </summary>
[StructLayout(LayoutKind.Sequential)]
- public struct hb_ui_geometry_s
+ public struct hb_geometry_settings_s
{
/// <summary>
/// Anamorphic mode, see job struct anamorphic
@@ -67,16 +67,6 @@ namespace HandBrake.Interop.HbLib public int[] crop;
/// <summary>
- /// destination storage width
- /// </summary>
- public int width;
-
- /// <summary>
- /// destination storage height
- /// </summary>
- public int height;
-
- /// <summary>
/// max destination storage width
/// </summary>
public int maxWidth;
@@ -89,12 +79,7 @@ namespace HandBrake.Interop.HbLib /// <summary>
/// Pixel aspect used in custom anamorphic
/// </summary>
- public hb_rational_t par;
-
- /// <summary>
- /// Display aspect used in custom anamorphic
- /// </summary>
- public hb_rational_t dar;
+ public hb_geometry_s geometry;
}
/// <summary>
@@ -104,12 +89,12 @@ namespace HandBrake.Interop.HbLib public struct hb_rational_t
{
/// <summary>
- /// The num.
+ /// The num. W
/// </summary>
public int num;
/// <summary>
- /// The den.
+ /// The den. H
/// </summary>
public int den;
}
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs index a3152c4be..3e43ac2a6 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs @@ -69,35 +69,20 @@ namespace HandBrake.Interop.HbLib /// uint64_t->unsigned int
public ulong duration;
- /// double
- public double aspect;
-
- /// double
- public double container_aspect;
-
public int has_resolution_change;
- /// int
- public int width;
-
- /// int
- public int height;
+ public hb_geometry_s geometry;
- /// int
- public int pixel_aspect_width;
+ public hb_rational_t dar;
- /// int
- public int pixel_aspect_height;
+ public hb_rational_t container_dar;
public int color_prim;
public int color_transfer;
public int color_matrix;
/// int
- public int rate;
-
- /// int
- public int rate_base;
+ public hb_rational_t vrate;
/// int[4]
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)]
@@ -179,7 +164,9 @@ namespace HandBrake.Interop.HbLib {
HB_DVD_DEMUXER = 0,
- HB_MPEG_DEMUXER,
+ HB_TS_DEMUXER,
+
+ HB_PS_DEMUXER,
HB_NULL_DEMUXER,
}
|