diff options
| author | randomengy <[email protected]> | 2014-03-19 02:51:50 +0000 |
|---|---|---|
| committer | randomengy <[email protected]> | 2014-03-19 02:51:50 +0000 |
| commit | a486dd14553fe45ab85501de5e04f0e4c94d7a32 (patch) | |
| tree | 81f494a3cda36011d9e5ff37406c4b403dba4632 /win/CS/HandBrake.Interop | |
| parent | 198fe997039d9f659a413f8c85e501aac89d3e10 (diff) | |
Interop: Disable two-pass code when the encode type is constant quality. Update job marshalling padding to account for the addition of done_error.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6124 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrake.Interop')
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs index d51bcfc70..54a2135ee 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HandBrakeInstance.cs @@ -531,7 +531,7 @@ namespace HandBrake.Interop nativeJob.indepth_scan = 0;
- if (job.EncodingProfile.TwoPass)
+ if (job.EncodingProfile.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality && job.EncodingProfile.TwoPass)
{
// First pass. Apply turbo options if needed.
nativeJob.pass = 1;
@@ -873,7 +873,7 @@ namespace HandBrake.Interop int pass = 1;
int rawJobNumber = state.param.working.job_cur;
- if (this.currentJob.EncodingProfile.TwoPass)
+ if (this.currentJob.EncodingProfile.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality && this.currentJob.EncodingProfile.TwoPass)
{
if (this.subtitleScan)
{
diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs index 98ed5048f..8f56e9380 100644 --- a/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs +++ b/win/CS/HandBrake.Interop/HandBrakeInterop/Helpers/MarshalingConstants.cs @@ -15,13 +15,13 @@ namespace HandBrake.Interop.Helpers public static class MarshalingConstants
{
#if X64
- public const int JobPaddingBytes = 49264;
+ public const int JobPaddingBytes = 49272;
public const int AudioPaddingBytes = 49208;
#else
- /// <summary>
+ /// <summary>
/// Job Padding Bytes
/// </summary>
- public const int JobPaddingBytes = 49216;
+ public const int JobPaddingBytes = 49220;
/// <summary>
/// Audio Padding Bytes
|