Adds Modulus dropdown to Loose anamorphic choice. Fixed a problem where the

incorrect scaling would be chosen and pick the wrong aspect ratio.

--HG--
branch : beta

Author: RandomEngy

Lib/x64/HandBrakeInterop.dll

@@ -14,6 +14,7 @@ namespace VidCoder
 	using System.Xml.Serialization;
 	using HandBrake.Interop;
 	using HandBrake.Interop.Model;
+	using HandBrake.Interop.SourceData;
 	using Model;
 	using Properties;
 	using Services;
@@ -48,6 +49,10 @@ public class EncodeProxy : IHandBrakeEncoderCallback
 		private ManualResetEventSlim encodeStartEvent;
 		private ManualResetEventSlim encodeEndEvent;
 
+		// Instance and lock only used when doing in-process encode (for debugging)
+		private HandBrakeInstance instance;
+		private object encodeLock = new object();
+
 		// Timer that pings the worker process periodically to see if it's still alive.
 		private Timer pingTimer;
 
@@ -61,6 +66,11 @@ public class EncodeProxy : IHandBrakeEncoderCallback
 
 		public void StartEncode(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
 		{
+//#if DEBUG
+//            this.StartEncodeInProcess(job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
+//            return;
+//#endif
+
 			this.logger = Unity.Container.Resolve<ILogger>();
 
 			this.encodeStartEvent = new ManualResetEventSlim(false);
@@ -163,6 +173,54 @@ public void StartEncode(EncodeJob job, bool preview, int previewNumber, int prev
 			task.Start();
 		}
 
+		private void StartEncodeInProcess(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds)
+		{
+			this.encoding = true;
+
+			this.encodeStartEvent = new ManualResetEventSlim(false);
+			this.encodeEndEvent = new ManualResetEventSlim(false);
+
+			this.instance = new HandBrakeInstance();
+			this.instance.Initialize(Settings.Default.LogVerbosity);
+
+			this.instance.ScanCompleted += (o, e) =>
+			{
+				try
+				{
+					Title encodeTitle = this.instance.Titles.FirstOrDefault(title => title.TitleNumber == job.Title);
+
+					if (encodeTitle != null)
+					{
+						lock (this.encodeLock)
+						{
+							this.instance.StartEncode(job, preview, previewNumber, previewSeconds, overallSelectedLengthSeconds);
+							this.OnEncodeStarted();
+						}
+					}
+					else
+					{
+						this.OnEncodeComplete(true);
+					}
+				}
+				catch (Exception exception)
+				{
+					this.OnException(exception.ToString());
+				}
+			};
+
+			this.instance.EncodeProgress += (o, e) =>
+			{
+				this.OnEncodeProgress(e.AverageFrameRate, e.CurrentFrameRate, e.EstimatedTimeLeft, e.FractionComplete, e.Pass);
+			};
+
+			this.instance.EncodeCompleted += (o, e) =>
+			{
+				this.OnEncodeComplete(e.Error);
+			};
+
+			this.instance.StartScan(job.SourcePath, Settings.Default.PreviewCount, job.Title);
+		}
+
 		public void PauseEncode()
 		{
 			lock (this.encoderLock)
@@ -334,7 +392,10 @@ private void EndEncode(bool error)
 							});
 				}
 
-				this.pingTimer.Dispose();
+				if (this.pingTimer != null)
+				{
+					this.pingTimer.Dispose();
+				}
 
 				this.encoding = false;
 			}

Lib/x64/HandBrakeInterop.pdb

@@ -148,13 +148,13 @@
 
 				<Label
 					Grid.Row="1" Grid.Column="0" Height="24" HorizontalAlignment="Left" VerticalAlignment="Center" 
-					Visibility="{Binding CustomAnamorphicFieldsVisible, Converter={StaticResource VisibilityConverter}}"
+					Visibility="{Binding ModulusVisible, Converter={StaticResource VisibilityConverter}}"
 					Content="{x:Static res:EncodingRes.ModulusLabel}"/>
 				<ComboBox
 					Grid.Row="1" Grid.Column="1" Height="22" VerticalAlignment="Top" Margin="0,1,0,0" HorizontalAlignment="Left" MinWidth="65"
 					SelectedValue="{Binding Modulus}"
 					SelectedValuePath="Content"
-					Visibility="{Binding CustomAnamorphicFieldsVisible, Converter={StaticResource VisibilityConverter}}">
+					Visibility="{Binding ModulusVisible, Converter={StaticResource VisibilityConverter}}">
 					<ComboBoxItem>16</ComboBoxItem>
 					<ComboBoxItem>8</ComboBoxItem>
 					<ComboBoxItem>4</ComboBoxItem>

Lib/x86/HandBrakeInterop.dll

@@ -330,6 +330,7 @@ public AnamorphicCombo SelectedAnamorphic
 
 				this.RaisePropertyChanged(() => this.SelectedAnamorphic);
 				this.RaisePropertyChanged(() => this.CustomAnamorphicFieldsVisible);
+				this.RaisePropertyChanged(() => this.ModulusVisible);
 				this.RaisePropertyChanged(() => this.PixelAspectVisibile);
 				this.RaisePropertyChanged(() => this.KeepDisplayAspect);
 				this.RaisePropertyChanged(() => this.KeepDisplayAspectEnabled);
@@ -367,6 +368,14 @@ public int Modulus
 			}
 		}
 
+		public bool ModulusVisible
+		{
+			get
+			{
+				return this.Profile.Anamorphic == Anamorphic.Custom || this.Profile.Anamorphic == Anamorphic.Loose;
+			}
+		}
+
 		public bool UseDisplayWidth
 		{
 			get
@@ -653,6 +662,7 @@ public void NotifyAllChanged()
 			this.RaisePropertyChanged(() => this.KeepDisplayAspectEnabled);
 			this.RaisePropertyChanged(() => this.SelectedAnamorphic);
 			this.RaisePropertyChanged(() => this.CustomAnamorphicFieldsVisible);
+			this.RaisePropertyChanged(() => this.ModulusVisible);
 			this.RaisePropertyChanged(() => this.Modulus);
 			this.RaisePropertyChanged(() => this.UseDisplayWidth);
 			this.RaisePropertyChanged(() => this.DisplayWidth);

Lib/x86/HandBrakeInterop.pdb

@@ -542,7 +542,6 @@ private void RefreshPreviews()
 
 			this.job = this.mainViewModel.EncodeJob;
 
-			//EncodingProfile profile = this.job.EncodingProfile;
 			int width, height;
 
 			int parWidth, parHeight;