Fix logging threading issue, implement two-pass encoding, fix x264 options string getting fried before it could be used by the encode process.

Author: RandomEngy

Lib/HandBrakeInterop.dll

@@ -36,7 +36,10 @@ public string LogText
         {
             get
             {
-                return logBuilder.ToString();
+                lock (this.logLock)
+                {
+                    return logBuilder.ToString();
+                }
             }
         }
 

Lib/HandBrakeInterop.pdb

@@ -486,6 +486,16 @@
                         Text="{Binding QualitySliderLeftText}"/>
                     <TextBlock Height="21" HorizontalAlignment="Right" Margin="0,149,6,0" VerticalAlignment="Top" Width="93" TextAlignment="Right"
                         Text="{Binding QualitySliderRightText}"/>
+                    <CheckBox
+                        Content="2-pass Encoding"
+                        Height="16" HorizontalAlignment="Left" Margin="124,112,0,0" VerticalAlignment="Top"
+                        IsChecked="{Binding TwoPassEncoding}"
+                        IsEnabled="{Binding TwoPassEncodingEnabled}"/>
+                    <CheckBox
+                        Content="Turbo first Pass"
+                        Height="16" HorizontalAlignment="Left" Margin="145,135,0,0" VerticalAlignment="Top"
+                        IsChecked="{Binding TurboFirstPass}"
+                        IsEnabled="{Binding TurboFirstPassEnabled}"/>
                 </Grid>
             </TabItem>
             <TabItem Header="Audio">

VidCoder/Model/Logger.cs

@@ -1417,6 +1417,59 @@ public double SelectedFramerate
             }
         }
 
+        public bool TwoPassEncoding
+        {
+            get
+            {
+                return this.profile.TwoPass;
+            }
+
+            set
+            {
+                this.profile.TwoPass = value;
+                this.NotifyPropertyChanged("TwoPassEncoding");
+                this.NotifyPropertyChanged("TurboFirstPass");
+                this.NotifyPropertyChanged("TurboFirstPassEnabled");
+                this.IsModified = true;
+            }
+        }
+
+        public bool TwoPassEncodingEnabled
+        {
+            get
+            {
+                return this.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality;
+            }
+        }
+
+        public bool TurboFirstPass
+        {
+            get
+            {
+                if (!this.TwoPassEncoding)
+                {
+                    return false;
+                }
+
+                return profile.TurboFirstPass;
+            }
+
+            set
+            {
+                this.profile.TurboFirstPass = value;
+                this.NotifyPropertyChanged("TurboFirstPass");
+                this.IsModified = true;
+            }
+        }
+
+        public bool TurboFirstPassEnabled
+        {
+            get
+            {
+                return this.VideoEncodeRateType != VideoEncodeRateType.ConstantQuality && this.TwoPassEncoding;
+            }
+        }
+
         public VideoEncodeRateType VideoEncodeRateType
         {
             get
@@ -1447,8 +1500,18 @@ public VideoEncodeRateType VideoEncodeRateType
                         default:
                             break;
                     }
+
+                    // Disable two-pass options
+
+                    this.profile.TwoPass = false;
+                    this.profile.TurboFirstPass = false;
+                    this.NotifyPropertyChanged("TwoPassEncoding");
+                    this.NotifyPropertyChanged("TurboFirstPass");
                 }
 
+                this.NotifyPropertyChanged("TwoPassEncodingEnabled");
+                this.NotifyPropertyChanged("TurboFirstPassEnabled");
+
                 if (value == VideoEncodeRateType.AverageBitrate)
                 {
                     this.VideoBitrate = 1200;
@@ -2459,6 +2522,10 @@ private void NotifyAllChanged()
             this.NotifyPropertyChanged("DeblockText");
             this.NotifyPropertyChanged("Grayscale");
             this.NotifyPropertyChanged("SelectedFramerate");
+            this.NotifyPropertyChanged("TwoPassEncoding");
+            this.NotifyPropertyChanged("TurboFirstPass");
+            this.NotifyPropertyChanged("TwoPassEncodingEnabled");
+            this.NotifyPropertyChanged("TurboFirstPassEnabled");
             this.NotifyPropertyChanged("VideoEncodeRateType");
             this.NotifyPropertyChanged("TargetSize");
             this.NotifyPropertyChanged("VideoBitrate");

VidCoder/View/EncodingWindow.xaml

@@ -102,8 +102,8 @@ public MainViewModel()
 
             this.logger = new Logger();
 
-            this.updateService.HandlePendingUpdate();
             this.updateService = ServiceFactory.UpdateService;
+            this.updateService.HandlePendingUpdate();
             this.updateService.CheckUpdates();
 
             List<Preset> presets = new List<Preset>();
@@ -1661,6 +1661,12 @@ public void StartEncodeQueue()
             foreach (EncodeJobViewModel jobVM in this.EncodeQueue)
             {
                 this.totalQueueTime += jobVM.Job.Length;
+
+                // Add the job length twice for two-pass encoding.
+                if (jobVM.Job.EncodingProfile.TwoPass)
+                {
+                    this.totalQueueTime += jobVM.Job.Length;
+                }
             }
 
             this.OverallEncodeProgressFraction = 0;
@@ -1715,7 +1721,14 @@ private void OnEncodeProgress(object sender, EncodeProgressEventArgs e)
                 return;
             }
 
-            double completedSeconds = this.completedQueueTime.TotalSeconds + this.EncodeQueue[0].Job.Length.TotalSeconds * e.FractionComplete;
+            double currentJobLengthSeconds = this.EncodeQueue[0].Job.Length.TotalSeconds;
+
+            double completedSeconds = this.completedQueueTime.TotalSeconds + currentJobLengthSeconds * e.FractionComplete;
+            if (e.Pass == 2)
+            {
+                completedSeconds += currentJobLengthSeconds;
+            }
+
             this.OverallEncodeProgressFraction = completedSeconds / this.totalQueueTime.TotalSeconds;
 
             this.EncodeQueue[0].PercentComplete = (int)(e.FractionComplete * 100);
@@ -1756,6 +1769,11 @@ private void OnEncodeCompleted(object sender, EventArgs e)
                 {
                     // If the encode completed successfully
                     this.completedQueueTime += this.EncodeQueue[0].Job.Length;
+                    if (this.EncodeQueue[0].Job.EncodingProfile.TwoPass)
+                    {
+                        this.completedQueueTime += this.EncodeQueue[0].Job.Length;
+                    }
+                    
                     HandBrakeInstance finishedInstance = this.EncodeQueue[0].HandBrakeInstance;
                     this.EncodeQueue.RemoveAt(0);