diff options
| author | Rodeo <[email protected]> | 2013-09-15 22:10:57 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-09-15 22:10:57 +0000 |
| commit | b112b9861556476f4fcb8650e044f9eba4f15ac4 (patch) | |
| tree | 7f0cec4bec8e99ce31972ab34508aa95e1fd9dcd /win/CS | |
| parent | df38b4e3b51cd16e1ef7c559717a578852877456 (diff) | |
QSV: minor refactoring.
Address the easy issues first.
Apologies if I broke HandBrakeInterop.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5783 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS')
4 files changed, 20 insertions, 8 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs index 18d73c721..65472372b 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/Misc.cs @@ -103,6 +103,19 @@ namespace HandBrake.Interop.HbLib }
[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;
+ }
+
+ [StructLayout(LayoutKind.Sequential)]
public struct hb_encoder_s
{
[MarshalAs(UnmanagedType.LPStr)]
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs index 23c5dd28b..7d5d12a85 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs @@ -106,5 +106,9 @@ namespace HandBrake.Interop.HbLib public const int HB_COLR_MAT_SMPTE170M = 6; // also use for fcc and bt470bg
public const int HB_COLR_MAT_SMPTE240M = 7;
// 0, 3-5, 8-65535: reserved
+
+ // hb_title_t.video_decode_support values (bit field)
+ public const int HB_DECODE_SUPPORT_SW = 0x01; // software (libavcodec or mpeg2dec)
+ public const int HB_DECODE_SUPPORT_QSV = 0x02; // Intel Quick Sync Video
}
}
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 a32527132..94aa5a290 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_job_s.cs @@ -169,13 +169,7 @@ namespace HandBrake.Interop.HbLib /// uint32_t->unsigned int
public uint frames_to_skip;
- public IntPtr av_qsv_context;
-
- public int qsv_decode;
-
- public int qsv_async_depth;
-
- public qsv_enc_info_s qsv_enc_info;
+ 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)]
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 49bee7859..4852d7044 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/hb_title_s.cs @@ -138,7 +138,8 @@ namespace HandBrake.Interop.HbLib /// int
public int data_rate;
- public int qsv_decode_support;
+ /// int
+ public int video_decode_support;
/// hb_metadata_t*
public IntPtr metadata;
|