Updated to HandBrake 4011svn. Added logic to report failures when errors are logged during the encode or when the encode finishes prematurely. Added Copy button to log window.

Author: RandomEngy

Lib/x64/hb.dll

@@ -8,6 +8,8 @@ public interface ILogger : IDisposable
 	{
 		void ClearLog();
 		void Log(string message);
+		void LogError(string message);
+		object LogLock { get; }
 		List<LogEntry> LogEntries { get; }
 
 		event EventHandler<EventArgs<LogEntry>> EntryLogged;

Lib/x86/hb.dll

@@ -44,6 +44,14 @@ public Logger()
 			this.AddEntry(initialEntry);
 		}
 
+		public object LogLock
+		{
+			get
+			{
+				return logLock;
+			}
+		}
+
 		public List<LogEntry> LogEntries
 		{
 			get
@@ -66,9 +74,24 @@ public void Log(string message)
 			this.AddEntry(entry);
 		}
 
+		public void LogError(string message)
+		{
+			var entry = new LogEntry
+			{
+				LogType = LogType.Error,
+				Source = LogSource.VidCoder,
+				Text = "# " + message
+			};
+
+			this.AddEntry(entry);
+		}
+
 		public void ClearLog()
 		{
-			this.LogEntries.Clear();
+			lock (this.LogLock)
+			{
+				this.LogEntries.Clear();
+			}
 
 			if (this.Cleared != null)
 			{
@@ -101,7 +124,7 @@ private void AddEntry(LogEntry entry)
 				}
 			}
 
-			lock (this.logLock)
+			lock (this.LogLock)
 			{
 				this.LogEntries.Add(entry);
 			}

VidCoder/Services/Interfaces/ILogger.cs

@@ -14,7 +14,7 @@
 			<TextBlock HorizontalAlignment="Left" Name="versionLabel" Text="Version" VerticalAlignment="Top"  />
 			<TextBlock Text="{Binding Version}" Margin="5,0,0,0" Name="versionText" />
 		</StackPanel>
-		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (3978svn)" VerticalAlignment="Top" />
+		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (4011svn)" VerticalAlignment="Top" />
 		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,108,0,0" Name="textBlock2" Text="© 2010 VidCoder Developers" VerticalAlignment="Top" />
 		<Label Content="License:" Height="28" HorizontalAlignment="Left" Margin="12,138,0,0" Name="label1" VerticalAlignment="Top" />
 

VidCoder/Services/Logger.cs

@@ -3,7 +3,8 @@
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 		Title="Log" Height="393" Width="459"
 		Style="{StaticResource NormalWindow}"
-		WindowStyle="ToolWindow" ShowInTaskbar="False" Closing="Window_Closing">
+		WindowStyle="ToolWindow" ShowInTaskbar="False" Closing="Window_Closing"
+		MinWidth="220" MinHeight="95">
 	<Window.InputBindings>
 		<KeyBinding Key="N" Modifiers="Control" Command="{Binding MainViewModel.OpenEncodingWindowCommand}" />
 		<KeyBinding Key="P" Modifiers="Control" Command="{Binding MainViewModel.OpenPreviewWindowCommand}" />
@@ -23,6 +24,15 @@
 				</FlowDocument.Resources>
 			</FlowDocument>
 		</RichTextBox>
+		<Button
+			Height="24" HorizontalAlignment="Right" Margin="0,0,127,7" Name="copyButton" VerticalAlignment="Bottom" Width="68"
+			Command="{Binding CopyCommand}">
+			<StackPanel Orientation="Horizontal">
+				<Image Source="/Icons/copy.png" Width="16" Height="16" />
+				<TextBlock Text="Copy" Margin="4,0,0,0" />
+			</StackPanel>
+		</Button>
+
 		<Button
 			Content="Clear"
 			Command="{Binding ClearLogCommand}"

VidCoder/View/AboutDialog.xaml

@@ -28,10 +28,13 @@ public LogWindow()
 		{
 			InitializeComponent();
 
-			// Add all existing log entries
-			foreach (LogEntry entry in this.logger.LogEntries)
+			lock (this.logger.LogLock)
 			{
-				this.AddEntry(entry);
+				// Add all existing log entries
+				foreach (LogEntry entry in this.logger.LogEntries)
+				{
+					this.AddEntry(entry);
+				}
 			}
 
 			this.Loaded += (sender, e) =>
@@ -40,8 +43,8 @@ public LogWindow()
 			};
 
 			// Subscribe to events
-			this.logger.EntryLogged += OnEntryLogged;
-			this.logger.Cleared += OnCleared;
+			this.logger.EntryLogged += this.OnEntryLogged;
+			this.logger.Cleared += this.OnCleared;
 		}
 
 		protected override void OnSourceInitialized(EventArgs e)
@@ -52,6 +55,9 @@ protected override void OnSourceInitialized(EventArgs e)
 
 		private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
 		{
+			this.logger.EntryLogged -= this.OnEntryLogged;
+			this.logger.Cleared -= this.OnCleared;
+
 			Settings.Default.LogWindowPlacement = this.GetPlacement();
 			Settings.Default.Save();
 		}

VidCoder/View/LogWindow.xaml

@@ -390,7 +390,7 @@
 						Orientation="Horizontal"
 						Visibility="{Binding SourcePicked, Converter={StaticResource VisibilityConverter}}">
 						<TextBlock Text="Source:" Style="{StaticResource SectionHeader}" />
-						<Image Source="{Binding SourceIcon}" Width="16" Height="16" Margin="4,2,0,2" VerticalAlignment="Top" HorizontalAlignment="Left" />
+						<Image Source="{Binding SourceIcon}" Width="16" Height="16" Margin="3.5,1,0,0" VerticalAlignment="Center" />
 						<TextBlock Text="{Binding SourceText}" Style="{StaticResource SourceDescription}" Margin="4,4,4,3" />
 						<Polygon
 							VerticalAlignment="Center"

