Updating to HandBrake 4024svn. This should fix problems with corrupted mpeg2 preview images and encodes from mpeg2 sources reporting the wrong progress and reporting as failed. Fixed problem where target sizes over 2048 MB don't work. Updated version numbers.

RandomEngy · RandomEngy · commit d5c821aff7dd · 2011-06-07T17:51:22.000-07:00
diff --git a/HandBrakeInterop/HandBrakeInterop/HandBrakeInstance.cs b/HandBrakeInterop/HandBrakeInterop/HandBrakeInstance.cs
@@ -290,7 +290,7 @@ public BitmapImage GetPreview(EncodeJob job, int previewNumber)
 		/// <returns>The video bitrate in kbps.</returns>
 		public int CalculateBitrate(EncodeJob job, int sizeMB, double overallSelectedLengthSeconds = 0)
 		{
-			long availableBytes = sizeMB * 1024 * 1024;
+			long availableBytes = ((long) sizeMB) * 1024 * 1024;
 
 			EncodingProfile profile = job.EncodingProfile;
 			Title title = this.GetTitle(job.Title);
diff --git a/HandBrakeInterop/HandBrakeInterop/HbLib/Misc.cs b/HandBrakeInterop/HandBrakeInterop/HbLib/Misc.cs
@@ -188,7 +188,6 @@ public struct hb_state_param_u
 	[StructLayout(LayoutKind.Sequential)]
 	public struct hb_state_s
 	{
-
 		/// int
 		public int state;
 		public hb_state_param_u param;
diff --git a/HandBrakeInterop/HandBrakeInterop/Properties/AssemblyInfo.cs b/HandBrakeInterop/HandBrakeInterop/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.17.0.0")]
-[assembly: AssemblyFileVersion("1.17.0.0")]
+[assembly: AssemblyVersion("1.18.0.0")]
+[assembly: AssemblyFileVersion("1.18.0.0")]
diff --git a/Installer/VidCoder-x64.iss b/Installer/VidCoder-x64.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=VidCoder
-AppVerName=VidCoder 0.9.1 (x64)
+AppVerName=VidCoder 0.9.2 (x64)
 
 DefaultDirName={pf}\VidCoder
 DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
 SolidCompression=yes
 
 OutputDir=BuiltInstallers
-OutputBaseFilename=VidCoder-0.9.1-x64
+OutputBaseFilename=VidCoder-0.9.2-x64
 
 AppId=VidCoder-x64
 UsePreviousAppDir=yes
diff --git a/Installer/VidCoder-x86.iss b/Installer/VidCoder-x86.iss
@@ -3,7 +3,7 @@
 
 [Setup]
 AppName=VidCoder
-AppVerName=VidCoder 0.9.1 (x86)
+AppVerName=VidCoder 0.9.2 (x86)
 
 DefaultDirName={pf}\VidCoder
 DisableProgramGroupPage=yes
@@ -13,7 +13,7 @@ Compression=lzma
 SolidCompression=yes
 
 OutputDir=BuiltInstallers
-OutputBaseFilename=VidCoder-0.9.1-x86
+OutputBaseFilename=VidCoder-0.9.2-x86
 
 AppId=VidCoder
 UsePreviousAppDir=yes
diff --git a/Installer/latest.xml b/Installer/latest.xml
@@ -1,12 +1,12 @@
 <UpdateInfo>
 	<Release>
-		<Latest>0.9.0</Latest>
-		<DownloadLocation>http://engy.us/VidCoder/VidCoder-0.9.0-x86.exe</DownloadLocation>
-		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/67117</ChangelogLocation>
+		<Latest>0.9.1</Latest>
+		<DownloadLocation>http://engy.us/VidCoder/VidCoder-0.9.1-x86.exe</DownloadLocation>
+		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/67400</ChangelogLocation>
 	</Release>
 	<Release-x64>
-		<Latest>0.9.0</Latest>
-		<DownloadLocation>http://engy.us/VidCoder/VidCoder-0.9.0-x64.exe</DownloadLocation>
-		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/67117</ChangelogLocation>
+		<Latest>0.9.1</Latest>
+		<DownloadLocation>http://engy.us/VidCoder/VidCoder-0.9.1-x64.exe</DownloadLocation>
+		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/67400</ChangelogLocation>
 	</Release-x64>
 </UpdateInfo>
diff --git a/Lib/x64/hb.dll b/Lib/x64/hb.dll
diff --git a/Lib/x86/hb.dll b/Lib/x86/hb.dll
diff --git a/VidCoder/Properties/AssemblyInfo.cs b/VidCoder/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
diff --git a/VidCoder/View/AboutDialog.xaml b/VidCoder/View/AboutDialog.xaml
@@ -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 (4011svn)" VerticalAlignment="Top" />
+		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (4024svn)" 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" />
 
diff --git a/VidCoder/View/MainWindow.xaml b/VidCoder/View/MainWindow.xaml
@@ -731,17 +731,17 @@
 				</Grid.ColumnDefinitions>
 
 
-				<TextBlock Text="Task" HorizontalAlignment="Left" VerticalAlignment="Top" Height="15.96" Margin="10,6,0,0" Width="26.25"
+				<TextBlock Text="Task" HorizontalAlignment="Left" VerticalAlignment="Top" Height="15.96" Margin="10,4,0,0" Width="26.25"
 					Visibility="{Binding Encoding, Converter={StaticResource VisibilityConverter}}"/>
-				<TextBlock HorizontalAlignment="Left" Margin="38,6,0,0" VerticalAlignment="Top" Width="33"
+				<TextBlock HorizontalAlignment="Left" Margin="38,4,0,0" VerticalAlignment="Top" Width="33"
 					Text="{Binding TaskDetails}"
 					Visibility="{Binding Encoding, Converter={StaticResource VisibilityConverter}}"/>
 				<TextBlock
-					Text="ETA:" Width="25" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,23,0,0"
+					Text="ETA:" Width="25" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,21,0,0"
 					ToolTip="{x:Static resx:Resources.QueueEtaToolTip}"
 					Visibility="{Binding EncodeSpeedDetailsAvailable, Converter={StaticResource VisibilityConverter}}" />
 				<TextBlock
-					Text="{Binding EstimatedTimeRemaining}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="38,23,0,0"
+					Text="{Binding EstimatedTimeRemaining}" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="38,21,0,0"
 					ToolTip="{x:Static resx:Resources.QueueEtaToolTip}"
 					Visibility="{Binding EncodeSpeedDetailsAvailable, Converter={StaticResource VisibilityConverter}}"/>
 

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ public BitmapImage GetPreview(EncodeJob job, int previewNumber)`
`290`	`290`	`/// <returns>The video bitrate in kbps.</returns>`
`291`	`291`	`public int CalculateBitrate(EncodeJob job, int sizeMB, double overallSelectedLengthSeconds = 0)`
`292`	`292`	`{`
`293`		`- long availableBytes = sizeMB * 1024 * 1024;`
	`293`	`+ long availableBytes = ((long) sizeMB) * 1024 * 1024;`
`294`	`294`
`295`	`295`	`EncodingProfile profile = job.EncodingProfile;`
`296`	`296`	`Title title = this.GetTitle(job.Title);`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,6 @@ public struct hb_state_param_u`
`188`	`188`	`[StructLayout(LayoutKind.Sequential)]`
`189`	`189`	`public struct hb_state_s`
`190`	`190`	`{`
`191`		`-`
`192`	`191`	`/// int`
`193`	`192`	`public int state;`
`194`	`193`	`public hb_state_param_u param;`