VidCoder/View/LogWindow.xaml.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Windows;
 using System.Windows.Input;
 using Microsoft.Practices.Unity;
 using VidCoder.Model;
@@ -15,6 +16,7 @@ public class LogViewModel : OkCancelDialogViewModel
 		private ILogger logger = Unity.Container.Resolve<ILogger>();
 
 		private ICommand clearLogCommand;
+		private ICommand copyCommand;
 
 		public MainViewModel MainViewModel
 		{
@@ -40,5 +42,31 @@ public ICommand ClearLogCommand
 				return this.clearLogCommand;
 			}
 		}
+
+		public ICommand CopyCommand
+		{
+			get
+			{
+				if (this.copyCommand == null)
+				{
+					this.copyCommand = new RelayCommand(param =>
+					{
+						lock (this.logger.LogLock)
+						{
+							var logTextBuilder = new StringBuilder();
+
+							foreach (LogEntry entry in this.logger.LogEntries)
+							{
+								logTextBuilder.AppendLine(entry.Text);
+							}
+
+							Clipboard.SetText(logTextBuilder.ToString());
+						}
+					});
+				}
+
+				return this.copyCommand;
+			}
+		}
 	}
 }

VidCoder/View/MainWindow.xaml

@@ -82,6 +82,7 @@ public class MainViewModel : ViewModelBase
 		private bool encoding;
 		private bool paused;
 		private bool encodeStopped;
+		private bool errorLoggedDuringJob; // True if an error was logged during an encode (and no scan was going on at the time)
 		private int totalTasks;
 		private int taskNumber;
 		private bool encodeSpeedDetailsAvailable;
@@ -93,6 +94,7 @@ public class MainViewModel : ViewModelBase
 		private double completedQueueWork;
 		private double totalQueueCost;
 		private double overallEncodeProgressFraction;
+		private TimeSpan currentJobEta; // Kept around to check if the job finished early
 		private TaskbarItemProgressState encodeProgressState;
 		private ObservableCollection<EncodeResultViewModel> completedJobs;
 
@@ -203,8 +205,8 @@ public MainViewModel()
 				this.encodeQueue.Add(new EncodeJobViewModel(job));
 			}
 
-			this.autoPause.PauseEncoding += new EventHandler(this.AutoPauseEncoding);
-			this.autoPause.ResumeEncoding += new EventHandler(this.AutoResumeEncoding);
+			this.autoPause.PauseEncoding += this.AutoPauseEncoding;
+			this.autoPause.ResumeEncoding += this.AutoResumeEncoding;
 
 			// Always select the modified preset if it exists.
 			// Otherwise, choose the last selected preset.
@@ -223,6 +225,15 @@ public MainViewModel()
 				presetIndex = 0;
 			}
 
+			// Keep track of errors logged. HandBrake doesn't reliably report errors on job completion.
+			this.logger.EntryLogged += (sender, e) =>
+			{
+				if (e.Value.LogType == LogType.Error && this.Encoding && !this.ScanningSource)
+				{
+					this.errorLoggedDuringJob = true;
+				}
+			};
+
 			this.SelectedPreset = this.allPresets[presetIndex];
 
 			this.completedJobs = new ObservableCollection<EncodeResultViewModel>();
@@ -2566,6 +2577,8 @@ private void StartEncode()
 				}
 			}
 
+			this.currentJobEta = TimeSpan.Zero;
+			this.errorLoggedDuringJob = false;
 			this.EncodeQueue[0].ReportEncodeStart(this.totalTasks == 1);
 			this.CurrentJob.HandBrakeInstance.StartEncode(this.CurrentJob.Job);
 		}
@@ -2641,9 +2654,9 @@ private void OnEncodeProgress(object sender, EncodeProgressEventArgs e)
 
 					double currentJobRemainingWork = this.EncodeQueue[0].Cost - currentJobCompletedWork;
 
-					TimeSpan currentJobEta =
+					this.currentJobEta =
 						TimeSpan.FromSeconds(currentJobRemainingWork / overallWorkCompletionRate);
-					this.EncodeQueue[0].Eta = currentJobEta;
+					this.EncodeQueue[0].Eta = this.currentJobEta;
 				}
 			}
 
@@ -2688,17 +2701,27 @@ private void OnEncodeCompleted(object sender, EncodeCompletedEventArgs e)
 					if (e.Error)
 					{
 						succeeded = false;
-						this.logger.Log("Encode failed. HandBrake reported an error.");
+						this.logger.LogError("Encode failed. HandBrake reported an error.");
+					}
+					else if (this.errorLoggedDuringJob)
+					{
+						succeeded = false;
+						this.logger.LogError("Encode failed. Error(s) were reported during the encode.");
 					}
 					else if (!outputFileInfo.Exists)
 					{
 						succeeded = false;
-						this.logger.Log("Encode failed. HandBrake reported no error but the expected output file was not found.");
+						this.logger.LogError("Encode failed. HandBrake reported no error but the expected output file was not found.");
 					}
 					else if (outputFileInfo.Length == 0)
 					{
 						succeeded = false;
-						this.logger.Log("Encode failed. HandBrake reported no error but the output file was empty.");
+						this.logger.LogError("Encode failed. HandBrake reported no error but the output file was empty.");
+					}
+					else if (this.currentJobEta > TimeSpan.FromMinutes(1))
+					{
+						succeeded = false;
+						this.logger.LogError("Encode failed. HandBrake reported no error but the encode finished prematurely.");
 					}
 
 					this.CompletedJobs.Add(new EncodeResultViewModel(