Packman Build Service PMBS

handbrake.changes Changed

handbrake.spec Changed

@@ -16,9 +16,12 @@
 Name:           handbrake
 #define rev 3549
 #Version:			0.9.4+r%{rev}
-Version:        0.9.6
+Version:        0.9.8
 Release:        1.pm.1
+License:        GPL-2.0+
 Summary:        Multithreaded Video Transcoder
+Url:            http://handbrake.fr/
+Group:          Productivity/Multimedia/Video/Editors and Convertors
 # svn://svn.handbrake.fr/HandBrake/trunk#%{rev}
 #Source:        HandBrake-svn%{rev}.tar.bz2
 Source:         http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
@@ -46,29 +49,47 @@
 Source122:      http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
 Source123:      http://download.handbrake.fr/handbrake/contrib/yasm-1.1.0.tar.gz
 Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
+Source152:	handbrake-libmkv_no_return_in_nonvoid_function.patch
 Source99:       handbrake-rpmlintrc
-URL:            http://handbrake.fr/
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-License:        GNU General Public License version 2 (GPL v2)
-BuildRoot:      %{_tmppath}/build-%{name}-%{version}
-BuildRequires:  python curl wget subversion
-BuildRequires:  gtk2-devel gtkhtml2-devel libbz2-devel zlib-devel
-BuildRequires:  libicu-devel libnotify-devel libgudev-1_0-devel alsa-devel
-BuildRequires:  sqlite3-devel libcurl-devel libxslt-devel
+BuildRequires:  alsa-devel
+BuildRequires:  curl
 BuildRequires:  fribidi-devel
-BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires:  gstreamer-0_10-plugins-base-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libbz2-devel
+BuildRequires:  libcurl-devel
+BuildRequires:  libicu-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  python
+BuildRequires:  sqlite3-devel
+BuildRequires:  subversion
+BuildRequires:  wget
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(gstreamer-0.10)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(libnotify)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} <= 1140
-BuildRequires:  hal-devel
+BuildRequires:  pkgconfig(hal)
 %endif
-BuildRequires:  dbus-1-glib-devel
-%if %suse_version >= 1110
+BuildRequires:  pkgconfig(dbus-glib-1)
+%if 0%{?suse_version} >= 1110
 BuildRequires:  libwebkit-devel
 %else
 BuildRequires:  WebKitGtk-devel
 %endif
-BuildRequires:  gcc gcc-c++ make glibc-devel yasm nasm
-BuildRequires:  autoconf automake libtool intltool
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
+BuildRequires:  intltool
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  nasm
 BuildRequires:  update-desktop-files
+BuildRequires:  yasm
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -104,23 +125,23 @@
 %endif
 
 # Copy 3rd party dependencies into expected locations:
-%__mkdir download
+mkdir download
 for f in \
 %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} %{S:106} \
 %{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
 %{S:113} %{S:114} %{S:115} %{S:116} %{S:117} %{S:118} \
 %{S:119} %{S:120} %{S:121} %{S:122} %{S:123} \
 ; do
-     %__ln_s "$f" download/
+     ln -s "$f" download/
 done
 
 # check beforehand that the versions match what the
 # build system expects:
 missing=$PWD/.missing
-%__grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
-| %__awk -F' =' '{print $2}' \
+grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
+| gawk -F' =' '{print $2}' \
 | while read url; do
-     f=$(echo "$url" | %__sed 's|^.*/||')
+     f=$(echo "$url" | sed 's|^.*/||')
      case $f in
     	  bzip2*|libiconv*|pthreads*|zlib*) continue ;;
      esac
@@ -136,13 +157,14 @@
 %build
 # will be removed when the makefiles are fixed, currently
 # fails on openSUSE factory because of --as-needed
-export SUSE_ASNEEDED=0
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+# export SUSE_ASNEEDED=0
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
-# %__cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
+# cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
+cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
 
-%__mkdir build
+mkdir build
 ./configure \
      --force \
      --build="$PWD/build" \
@@ -154,8 +176,8 @@
 GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
 GHB_PKGS="$GHB_PKGS gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 gstreamer-video-0.10"
 pushd build
-%__make libhb/project.h
-%__make %{?_smp_mflags} \
+make libhb/project.h
+make %{?_smp_mflags} \
     GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \
     GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
 popd #build
@@ -163,17 +185,17 @@
 
 %install
 pushd build
-%__make install
+make install
 popd #build
 
-%__ln_s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
+ln -s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
 
 %suse_update_desktop_file -r ghb AudioVideo AudioVideoEditing
 
-%__rm "%{buildroot}%{_datadir}/icons"/*/*.cache
+rm "%{buildroot}%{_datadir}/icons"/*/*.cache
 
 %clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%{?buildroot:rm -rf %{buildroot}}
 
 %files cli
 %defattr(-,root,root)

handbrake-libmkv_no_return_in_nonvoid_function.patch Added

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Converters/AudioEnumConverter.cs Deleted

@@ -1,83 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BooleanToVisibilityConverter.cs" company="HandBrake Project (http://handbrake.fr)">
-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-//   Defines the BooleanToVisibilityConverter type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Converters
-{
-    using System.Collections.Generic;
-    using System.Globalization;
-    using System.Windows.Data;
-    using System;
-
-    using HandBrake.ApplicationServices.Functions;
-    using HandBrake.Interop.Model.Encoding;
-
-    /// <summary>
-    /// Boolean to Visibility Converter
-    /// </summary>
-    public sealed class AudioEnumConverter : IValueConverter
-    {
-        /// <summary>
-        /// Convert an Enum to it's display value (attribute)
-        /// </summary>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="targetType">
-        /// The target type.
-        /// </param>
-        /// <param name="parameter">
-        /// The parameter. (A boolean which inverts the output)
-        /// </param>
-        /// <param name="culture">
-        /// The culture.
-        /// </param>
-        /// <returns>
-        /// Visibility property
-        /// </returns>
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is Mixdown)
-            {
-                return EnumHelper<Mixdown>.GetEnumDisplayValues(value.GetType());
-            }
-            else if (value is AudioEncoder)
-            {
-                return EnumHelper<AudioEncoder>.GetEnumDisplayValues(value.GetType());
-            }
-
-            return new List<string>();
-        }
-
-        /// <summary>
-        /// Convert Back for the IValueConverter Interface. Not used!
-        /// </summary>
-        /// <param name="value">
-        /// The value.
-        /// </param>
-        /// <param name="targetType">
-        /// The target type.
-        /// </param>
-        /// <param name="parameter">
-        /// The parameter.
-        /// </param>
-        /// <param name="culture">
-        /// The culture.
-        /// </param>
-        /// <returns>
-        /// Nothing
-        /// </returns>
-        /// <exception cref="NotImplementedException">
-        /// This method is not used!
-        /// </exception>
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

HandBrake-0.9.6.tar.bz2/AUTHORS -> HandBrake-0.9.8.tar.bz2/AUTHORS Changed

@@ -1,6 +1,6 @@
 AUTHORS file for HandBrake <http://handbrake.fr/>
 
-Eric Petit <titer@m0k.org>
+Eric Petit 
  + Core (construct, multithreading, BeOS/OS X/Linux ports)
  + MPEG demuxer
  + MPEG-2, AC3 and MPGA decoders (w/ libmpeg2/liba52/libavcodec)
@@ -14,13 +14,13 @@
  + OS X interface
  + French translation
 
-Laurent Aimar <fenrir@via.ecp.fr>
+Laurent Aimar
  + H264 and Vorbis encoders (w/ libx264/libvorbis)
  + OGG/OGM muxer (w/ libogg)
  + Gtk2 interface
  + wxWidgets interface
 
-Van Jacobson <vanj.hb@gmail.com> (van)
+Van Jacobson (van)
  + Universal input architecture
  + MPEG Standard Target Decoder timing model
  + Auto-typing MPEG stream files
@@ -28,45 +28,45 @@
  + Minor dvd reader fixes
  + Chapter mark bug fixes
 
-John Allen (?) <johnallenemail@gmail.com> (johnallen)
+John Allen
  + Core enhancements
  + Threading enhancements
  + Simplified Mac OS X GUI
 
-Joe Crain <dynaflashtech@gmail.com> (dynaflash)
+Joe Crain (dynaflash)
  + Mac OS X GUI enhancements/rewrite
 
-Damiano Galassi <damiog@gmail.com> (ritsuka)
+Damiano Galassi (ritsuka)
  + Mac OS X GUI enhancements
 
-Edward Groenendaal <eddyg.hb@myreflection.org> (eddyg)
+Edward Groenendaal (eddyg)
  + Major bug fixes
  + Subtitle scan & Colour
  + Performance improvements
  
-David Foster <unknown> (davidfstr)
+David Foster (davidfstr)
  + Subtitles from file inputs
  + SSA subtitle support
 
-Rodney Hester <rhester@multics.dynalias.com> (rhester)
+Rodney Hester (rhester)
  + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
 
-Andrew Kimpton <awk@awkward.org> (awk)
+Andrew Kimpton (awk)
  + MPEG Audio fixes
  + MPEG Stream Support
 
-Chris Lee <clee@kde.org>
+Chris Lee 
  + PAR/anamorphic support
  + dvdread enhancements
  + Linux GUI
 
-Chris Long <chris.long@mac.com> (chrislong)
+Chris Long (chrislong)
  + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
 
-Brian Lopez <seniorlopez@gmail.com> (brianmario)
+Brian Mario <Unknown> (brianmario)
  + Windows GUI
 
-Maurj <handbrake@maurj.com> (maurj)
+Maurj(maurj)
  + Dolby Surround and Dolby Pro Logic II mixdowns
  + 6-channel AAC audio from 5.1 source
  + Mono AAC audio from mono source
@@ -75,44 +75,45 @@
  + Mac OS X GUI enhancements
  + Support for DTS audio sources
 
-Mirkwood <mirkwood07@gmail.com> (mirkwood)
+Mirkwood (mirkwood)
  + Windows CLI port
 
-Nyx <unknown> (Nyx)
+Nyx 
  + Frame re-ordering and flushing in mp4
 
-Philippe Rigaux <pri@nopapers.org> (prigaux)
+Philippe Rigaux (prigaux)
  + 3rd party library integration
  + Mac OS X GUI enhancements
  + PAR/anamorphic support
  + Universal binary build process
  + Conversion from jam to make for compiles
 
-Jonathon Rubin <jb.rubin@gmail.com> (jbrjake)
+Jonathon Rubin (jbrjake)
  + Massive core enhancements
  + Significant improvements to H.264 support
 
-Scott <unknown> (s55)
+Scott(s55)
  + Windows GUI
  
-John Stebbins <jstebbins.hb@gmail.com> (j45)
+John Stebbins (j45)
  + GTK GUI
  + TrueHD demuxing
  + libavcodec video encoding quality enhancements
  + Numerous bug fixes
  
-Chris Thoman <cthoman@gmail.com> (huevos_rancheros)
+Chris Thoman (huevos_rancheros)
  + Ported video filters from libmpcodec
 
-Mark Krenek <markkrenek@mac.com> (travistex)
+Mark Krenek (travistex)
  + Mac OS X GUI enhancements
  + Mac OS X GUI Queueing system
 
-Kona 'mike' Blend <Kona8lend@gmail.com> (KonaBlend)
+Kona 'mike' Blend (KonaBlend)
  + Build System and related guides
  
-David Rickard <unknown> (RandomEngy)
- + HandBrake Interop Library
- 
-Tim Walker <unknown> (Rodeo)
- + Miscellaneous fixes and enhancements
+David Rickard (RandomEngy)
++ HandBrake Interop Library
+
+Tim Walker (Rodeo)
++ Miscellaneous fixes and enhancements
+

HandBrake-0.9.6.tar.bz2/NEWS -> HandBrake-0.9.8.tar.bz2/NEWS Changed

HandBrake-0.9.6.tar.bz2/THANKS -> HandBrake-0.9.8.tar.bz2/THANKS Changed

HandBrake-0.9.6.tar.bz2/contrib/libass/module.defs -> HandBrake-0.9.8.tar.bz2/contrib/libass/module.defs Changed

HandBrake-0.9.8.tar.bz2/contrib/libmkv/A02-audio-out-sampling-freq.patch Added

@@ -0,0 +1,28 @@
+diff --git a/include/libmkv.h b/include/libmkv.h
+index 146a91f..f03d608 100644
+--- a/include/libmkv.h
++++ b/include/libmkv.h
+@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
+ 		} video;
+ 		struct {
+ 			float samplingFreq;	/* Sampling Frequency in Hz */
++			float outputSamplingFreq;	/* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
+ 			unsigned channels;	/* Number of channels for this track */
+ 			unsigned bitDepth;	/* Bits per sample (PCM) */
+ 		} audio;
+diff --git a/src/tracks.c b/src/tracks.c
+index f9c7e48..a2a60ca 100644
+--- a/src/tracks.c
++++ b/src/tracks.c
+@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
+ 			/* SamplingFrequency */
+ 			if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
+ 				return NULL;
++			if (tc->extra.audio.outputSamplingFreq) {
++				/* Output SamplingFrequency */
++				if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
++					return NULL;
++			}
+ 			/* Channels */
+ 			if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
+ 				return NULL;

HandBrake-0.9.6.tar.bz2/gtk/configure.ac -> HandBrake-0.9.8.tar.bz2/gtk/configure.ac Changed

HandBrake-0.9.6.tar.bz2/gtk/module.rules -> HandBrake-0.9.8.tar.bz2/gtk/module.rules Changed

HandBrake-0.9.6.tar.bz2/gtk/src/audiohandler.c -> HandBrake-0.9.8.tar.bz2/gtk/src/audiohandler.c Changed

HandBrake-0.9.6.tar.bz2/gtk/src/callbacks.c -> HandBrake-0.9.8.tar.bz2/gtk/src/callbacks.c Changed

@@ -28,7 +28,9 @@
 #if !defined(_WIN32)
 #include <poll.h>
 #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1
+#if defined(__linux__)
 #include <gudev/gudev.h>
+#endif
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
@@ -49,6 +51,9 @@
 #endif
 
 #include <gdk/gdkx.h>
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
 #else
 #define WINVER 0x0500
 #include <winsock2.h>
@@ -904,14 +909,8 @@
 ghb_idle_scan(signal_user_data_t *ud)
 {
 	gchar *path;
-	gint preview_count;
-
-	show_scan_progress(ud);
 	path = ghb_settings_get_string( ud->settings, "scan_source");
-	prune_logs(ud);
-
-	preview_count = ghb_settings_get_int(ud->settings, "preview_count");
-	start_scan(ud, path, 0, preview_count);
+	ghb_do_scan(ud, path, 0, TRUE);
 	g_free(path);
 	return FALSE;
 }
@@ -2847,19 +2846,22 @@
 		status_str = searching_status_string(ud, &status.queue);
 		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
 		gtk_label_set_text (label, status_str);
+		if (ghb_settings_get_boolean(ud->settings, "show_status"))
+		{
 #if !GTK_CHECK_VERSION(2, 16, 0)
-		GtkStatusIcon *si;
+			GtkStatusIcon *si;
 
-		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-		gtk_status_icon_set_tooltip(si, status_str);
+			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+			gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #if defined(_USE_APP_IND)
-		char * ai_status_str= g_strdup_printf(
-			"%.2f%%",
-			100.0 * status.queue.progress);
-		app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-		g_free(ai_status_str);
+			char * ai_status_str= g_strdup_printf(
+				"%.2f%%",
+				100.0 * status.queue.progress);
+			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+			g_free(ai_status_str);
 #endif
+		}
 		gtk_label_set_text (work_status, status_str);
 		gtk_progress_bar_set_fraction (progress, status.queue.progress);
 		g_free(status_str);
@@ -2892,20 +2894,23 @@
 		status_str = working_status_string(ud, &status.queue);
 		label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
 		gtk_label_set_text (label, status_str);
+		if (ghb_settings_get_boolean(ud->settings, "show_status"))
+		{
 #if defined(_USE_APP_IND)
-		char * ai_status_str= g_strdup_printf(
-			"%.2f%%",
-			100.0 * status.queue.progress);
-		app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
-		g_free(ai_status_str);
+			char * ai_status_str= g_strdup_printf(
+				"%.2f%%",
+				100.0 * status.queue.progress);
+			app_indicator_set_label( ud->ai, ai_status_str, "99.99%");
+			g_free(ai_status_str);
 #else
 #if !GTK_CHECK_VERSION(2, 16, 0)
-		GtkStatusIcon *si;
+			GtkStatusIcon *si;
 
-		si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-		gtk_status_icon_set_tooltip(si, status_str);
+			si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+			gtk_status_icon_set_tooltip(si, status_str);
 #endif
 #endif
+		}
 		gtk_label_set_text (work_status, status_str);
 		gtk_progress_bar_set_fraction (progress, status.queue.progress);
 		g_free(status_str);
@@ -3943,14 +3948,14 @@
 	return dvd_devices;
 }
 
-#if !defined(_WIN32)
+#if defined(__linux__)
 static GUdevClient *udev_ctx = NULL;
 #endif
 
 gboolean
 ghb_is_cd(GDrive *gd)
 {
-#if !defined(_WIN32)
+#if defined(__linux__)
 	gchar *device;
 	GUdevDevice *udd;
 
@@ -3984,7 +3989,7 @@
 void
 ghb_udev_init()
 {
-#if !defined(_WIN32)
+#if defined(__linux__)
 	udev_ctx = g_udev_client_new(NULL);
 #endif
 }
@@ -4965,15 +4970,17 @@
 	if (host == NULL || appcast == NULL)
 		return NULL;
 
-	query = g_strdup_printf( "GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
+	query = g_strdup_printf("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
 							appcast, host);
 
 	ioc = ghb_net_open(ud, host, 80);
 	if (ioc == NULL)
-		return NULL;
+		goto free_resources;
 
 	g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
 	g_io_channel_flush(ioc, &gerror);
+
+free_resources:
 	g_free(query);
 	g_free(host);
 	g_free(appcast);

HandBrake-0.9.6.tar.bz2/gtk/src/create_resources.c -> HandBrake-0.9.8.tar.bz2/gtk/src/create_resources.c Changed

HandBrake-0.9.6.tar.bz2/gtk/src/ghb.desktop -> HandBrake-0.9.8.tar.bz2/gtk/src/ghb.desktop Changed

HandBrake-0.9.6.tar.bz2/gtk/src/hb-backend.c -> HandBrake-0.9.8.tar.bz2/gtk/src/hb-backend.c Changed

HandBrake-0.9.6.tar.bz2/gtk/src/internal_defaults.xml -> HandBrake-0.9.8.tar.bz2/gtk/src/internal_defaults.xml Changed

HandBrake-0.9.6.tar.bz2/gtk/src/makedeps.py -> HandBrake-0.9.8.tar.bz2/gtk/src/makedeps.py Changed

HandBrake-0.9.6.tar.bz2/gtk/src/presets.c -> HandBrake-0.9.8.tar.bz2/gtk/src/presets.c Changed

HandBrake-0.9.6.tar.bz2/gtk/src/queuehandler.c -> HandBrake-0.9.8.tar.bz2/gtk/src/queuehandler.c Changed

HandBrake-0.9.6.tar.bz2/gtk/src/standard_presets.xml -> HandBrake-0.9.8.tar.bz2/gtk/src/standard_presets.xml Changed

@@ -414,9 +414,9 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>1024</integer>
+				<integer>1280</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's preset for the iPad (1st gen) is optimized for viewing on its 1024x768 display.</string>
+				<string>HandBrake's preset for the iPad (all generations) is optimized for a good balance between quality and filesize.</string>
 				<key>PresetName</key>
 				<string>iPad</string>
 				<key>Subtitles</key>
@@ -655,6 +655,111 @@
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AAC (faac)</string>
+						<key>AudioMixdown</key>
+						<string>Dolby Pro Logic II</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+					<dict>
+						<key>AudioBitrate</key>
+						<string>160</string>
+						<key>AudioEncoder</key>
+						<string>AC3 Passthru</string>
+						<key>AudioMixdown</key>
+						<string>None</string>
+						<key>AudioSamplerate</key>
+						<string>Auto</string>
+						<key>AudioTrack</key>
+						<integer>1</integer>
+						<key>AudioTrackDRCSlider</key>
+						<real>0.0</real>
+					</dict>
+				</array>
+				<key>ChapterMarkers</key>
+				<integer>1</integer>
+				<key>Default</key>
+				<integer>0</integer>
+				<key>FileFormat</key>
+				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
+				<key>Mp4LargeFile</key>
+				<integer>1</integer>
+				<key>PictureAutoCrop</key>
+				<integer>1</integer>
+				<key>PictureBottomCrop</key>
+				<integer>0</integer>
+				<key>PictureDeblock</key>
+				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>3</integer>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
+				<key>PictureDeinterlace</key>
+				<integer>0</integer>
+				<key>PictureDenoise</key>
+				<integer>0</integer>
+				<key>PictureDetelecine</key>
+				<integer>0</integer>
+				<key>PictureHeight</key>
+				<integer>0</integer>
+				<key>PictureKeepRatio</key>
+				<integer>0</integer>
+				<key>PictureLeftCrop</key>
+				<integer>0</integer>
+				<key>PictureModulus</key>
+				<integer>2</integer>
+				<key>PicturePAR</key>
+				<integer>2</integer>
+				<key>PictureRightCrop</key>
+				<integer>0</integer>
+				<key>PictureTopCrop</key>
+				<integer>0</integer>
+				<key>PictureWidth</key>
+				<integer>1920</integer>
+				<key>PresetDescription</key>
+				<string>HandBrake's preset for the Apple TV (3rd gen) is optimized for up to 1080p playback.</string>
+				<key>PresetName</key>
+				<string>AppleTV 3</string>
+				<key>Subtitles</key>
+				<string>None</string>
+				<key>Type</key>
+				<integer>0</integer>
+				<key>UsesPictureFilters</key>
+				<integer>1</integer>
+				<key>UsesPictureSettings</key>
+				<integer>1</integer>
+				<key>VideoAvgBitrate</key>
+				<string>2500</string>
+				<key>VideoEncoder</key>
+				<string>H.264 (x264)</string>
+				<key>VideoFramerate</key>
+				<string>30</string>
+				<key>VideoFramerateMode</key>
+				<string>pfr</string>
+				<key>VideoGrayScale</key>
+				<integer>0</integer>
+				<key>VideoQualitySlider</key>
+				<real>20</real>
+				<key>VideoQualityType</key>
+				<integer>2</integer>
+				<key>VideoTwoPass</key>
+				<integer>0</integer>
+				<key>x264Option</key>
+				<string>b-adapt=2</string>
+			</dict>
+			<dict>
+				<key>AudioList</key>
+				<array>
+					<dict>
+						<key>AudioBitrate</key>
 						<string>128</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
@@ -830,7 +935,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2011072401</integer>
+		<integer>2012041101</integer>
 		<key>PresetName</key>
 		<string>Devices</string>
 		<key>Type</key>
@@ -979,7 +1084,7 @@
 				<key>PictureDenoise</key>
 				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<integer>2</integer>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -1033,7 +1138,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2011072401</integer>
+		<integer>2012041101</integer>
 		<key>PresetName</key>
 		<string>Regular</string>
 		<key>Type</key>
@@ -1212,7 +1317,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2011072401</integer>
+		<integer>2012041101</integer>
 		<key>PresetName</key>
 		<string>Legacy</string>
 		<key>Type</key>

HandBrake-0.9.6.tar.bz2/libhb/common.c -> HandBrake-0.9.8.tar.bz2/libhb/common.c Changed

HandBrake-0.9.6.tar.bz2/libhb/deca52.c -> HandBrake-0.9.8.tar.bz2/libhb/deca52.c Changed

HandBrake-0.9.6.tar.bz2/libhb/decavcodec.c -> HandBrake-0.9.8.tar.bz2/libhb/decavcodec.c Changed

@@ -1409,7 +1409,9 @@
     int pos = 0;
     int loop_limit = 256;
 
-    if ( pts != -1 )
+    // If we are givn a pts, use it.
+    // But don't loose partial ticks.
+    if ( pts != -1 && (int64_t)pv->pts_next != pts )
         pv->pts_next = pts;
     while ( pos < size )
     {
@@ -1447,7 +1449,8 @@
         {
             int isamp = av_get_bytes_per_sample( context->sample_fmt );
             nsamples = out_size / isamp;
-            double pts_next = pv->pts_next + nsamples * pv->duration;
+            double duration = nsamples * pv->duration;
+            double pts_next = pv->pts_next + duration;
 
             // DTS-HD can be passed through to mkv
             if( audio->config.out.codec & HB_ACODEC_PASS_FLAG )
@@ -1460,6 +1463,7 @@
                 buf = hb_buffer_init( avp.size );
                 memcpy( buf->data, avp.data, avp.size );
                 buf->start = pv->pts_next;
+                buf->duration = duration;
                 buf->stop  = pts_next;
                 hb_list_add( pv->list, buf );
                 pv->pts_next = pts_next;
@@ -1500,6 +1504,7 @@
             hb_buffer_t * buf;
             buf = downmixAudio( audio, pv, buffer, context->channels, nsamples );
             buf->start = pv->pts_next;
+            buf->duration = duration;
             buf->stop = pts_next;
             hb_list_add( pv->list, buf );

HandBrake-0.9.6.tar.bz2/libhb/decdca.c -> HandBrake-0.9.8.tar.bz2/libhb/decdca.c Changed

HandBrake-0.9.6.tar.bz2/libhb/declpcm.c -> HandBrake-0.9.8.tar.bz2/libhb/declpcm.c Changed

HandBrake-0.9.6.tar.bz2/libhb/decomb.c -> HandBrake-0.9.8.tar.bz2/libhb/decomb.c Changed

@@ -2084,8 +2084,8 @@
     for( i = 0; i < 3; i++ )
     {
         int is_chroma = !!i;
-        int w = ((width   + 31) & (~31))>>is_chroma;
-        int h = ((height+6+ 31) & (~31))>>is_chroma;
+        int w = ((width >>is_chroma)  + 31) & (~31);
+        int h = ((height>>is_chroma)+6+ 31) & (~31);
 
         pv->ref_stride[i] = w;
 
@@ -2099,8 +2099,8 @@
     for( i = 0; i < 3; i++ )
     {
         int is_chroma = !!i;
-        int w = ((pv->width[0]   + 31) & (~31))>>is_chroma;
-        int h = ((pv->height[0]+6+ 31) & (~31))>>is_chroma;
+        int w = ((width >>is_chroma)  + 31) & (~31);
+        int h = ((height>>is_chroma)+6+ 31) & (~31);
 
         pv->mask[i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
         pv->mask_filtered[i] = calloc( 1, w*h*sizeof(uint8_t) ) + 3*w;
@@ -2110,12 +2110,12 @@
     if( pv->mode & MODE_EEDI2 )
     {
         /* Allocate half-height eedi2 buffers */
-        height = pv->height[0] / 2;
+        int half_h = height / 2;
         for( i = 0; i < 3; i++ )
         {
             int is_chroma = !!i;
-            int w = ((width   + 31) & (~31))>>is_chroma;
-            int h = ((height+6+ 31) & (~31))>>is_chroma;
+            int w = ((width>>is_chroma)     + 31) & (~31);
+            int h = ((half_h>>is_chroma)+ 6 + 31) & (~31);
 
             for( j = 0; j < 4; j++ )
             {
@@ -2124,12 +2124,11 @@
         }
 
         /* Allocate full-height eedi2 buffers */
-        height = pv->height[0];
         for( i = 0; i < 3; i++ )
         {
             int is_chroma = !!i;
-            int w = ((width   + 31) & (~31))>>is_chroma;
-            int h = ((height+6+ 31) & (~31))>>is_chroma;
+            int w = ((width >>is_chroma)  + 31) & (~31);
+            int h = ((height>>is_chroma)+6+ 31) & (~31);
 
             for( j = 0; j < 5; j++ )
             {

HandBrake-0.9.6.tar.bz2/libhb/deinterlace.c -> HandBrake-0.9.8.tar.bz2/libhb/deinterlace.c Changed

@@ -582,8 +582,54 @@
         avpicture_fill( &pv->pic_out, pv->buf_out[0]->data,
                         pix_fmt, width, height );
 
-        avpicture_deinterlace( &pv->pic_out, &pv->pic_in,
-                               pix_fmt, width, height );
+        if ( ( width & 7 ) || ( height & 7 ) )
+        {
+            // avpicture_deinterlace requires 8 pixel aligned dimensions
+            // so we are going to have to do some buffer copying
+            int aligned_width = ((width + 7) & ~7);
+            int aligned_height = ((height + 7) & ~7);
+            uint8_t * buf1, * buf2;
+            AVPicture pic_in, pic_out;
+            int i, p;
+
+            buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P,
+                              aligned_width, aligned_height ) );
+            buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P,
+                              aligned_width, aligned_height ) );
+            avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
+                            aligned_width, aligned_height );
+            avpicture_fill( &pic_out, buf2, PIX_FMT_YUV420P,
+                            aligned_width, aligned_height );
+            for (p = 0; p < 3; p++)
+            {
+                int h = !p ? height : height >> 1;
+                for (i = 0; i < h; i++)
+                {
+                    memcpy(pic_in.data[p] + pic_in.linesize[p] * i,
+                           pv->pic_in.data[p] + pv->pic_in.linesize[p] * i,
+                           pv->pic_in.linesize[p]);
+                }
+            }
+            avpicture_deinterlace( &pic_out, &pic_in,
+                                   pix_fmt, aligned_width, aligned_height );
+            for (p = 0; p < 3; p++)
+            {
+                int h = !p ? height : height >> 1;
+                for (i = 0; i < h; i++)
+                {
+                    memcpy(pv->pic_out.data[p] + pv->pic_out.linesize[p] * i,
+                           pic_out.data[p] + pic_out.linesize[p] * i,
+                           pv->pic_out.linesize[p]);
+                }
+            }
+            avpicture_free( &pic_in );
+            avpicture_free( &pic_out );
+        }
+        else
+        {
+            avpicture_deinterlace( &pv->pic_out, &pv->pic_in,
+                                   pix_fmt, width, height );
+        }
 
         hb_buffer_copy_settings( pv->buf_out[0], buf_in );

HandBrake-0.9.6.tar.bz2/libhb/demuxmpeg.c -> HandBrake-0.9.8.tar.bz2/libhb/demuxmpeg.c Changed

HandBrake-0.9.6.tar.bz2/libhb/dvd.c -> HandBrake-0.9.8.tar.bz2/libhb/dvd.c Changed

HandBrake-0.9.6.tar.bz2/libhb/hb.c -> HandBrake-0.9.8.tar.bz2/libhb/hb.c Changed

@@ -712,29 +712,26 @@
     hb_job_t           * job = title->job;
     char                 filename[1024];
     FILE               * file;
-    uint8_t            * buf1, * buf2, * buf3, * buf4, * pen;
+    uint8_t            * buf1, * buf2, * buf3, * pen;
     uint32_t             swsflags;
-    AVPicture            pic_in, pic_preview, pic_deint, pic_crop, pic_scale;
+    AVPicture            pic_in, pic_preview, pic_deint, pic_crop;
     struct SwsContext  * context;
-    int                  i;
-    int                  deint_width = ((title->width + 7) >> 3) << 3;
-    int                  rgb_width = ((job->width + 7) >> 3) << 3;
+    int                  i, p;
+    int                  aligned_width = ((title->width + 7) & ~7);
+    int                  aligned_height = ((title->height + 7) & ~7);
     int                  preview_size;
 
     swsflags = SWS_LANCZOS | SWS_ACCURATE_RND;
 
-    buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height ) );
-    buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, deint_width, title->height ) );
-    buf3 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, rgb_width, job->height ) );
-    buf4 = av_malloc( avpicture_get_size( PIX_FMT_RGB32, rgb_width, job->height ) );
+    buf1 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, aligned_width, aligned_height ) );
+    buf2 = av_malloc( avpicture_get_size( PIX_FMT_YUV420P, aligned_width, aligned_height ) );
+    buf3 = av_malloc( avpicture_get_size( PIX_FMT_RGB32, job->width, job->height ) );
     avpicture_fill( &pic_in, buf1, PIX_FMT_YUV420P,
-                    title->width, title->height );
+                    aligned_width, aligned_height );
     avpicture_fill( &pic_deint, buf2, PIX_FMT_YUV420P,
-                    deint_width, title->height );
-    avpicture_fill( &pic_scale, buf3, PIX_FMT_YUV420P,
-                    rgb_width, job->height );
-    avpicture_fill( &pic_preview, buf4, PIX_FMT_RGB32,
-                    rgb_width, job->height );
+                    aligned_width, aligned_height );
+    avpicture_fill( &pic_preview, buf3, PIX_FMT_RGB32,
+                    job->width, job->height );
 
     // Allocate the AVPicture frames and fill in
 
@@ -750,13 +747,23 @@
         return;
     }
 
-    fread( buf1, avpicture_get_size( PIX_FMT_YUV420P, title->width, title->height), 1, file );
+    for (p = 0; p < 3; p++)
+    {
+        int w = !p ? title->width : title->width >> 1;
+        int h = !p ? title->height : title->height >> 1;
+        pen = pic_in.data[p];
+        for (i = 0; i < h; i++)
+        {
+            fread( pen, w, 1, file );
+            pen += pic_in.linesize[p];
+        }
+    }
     fclose( file );
 
     if( job->deinterlace )
     {
         // Deinterlace and crop
-        avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, title->width, title->height );
+        avpicture_deinterlace( &pic_deint, &pic_in, PIX_FMT_YUV420P, aligned_width, aligned_height );
         av_picture_crop( &pic_crop, &pic_deint, PIX_FMT_YUV420P, job->crop[0], job->crop[2] );
     }
     else
@@ -769,27 +776,13 @@
     context = hb_sws_get_context(title->width  - (job->crop[2] + job->crop[3]),
                              title->height - (job->crop[0] + job->crop[1]),
                              PIX_FMT_YUV420P,
-                             job->width, job->height, PIX_FMT_YUV420P,
+                             job->width, job->height, PIX_FMT_RGB32,
                              swsflags);
 
     // Scale
     sws_scale(context,
               (const uint8_t* const *)pic_crop.data, pic_crop.linesize,
               0, title->height - (job->crop[0] + job->crop[1]),
-              pic_scale.data, pic_scale.linesize);
-
-    // Free context
-    sws_freeContext( context );
-
-    // Get preview context
-    context = hb_sws_get_context(rgb_width, job->height, PIX_FMT_YUV420P,
-                              rgb_width, job->height, PIX_FMT_RGB32,
-                              swsflags);
-
-    // Create preview
-    sws_scale(context,
-              (const uint8_t* const *)pic_scale.data, pic_scale.linesize,
-              0, job->height,
               pic_preview.data, pic_preview.linesize);
 
     // Free context
@@ -799,13 +792,12 @@
     pen = buffer;
     for( i = 0; i < job->height; i++ )
     {
-        memcpy( pen, buf4 + preview_size * i, 4 * job->width );
+        memcpy( pen, buf3 + preview_size * i, 4 * job->width );
         pen += 4 * job->width;
     }
 
     // Clean up
     avpicture_free( &pic_preview );
-    avpicture_free( &pic_scale );
     avpicture_free( &pic_deint );
     avpicture_free( &pic_in );
 }
@@ -827,8 +819,10 @@
  * @param prog_diff   Sensitivity for detecting different colors on progressive frames
  * @param prog_threshold Sensitivity for flagging progressive frames as combed
  */
-int hb_detect_comb( hb_buffer_t * buf, int width, int height, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold )
+int hb_detect_comb( hb_buffer_t * buf, int color_equal, int color_diff, int threshold, int prog_equal, int prog_diff, int prog_threshold )
 {
+    int width = buf->width;
+    int height = buf->height;
     int j, k, n, off, cc_1, cc_2, cc[3];
 	// int flag[3] ; // debugging flag
     uint16_t s1, s2, s3, s4;
@@ -962,8 +956,8 @@
     int mod = job->modulus ? job->modulus : 16;
     double aspect = title->aspect;
     
-    int pixel_aspect_width  = job->anamorphic.par_width;
-    int pixel_aspect_height = job->anamorphic.par_height;
+    int64_t pixel_aspect_width  = job->anamorphic.par_width;
+    int64_t pixel_aspect_height = job->anamorphic.par_height;
 
     /* If a source was really NTSC or PAL and the user specified ITU PAR
        values, replace the standard PAR values with the ITU broadcast ones. */
@@ -1033,8 +1027,8 @@
             *output_height = MULTIPLE_MOD( cropped_height, 2 );
             // adjust the source PAR for new width/height
             // new PAR = source PAR * ( old width / new_width ) * ( new_height / old_height )
-            pixel_aspect_width = title->pixel_aspect_width * cropped_width * (*output_height);            
-            pixel_aspect_height = title->pixel_aspect_height * (*output_width) * cropped_height;
+            pixel_aspect_width = (int64_t)title->pixel_aspect_width * cropped_width * (*output_height);            
+            pixel_aspect_height = (int64_t)title->pixel_aspect_height * (*output_width) * cropped_height;
         break;
 
         case 2:
@@ -1075,12 +1069,8 @@
             /* The film AR is the source's display width / cropped source height.
                The output display width is the output height * film AR.
                The output PAR is the output display width / output storage width. */
-            int64_t par_w, par_h;
-            par_w = (int64_t)height * cropped_width * pixel_aspect_width;
-            par_h = (int64_t)width * cropped_height * pixel_aspect_height;
-            hb_limit_rational64( &par_w, &par_h, par_w, par_h, 65535);
-            pixel_aspect_width = par_w;
-            pixel_aspect_height = par_h;
+            pixel_aspect_width = (int64_t)height * cropped_width * pixel_aspect_width;
+            pixel_aspect_height = (int64_t)width * cropped_height * pixel_aspect_height;
 
             /* Pass the results back to the caller */
             *output_width = width;
@@ -1133,7 +1123,7 @@
             if( job->anamorphic.dar_width && job->anamorphic.dar_height )
             {
                 /* We need to adjust the PAR to produce this aspect. */
-                pixel_aspect_width = height * job->anamorphic.dar_width / job->anamorphic.dar_height;
+                pixel_aspect_width = (int64_t)height * job->anamorphic.dar_width / job->anamorphic.dar_height;
                 pixel_aspect_height = width;
             }
             else
@@ -1146,7 +1136,7 @@
                 if( job->anamorphic.keep_display_aspect )
                 {
                     /* We can ignore the possibility of a PAR change */
-                    pixel_aspect_width = height * ( (double)source_display_width / (double)cropped_height );
+                    pixel_aspect_width = (int64_t)height * ( (double)source_display_width / (double)cropped_height );
                     pixel_aspect_height = width;
                 }
                 else
@@ -1165,7 +1155,9 @@
     }
     
     /* While x264 is smart enough to reduce fractions on its own, libavcodec
-       needs some help with the math, so lose superfluous factors.            */
+     * needs some help with the math, so lose superfluous factors. */
+    hb_limit_rational64( &pixel_aspect_width, &pixel_aspect_height,
+                        pixel_aspect_width, pixel_aspect_height, 65535 );
     hb_reduce( output_par_width, output_par_height,
                pixel_aspect_width, pixel_aspect_height );
 }
@@ -1343,7 +1335,7 @@
     hb_title_t    * title,    * title_copy;
     hb_chapter_t  * chapter,  * chapter_copy;
     hb_audio_t    * audio;
-    hb_subtitle_t * subtitle, * subtitle_copy;
+    hb_subtitle_t * subtitle;
     hb_attachment_t * attachment;
     int             i;
     char            audio_lang[4];
@@ -1429,61 +1421,48 @@
      */
     memset( audio_lang, 0, sizeof( audio_lang ) );
 
-    if ( job->indepth_scan ) {
+    if( job->indepth_scan )
+    {
 
-        /*
-         * Find the first audio language that is being encoded
-         */
-        for( i = 0; i < hb_list_count(job->list_audio); i++ )
+        /* Find the first audio language that is being encoded, then add all the
+         * matching subtitles for that language. */
+        for( i = 0; i < hb_list_count( job->list_audio ); i++ )
         {
             if( ( audio = hb_list_item( job->list_audio, i ) ) )
             {
-                strncpy(audio_lang, audio->config.lang.iso639_2, sizeof(audio_lang));
+                strncpy( audio_lang, audio->config.lang.iso639_2, sizeof( audio_lang ) );
                 break;
             }
         }
-    }
-
-    /*
-     * If doing a subtitle scan then add all the matching subtitles for this
-     * language.
-     */
-    if ( job->indepth_scan )
-    {
-        for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
+        for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
         {
             subtitle = hb_list_item( title->list_subtitle, i );
             if( strcmp( subtitle->iso639_2, audio_lang ) == 0 &&
                 subtitle->source == VOBSUB )
             {
-                /*
-                 * Matched subtitle language with audio language, so
+                /* Matched subtitle language with audio language, so
                  * add this to our list to scan.
                  *
                  * We will update the subtitle list on the second pass
-                 * later after the first pass has completed.
-                 */
-                subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
-                memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
-                hb_list_add( title_copy->list_subtitle, subtitle_copy );
+                 * later after the first pass has completed. */
+                hb_list_add( title_copy->list_subtitle, hb_subtitle_copy( subtitle ) );
             }
         }
-    } else {
+    }
+    else
+    {
         /*
          * Not doing a subtitle scan in this pass, but maybe we are in the
          * first pass?
          */
         if( job->pass != 1 )
         {
-            /*
-             * Copy all of them from the input job, to the title_copy/job_copy.
-             */
-            for(  i = 0; i < hb_list_count(job->list_subtitle); i++ ) {
+            /* Copy all subtitles from the input job to title_copy/job_copy. */
+            for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+            {
                 if( ( subtitle = hb_list_item( job->list_subtitle, i ) ) )
                 {
-                    subtitle_copy = malloc( sizeof( hb_subtitle_t ) );
-                    memcpy( subtitle_copy, subtitle, sizeof( hb_subtitle_t ) );
-                    hb_list_add( title_copy->list_subtitle, subtitle_copy );
+                    hb_list_add( title_copy->list_subtitle, hb_subtitle_copy( subtitle ) );
                 }
             }
         }

HandBrake-0.9.6.tar.bz2/libhb/hb.h -> HandBrake-0.9.8.tar.bz2/libhb/hb.h Changed

HandBrake-0.9.6.tar.bz2/libhb/internal.h -> HandBrake-0.9.8.tar.bz2/libhb/internal.h Changed

@@ -70,6 +70,7 @@
 
     int           id;           // ID of the track that the packet comes from
     int64_t       start;        // Video and subtitle packets: start time of frame/subtitle
+    double        duration;     // Actual duration, may be fractional ticks
     int64_t       stop;         // Video and subtitle packets: stop time of frame/subtitle
     int64_t       pcr;
     uint8_t       discontinuity;
@@ -146,8 +147,12 @@
     // if we do "/2". The code here matches the calculation for
     // PIX_FMT_YUV420P in ffmpeg's avpicture_fill() which is required
     // for most of HB's filters to work right.
-    return hb_buffer_init( width * height + ( ( width+1 ) >> 1 ) *
-                           ( ( height+1 ) >> 1 ) * 2 );
+    hb_buffer_t * b = hb_buffer_init( width * height + ( ( width+1 ) >> 1 ) *
+                                      ( ( height+1 ) >> 1 ) * 2 );
+    b->width = width;
+    b->height = height;
+
+    return b;
 }
 
 // this routine 'moves' data from src to dst by interchanging 'data',

HandBrake-0.9.6.tar.bz2/libhb/muxmkv.c -> HandBrake-0.9.8.tar.bz2/libhb/muxmkv.c Changed

@@ -77,6 +77,7 @@
         hb_error( "Could not create output file, Disk Full?" );
         job->mux_data = NULL;
         *job->die = 1;
+        free(track);
         return 0;
     }
 
@@ -94,8 +95,10 @@
             /* Taken from x264 muxers.c */
             avcC_len = 5 + 1 + 2 + job->config.h264.sps_length + 1 + 2 + job->config.h264.pps_length;
             avcC = malloc(avcC_len);
-            if (avcC == NULL)
+            if (avcC == NULL) {
+                free(track);
                 return -1;
+            }
 
             avcC[0] = 1;
             avcC[1] = job->config.h264.sps[1];      /* AVCProfileIndication */
@@ -158,6 +161,7 @@
         default:
             *job->die = 1;
             hb_error("muxmkv: Unknown video codec: %x", job->vcodec);
+            free(track);
             return 0;
     }
 
@@ -279,7 +283,20 @@
         // MKV lang codes should be ISO-639-2/B
         lang =  lang_for_code2( audio->config.lang.iso639_2 );
         track->language = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
-        track->extra.audio.samplingFreq = (float)audio->config.out.samplerate;
+        // sample rate
+        if ((audio->config.out.codec == HB_ACODEC_CA_HAAC) ||
+            (audio->config.out.codec == HB_ACODEC_AAC_PASS &&
+             audio->config.in.samples_per_frame > 1024))
+        {
+            // For HE-AAC, write outputSamplingFreq too
+            // samplingFreq is half of outputSamplingFreq
+            track->extra.audio.outputSamplingFreq = (float)audio->config.out.samplerate;
+            track->extra.audio.samplingFreq = track->extra.audio.outputSamplingFreq / 2.;
+        }
+        else
+        {
+            track->extra.audio.samplingFreq = (float)audio->config.out.samplerate;
+        }
         if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
         {
             track->extra.audio.channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(audio->config.in.channel_layout);

HandBrake-0.9.6.tar.bz2/libhb/platform/macosx/encca_aac.c -> HandBrake-0.9.8.tar.bz2/libhb/platform/macosx/encca_aac.c Changed

@@ -9,11 +9,11 @@
 
 enum AAC_MODE { AAC_MODE_LC, AAC_MODE_HE };
 
-int     encCoreAudioInitLC( hb_work_object_t *, hb_job_t * );
-int     encCoreAudioInitHE( hb_work_object_t *, hb_job_t * );
-int     encCoreAudioInit( hb_work_object_t *, hb_job_t *, enum AAC_MODE mode );
-int     encCoreAudioWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void    encCoreAudioClose( hb_work_object_t * );
+int  encCoreAudioInitLC(hb_work_object_t*, hb_job_t*);
+int  encCoreAudioInitHE(hb_work_object_t*, hb_job_t*);
+int  encCoreAudioInit(hb_work_object_t*, hb_job_t*, enum AAC_MODE mode);
+int  encCoreAudioWork(hb_work_object_t*, hb_buffer_t**, hb_buffer_t**);
+void encCoreAudioClose(hb_work_object_t*);
 
 hb_work_object_t hb_encca_aac =
 {
@@ -35,15 +35,15 @@
 
 struct hb_work_private_s
 {
+    uint8_t *buf;
     hb_job_t *job;
+    hb_list_t *list;
 
     AudioConverterRef converter;
-    uint8_t  *obuf;
-    uint8_t  *buf;
-    hb_list_t *list;
     unsigned long isamples, isamplesiz, omaxpacket, nchannels;
     uint64_t pts, ibytes;
     Float64 osamplerate;
+
     int layout;
     hb_chan_map_t *ichanmap;
 };
@@ -57,7 +57,8 @@
 {
 	int len = 0;
 	int count = 4;
-	while (count--) {
+	while (count--)
+    {
 		int c = *(*buffer)++;
 		len = (len << 7) | (c & 0x7f);
 		if (!(c & 0x80))
@@ -76,29 +77,32 @@
 // based off of mov_read_esds from mov.c in ffmpeg's libavformat
 static long ReadESDSDescExt(void* descExt, UInt8 **buffer, UInt32 *size, int versionFlags)
 {
-	UInt8 *esds = (UInt8 *) descExt;
+	UInt8 *esds = (UInt8*)descExt;
 	int tag, len;
 	*size = 0;
 
     if (versionFlags)
-        esds += 4;		// version + flags
+        esds += 4; // version + flags
 	readDescr(&esds, &tag);
-	esds += 2;		// ID
+	esds += 2;     // ID
 	if (tag == MP4ESDescrTag)
-		esds++;		// priority
+		esds++;    // priority
 
 	readDescr(&esds, &tag);
-	if (tag == MP4DecConfigDescrTag) {
-		esds++;		// object type id
-		esds++;		// stream type
-		esds += 3;	// buffer size db
-		esds += 4;	// max bitrate
-		esds += 4;	// average bitrate
+	if (tag == MP4DecConfigDescrTag)
+    {
+		esds++;    // object type id
+		esds++;    // stream type
+		esds += 3; // buffer size db
+		esds += 4; // max bitrate
+		esds += 4; // average bitrate
 
 		len = readDescr(&esds, &tag);
-		if (tag == MP4DecSpecificDescrTag) {
+		if (tag == MP4DecSpecificDescrTag)
+        {
 			*buffer = calloc(1, len + 8);
-			if (*buffer) {
+			if (*buffer)
+            {
 				memcpy(*buffer, esds, len);
 				*size = len;
 			}
@@ -113,14 +117,14 @@
  ***********************************************************************
  *
  **********************************************************************/
-int encCoreAudioInitLC( hb_work_object_t * w, hb_job_t * job )
+int encCoreAudioInitLC(hb_work_object_t *w, hb_job_t *job)
 {
-    return encCoreAudioInit( w, job, AAC_MODE_LC );
+    return encCoreAudioInit(w, job, AAC_MODE_LC);
 }
 
-int encCoreAudioInitHE( hb_work_object_t * w, hb_job_t * job )
+int encCoreAudioInitHE(hb_work_object_t *w, hb_job_t *job)
 {
-    return encCoreAudioInit( w, job, AAC_MODE_HE );
+    return encCoreAudioInit(w, job, AAC_MODE_HE);
 }
 
 /***********************************************************************
@@ -128,32 +132,33 @@
  ***********************************************************************
  *
  **********************************************************************/
-int encCoreAudioInit( hb_work_object_t * w, hb_job_t * job, enum AAC_MODE mode )
+int encCoreAudioInit(hb_work_object_t *w, hb_job_t *job, enum AAC_MODE mode)
 {
-    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
-    hb_audio_t * audio = w->audio;
+    hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+    hb_audio_t *audio = w->audio;
     AudioStreamBasicDescription input, output;
-    UInt32 tmp, tmpsiz = sizeof( tmp );
+    UInt32 tmp, tmpsiz = sizeof(tmp);
     OSStatus err;
 
     w->private_data = pv;
     pv->job = job;
 
     // pass the number of channels used into the private work data
-    pv->nchannels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT( audio->config.out.mixdown );
+    pv->nchannels =
+        HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
 
-    bzero( &input, sizeof( AudioStreamBasicDescription ) );
-    input.mSampleRate = ( Float64 ) audio->config.out.samplerate;
+    bzero(&input, sizeof(AudioStreamBasicDescription));
+    input.mSampleRate = (Float64)audio->config.out.samplerate;
     input.mFormatID = kAudioFormatLinearPCM;
-    input.mFormatFlags = kLinearPCMFormatFlagIsFloat | kAudioFormatFlagsNativeEndian;
+    input.mFormatFlags = (kLinearPCMFormatFlagIsFloat|kAudioFormatFlagsNativeEndian);
     input.mBytesPerPacket = 4 * pv->nchannels;
     input.mFramesPerPacket = 1;
     input.mBytesPerFrame = input.mBytesPerPacket * input.mFramesPerPacket;
     input.mChannelsPerFrame = pv->nchannels;
     input.mBitsPerChannel = 32;
 
-    bzero( &output, sizeof( AudioStreamBasicDescription ) );
-    switch ( mode ) 
+    bzero(&output, sizeof(AudioStreamBasicDescription));
+    switch (mode)
     {
         case AAC_MODE_HE:
             output.mFormatID = kAudioFormatMPEG4AAC_HE;
@@ -163,17 +168,17 @@
             output.mFormatID = kAudioFormatMPEG4AAC;
             break;
     }
-    output.mSampleRate = ( Float64 ) audio->config.out.samplerate;
+    output.mSampleRate = (Float64)audio->config.out.samplerate;
     output.mChannelsPerFrame = pv->nchannels;
-    // let CoreAudio decide the rest...
+    // let CoreAudio decide the rest
 
     // initialise encoder
-    err = AudioConverterNew( &input, &output, &pv->converter );
-    if( err != noErr)
+    err = AudioConverterNew(&input, &output, &pv->converter);
+    if (err != noErr)
     {
         // Retry without the samplerate
-        bzero( &output, sizeof( AudioStreamBasicDescription ) );
-        switch ( mode )
+        bzero(&output, sizeof(AudioStreamBasicDescription));
+        switch (mode)
         {
             case AAC_MODE_HE:
                 output.mFormatID = kAudioFormatMPEG4AAC_HE;
@@ -185,93 +190,95 @@
         }
         output.mChannelsPerFrame = pv->nchannels;
 
-        err = AudioConverterNew( &input, &output, &pv->converter );
+        err = AudioConverterNew(&input, &output, &pv->converter);
 
-        if( err != noErr)
+        if (err != noErr)
         {
-            hb_log( "Error creating an AudioConverter err=%"PRId64" %"PRIu64, (int64_t)err, (uint64_t)output.mBytesPerFrame );
+            hb_log("Error creating an AudioConverter err=%"PRId64" output.mBytesPerFrame=%"PRIu64"",
+                   (int64_t)err, (uint64_t)output.mBytesPerFrame);
             *job->die = 1;
-            return 0;
+            return -1;
         }
     }
 
     // set encoder quality to maximum
     tmp = kAudioConverterQuality_Max;
-    AudioConverterSetProperty( pv->converter, kAudioConverterCodecQuality,
-                               sizeof( tmp ), &tmp );
+    AudioConverterSetProperty(pv->converter, kAudioConverterCodecQuality,
+                              sizeof(tmp), &tmp);
 
-    if( audio->config.out.bitrate > 0 )
+    if (audio->config.out.bitrate > 0)
     {
         // set encoder bitrate control mode to constrained variable
         tmp = kAudioCodecBitRateControlMode_VariableConstrained;
-        AudioConverterSetProperty( pv->converter, kAudioCodecPropertyBitRateControlMode,
-                                   sizeof( tmp ), &tmp );
+        AudioConverterSetProperty(pv->converter, kAudioCodecPropertyBitRateControlMode,
+                                  sizeof(tmp), &tmp);
 
         // get available bitrates
         AudioValueRange *bitrates;
         ssize_t bitrateCounts;
-        err = AudioConverterGetPropertyInfo( pv->converter, kAudioConverterApplicableEncodeBitRates,
-                                             &tmpsiz, NULL);
-        bitrates = malloc( tmpsiz );
-        err = AudioConverterGetProperty( pv->converter, kAudioConverterApplicableEncodeBitRates,
-                                         &tmpsiz, bitrates);
-        bitrateCounts = tmpsiz / sizeof( AudioValueRange );
+        err = AudioConverterGetPropertyInfo(pv->converter, kAudioConverterApplicableEncodeBitRates,
+                                            &tmpsiz, NULL);
+        bitrates = malloc(tmpsiz);
+        err = AudioConverterGetProperty(pv->converter, kAudioConverterApplicableEncodeBitRates,
+                                        &tmpsiz, bitrates);
+        bitrateCounts = tmpsiz / sizeof(AudioValueRange);
 
         // set bitrate
         tmp = audio->config.out.bitrate * 1000;
-        if( tmp < bitrates[0].mMinimum )
+        if (tmp < bitrates[0].mMinimum)
             tmp = bitrates[0].mMinimum;
-        if( tmp > bitrates[bitrateCounts-1].mMinimum )
+        if (tmp > bitrates[bitrateCounts-1].mMinimum)
             tmp = bitrates[bitrateCounts-1].mMinimum;
-        free( bitrates );
-        if( tmp != audio->config.out.bitrate * 1000 )
-            hb_log( "encca_aac: sanitizing track %d audio bitrate %d to %"PRIu32"",
-                    audio->config.out.track, audio->config.out.bitrate, tmp/1000 );
-        AudioConverterSetProperty( pv->converter, kAudioConverterEncodeBitRate,
-                                   sizeof( tmp ), &tmp );
+        free(bitrates);
+        if (tmp != audio->config.out.bitrate * 1000)
+            hb_log("encca_aac: sanitizing track %d audio bitrate %d to %"PRIu32"",
+                   audio->config.out.track, audio->config.out.bitrate, tmp / 1000);
+        AudioConverterSetProperty(pv->converter, kAudioConverterEncodeBitRate,
+                                  sizeof(tmp), &tmp);
     }
-    else if( audio->config.out.quality >= 0 )
+    else if (audio->config.out.quality >= 0)
     {
-        if( mode != AAC_MODE_LC )
+        if (mode != AAC_MODE_LC)
         {
-            hb_log( "encCoreAudioInit: internal error, VBR set but not applicable" );
+            hb_log("encCoreAudioInit: internal error, VBR set but not applicable");
             return 1;
         }
         // set encoder bitrate control mode to variable
         tmp = kAudioCodecBitRateControlMode_Variable;
-        AudioConverterSetProperty( pv->converter, kAudioCodecPropertyBitRateControlMode,
-                                   sizeof( tmp ), &tmp );
+        AudioConverterSetProperty(pv->converter, kAudioCodecPropertyBitRateControlMode,
+                                  sizeof(tmp), &tmp);
 
         // set quality
         tmp = audio->config.out.quality;
-        AudioConverterSetProperty( pv->converter, kAudioCodecPropertySoundQualityForVBR,
-                                   sizeof( tmp ), &tmp );
+        AudioConverterSetProperty(pv->converter, kAudioCodecPropertySoundQualityForVBR,
+                                  sizeof(tmp), &tmp);
     }
     else
     {
-        hb_log( "encCoreAudioInit: internal error, bitrate/quality not set" );
+        hb_log("encCoreAudioInit: internal error, bitrate/quality not set");
         return 1;
     }
 
     // get real input
-    tmpsiz = sizeof( input );
-    AudioConverterGetProperty( pv->converter,
-                               kAudioConverterCurrentInputStreamDescription,
-                               &tmpsiz, &input );
+    tmpsiz = sizeof(input);
+    AudioConverterGetProperty(pv->converter,
+                              kAudioConverterCurrentInputStreamDescription,
+                              &tmpsiz, &input);
     // get real output
-    tmpsiz = sizeof( output );
-    AudioConverterGetProperty( pv->converter,
-                               kAudioConverterCurrentOutputStreamDescription,
-                               &tmpsiz, &output );
+    tmpsiz = sizeof(output);
+    AudioConverterGetProperty(pv->converter,
+                              kAudioConverterCurrentOutputStreamDescription,
+                              &tmpsiz, &output);
 
     // set sizes
     pv->isamplesiz  = input.mBytesPerPacket;
-    pv->isamples    = audio->config.out.samples_per_frame = output.mFramesPerPacket;
+    pv->isamples    = output.mFramesPerPacket;
     pv->osamplerate = output.mSampleRate;
+    audio->config.out.samples_per_frame = pv->isamples;
 
     // set channel map and layout (for remapping)
     pv->ichanmap = audio->config.in.channel_map;
-    switch( audio->config.out.mixdown )
+    switch (audio->config.out.mixdown)
     {
         case HB_AMIXDOWN_MONO:
             pv->layout = HB_INPUT_CH_LAYOUT_MONO;
@@ -288,23 +295,22 @@
     }
 
     // get maximum output size
-    AudioConverterGetProperty( pv->converter,
-                               kAudioConverterPropertyMaximumOutputPacketSize,
-                               &tmpsiz, &tmp );
+    AudioConverterGetProperty(pv->converter,
+                              kAudioConverterPropertyMaximumOutputPacketSize,
+                              &tmpsiz, &tmp);
     pv->omaxpacket = tmp;
 
     // get magic cookie (elementary stream descriptor)
     tmp = HB_CONFIG_MAX_SIZE;
-    AudioConverterGetProperty( pv->converter,
-                               kAudioConverterCompressionMagicCookie,
-                               &tmp, w->config->extradata.bytes );
+    AudioConverterGetProperty(pv->converter,
+                              kAudioConverterCompressionMagicCookie,
+                              &tmp, w->config->extradata.bytes);
     // CoreAudio returns a complete ESDS, but we only need
     // the DecoderSpecific info.
     UInt8* buffer = NULL;
     ReadESDSDescExt(w->config->extradata.bytes, &buffer, &tmpsiz, 0);
     w->config->extradata.length = tmpsiz;
-    memmove( w->config->extradata.bytes, buffer,
-             w->config->extradata.length );
+    memmove(w->config->extradata.bytes, buffer, w->config->extradata.length);
 
     pv->list = hb_list_init();
     pv->buf = NULL;
@@ -317,66 +323,70 @@
  ***********************************************************************
  *
  **********************************************************************/
-void encCoreAudioClose( hb_work_object_t * w )
+void encCoreAudioClose(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
+    hb_work_private_t *pv = w->private_data;
 
-    if( pv->converter )
+    if (pv != NULL)
     {
-        AudioConverterDispose( pv->converter );
-        hb_list_empty( &pv->list );
-        free( pv->obuf );
-        free( pv->buf );
-        free( pv );
+        if (pv->converter)
+        {
+            AudioConverterDispose(pv->converter);
+        }
+        if (pv->buf != NULL)
+        {
+            free(pv->buf);
+        }
+        hb_list_empty(&pv->list);
+        free(pv);
         w->private_data = NULL;
     }
 }
 
 /* Called whenever necessary by AudioConverterFillComplexBuffer */
-static OSStatus inInputDataProc( AudioConverterRef converter, UInt32 *npackets,
-                                 AudioBufferList *buffers,
-                                 AudioStreamPacketDescription** ignored,
-                                 void *userdata )
+static OSStatus inInputDataProc(AudioConverterRef converter, UInt32 *npackets,
+                                AudioBufferList *buffers,
+                                AudioStreamPacketDescription **ignored,
+                                void *userdata)
 {
     hb_work_private_t *pv = userdata;
 
-    if( pv->ibytes == 0 )
+    if (!pv->ibytes)
     {
         *npackets = 0;
-        hb_log( "CoreAudio: no data to use in inInputDataProc" );
         return 1;
     }
 
-    if( pv->buf != NULL )
-        free( pv->buf );
+    if (pv->buf != NULL)
+    {
+        free(pv->buf);
+    }
 
-    uint64_t pts, pos;
-    buffers->mBuffers[0].mDataByteSize = MIN( *npackets * pv->isamplesiz, pv->ibytes );
-    buffers->mBuffers[0].mData = pv->buf = calloc( 1, buffers->mBuffers[0].mDataByteSize );
+    buffers->mBuffers[0].mDataByteSize = MIN(pv->ibytes,
+                                             pv->isamplesiz * *npackets);
+    pv->buf = calloc(1, buffers->mBuffers[0].mDataByteSize);
+    buffers->mBuffers[0].mData = pv->buf;
 
-    if( hb_list_bytes( pv->list ) >= buffers->mBuffers[0].mDataByteSize )
+    if (hb_list_bytes(pv->list) >= buffers->mBuffers[0].mDataByteSize)
     {
-        hb_list_getbytes( pv->list, buffers->mBuffers[0].mData,
-                          buffers->mBuffers[0].mDataByteSize, &pts, &pos );
+        hb_list_getbytes(pv->list, buffers->mBuffers[0].mData,
+                         buffers->mBuffers[0].mDataByteSize, NULL, NULL);
     }
     else
     {
-        hb_log( "CoreAudio: Not enough data, exiting inInputDataProc" );
         *npackets = 0;
         return 1;
     }
 
-    if( pv->ichanmap != &hb_qt_chan_map )
-    {
-        hb_layout_remap( pv->ichanmap, &hb_qt_chan_map, pv->layout,
-                         (float*)buffers->mBuffers[0].mData,
-                         buffers->mBuffers[0].mDataByteSize / pv->isamplesiz );
-    }
-
     *npackets = buffers->mBuffers[0].mDataByteSize / pv->isamplesiz;
-
     pv->ibytes -= buffers->mBuffers[0].mDataByteSize;
 
+    if (pv->ichanmap != &hb_qt_chan_map)
+    {
+        hb_layout_remap(pv->ichanmap, &hb_qt_chan_map, pv->layout,
+                        (float*)buffers->mBuffers[0].mData, *npackets);
+    }
+
     return noErr;
 }
 
@@ -385,66 +395,74 @@
  ***********************************************************************
  *
  **********************************************************************/
-static hb_buffer_t * Encode( hb_work_object_t * w )
+static hb_buffer_t* Encode(hb_work_object_t *w)
 {
-    hb_work_private_t * pv = w->private_data;
+    hb_work_private_t *pv = w->private_data;
     UInt32 npackets = 1;
 
     /* check if we need more data */
-    if( ( pv->ibytes = hb_list_bytes( pv->list ) ) < pv->isamples * pv->isamplesiz )
+    if ((pv->ibytes = hb_list_bytes(pv->list)) < pv->isamples * pv->isamplesiz)
+    {
         return NULL;
+    }
 
-    hb_buffer_t * obuf;
+    hb_buffer_t *obuf;
     AudioStreamPacketDescription odesc = { 0 };
-    AudioBufferList obuflist = { .mNumberBuffers = 1,
-                                 .mBuffers = { { .mNumberChannels = pv->nchannels } },
-                               };
+    AudioBufferList obuflist =
+    {
+        .mNumberBuffers = 1,
+        .mBuffers = { { .mNumberChannels = pv->nchannels } },
+    };
 
-    obuf = hb_buffer_init( pv->omaxpacket );
+    obuf = hb_buffer_init(pv->omaxpacket);
     obuflist.mBuffers[0].mDataByteSize = obuf->size;
     obuflist.mBuffers[0].mData = obuf->data;
 
-    OSStatus err = AudioConverterFillComplexBuffer( pv->converter, inInputDataProc, pv,
-                                                    &npackets, &obuflist, &odesc );
-    if( err ) {
-        hb_log( "CoreAudio: Not enough data" );
-        return NULL;
+    OSStatus err = AudioConverterFillComplexBuffer(pv->converter,
+                                                   inInputDataProc, pv,
+                                                   &npackets, &obuflist, &odesc);
+
+    if (err != noErr && err != 1)
+    {
+        hb_log("encCoreAudio: unexpected error in AudioConverterFillComplexBuffer()");
     }
-    if( odesc.mDataByteSize == 0 || npackets == 0 ) {
-        hb_log( "CoreAudio: 0 packets returned " );
+    // only drop the output buffer if it's actually empty
+    if (!npackets || odesc.mDataByteSize <= 0)
+    {
+        hb_log("encCoreAudio: 0 packets returned");
         return NULL;
     }
 
-    obuf->start = pv->pts;
+    obuf->size      = odesc.mDataByteSize;
+    obuf->start     = pv->pts;
     pv->pts += 90000LL * pv->isamples / pv->osamplerate;
-    obuf->stop  = pv->pts;
-    obuf->size  = odesc.mDataByteSize;
+    obuf->stop      = pv->pts;
     obuf->frametype = HB_FRAME_AUDIO;
 
     return obuf;
 }
 
-static hb_buffer_t *Flush( hb_work_object_t *w, hb_buffer_t *bufin )
+static hb_buffer_t* Flush(hb_work_object_t *w, hb_buffer_t *bufin)
 {
     hb_work_private_t *pv = w->private_data;
 
     // pad whatever data we have out to four input frames.
-    int nbytes = hb_list_bytes( pv->list );
+    int nbytes = hb_list_bytes(pv->list);
     int pad = pv->isamples * pv->isamplesiz - nbytes;
-    if ( pad > 0 )
+    if (pad > 0)
     {
-        hb_buffer_t *tmp = hb_buffer_init( pad );
-        memset( tmp->data, 0, pad );
-        hb_list_add( pv->list, tmp );
+        hb_buffer_t *tmp = hb_buffer_init(pad);
+        memset(tmp->data, 0, pad);
+        hb_list_add(pv->list, tmp);
     }
 
     hb_buffer_t *bufout = NULL, *buf = NULL;
-    while ( hb_list_bytes( pv->list ) >= pv->isamples * pv->isamplesiz )
+    while (hb_list_bytes(pv->list) >= pv->isamples * pv->isamplesiz)
     {
-        hb_buffer_t *b = Encode( w );
-        if ( b )
+        hb_buffer_t *b = Encode(w);
+        if (b != NULL)
         {
-            if ( bufout == NULL )
+            if (bufout == NULL)
             {
                 bufout = b;
             }
@@ -456,10 +474,14 @@
         }
     }
     // add the eof marker to the end of our buf chain
-    if ( buf )
+    if (buf != NULL)
+    {
         buf->next = bufin;
+    }
     else
+    {
         bufout = bufin;
+    }
     return bufout;
 }
 
@@ -468,29 +490,29 @@
  ***********************************************************************
  *
  **********************************************************************/
-int encCoreAudioWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
-                      hb_buffer_t ** buf_out )
+int encCoreAudioWork(hb_work_object_t *w, hb_buffer_t **buf_in,
+                     hb_buffer_t **buf_out)
 {
-    hb_work_private_t * pv = w->private_data;
-    hb_buffer_t * buf;
+    hb_work_private_t *pv = w->private_data;
+    hb_buffer_t *buf;
 
-    if( (*buf_in)->size <= 0 )
+    if ((*buf_in)->size <= 0)
     {
         // EOF on input. Finish encoding what we have buffered then send
         // it & the eof downstream.
-        *buf_out = Flush( w, *buf_in );
+        *buf_out = Flush(w, *buf_in);
         *buf_in = NULL;
         return HB_WORK_DONE;
     }
 
-    hb_list_add( pv->list, *buf_in );
+    hb_list_add(pv->list, *buf_in);
     *buf_in = NULL;
 
-    *buf_out = buf = Encode( w );
+    *buf_out = buf = Encode(w);
 
-    while( buf )
+    while (buf != NULL)
     {
-        buf->next = Encode( w );
+        buf->next = Encode(w);
         buf       = buf->next;
     }

HandBrake-0.9.6.tar.bz2/libhb/ports.c -> HandBrake-0.9.8.tar.bz2/libhb/ports.c Changed

HandBrake-0.9.6.tar.bz2/libhb/ports.h -> HandBrake-0.9.8.tar.bz2/libhb/ports.h Changed

HandBrake-0.9.6.tar.bz2/libhb/reader.c -> HandBrake-0.9.8.tar.bz2/libhb/reader.c Changed

@@ -52,12 +52,13 @@
     int            start_found;     // found pts_to_start point
     int64_t        pts_to_start;
     uint64_t       st_first;
+    hb_fifo_t    * fifos[100];
 };
 
 /***********************************************************************
  * Local prototypes
  **********************************************************************/
-static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id );
+static hb_fifo_t ** GetFifoForId( hb_work_private_t * r, int id );
 static void UpdateState( hb_work_private_t  * r, int64_t start);
 
 /***********************************************************************
@@ -404,8 +405,6 @@
             if ( buf->start > 0 )
             {
                 pts_to_start += buf->start;
-                r->pts_to_start += buf->start;
-                r->job->pts_to_start += buf->start;
             }
         }
         
@@ -528,7 +527,7 @@
         while( ( buf = hb_list_item( list, 0 ) ) )
         {
             hb_list_rem( list, buf );
-            fifos = GetFifoForId( r->job, buf->id );
+            fifos = GetFifoForId( r, buf->id );
 
             if ( fifos && ! r->saw_video && !r->job->indepth_scan )
             {
@@ -716,15 +715,15 @@
  ***********************************************************************
  *
  **********************************************************************/
-static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id )
+static hb_fifo_t ** GetFifoForId( hb_work_private_t * r, int id )
 {
+    hb_job_t      * job = r->job;
     hb_title_t    * title = job->title;
     hb_audio_t    * audio;
     hb_subtitle_t * subtitle;
     int             i, n, count;
-    static hb_fifo_t * fifos[100];
 
-    memset(fifos, 0, sizeof(fifos));
+    memset(r->fifos, 0, sizeof(r->fifos));
 
     if( id == title->video_id )
     {
@@ -738,8 +737,8 @@
         }
         else
         {
-            fifos[0] = job->fifo_mpeg2;
-            return fifos;
+            r->fifos[0] = job->fifo_mpeg2;
+            return r->fifos;
         }
     }
 
@@ -757,13 +756,13 @@
                  * we are scanning and looking for forced subs, then pass them up
                  * to decode whether the sub is a forced one.
                  */
-                fifos[n++] = subtitle->fifo_in;
+                r->fifos[n++] = subtitle->fifo_in;
             }
         }
     }
     if ( n != 0 )
     {
-        return fifos;
+        return r->fifos;
     }
     
     if( !job->indepth_scan )
@@ -774,13 +773,13 @@
             audio = hb_list_item( title->list_audio, i );
             if( id == audio->id )
             {
-                fifos[n++] = audio->priv.fifo_in;
+                r->fifos[n++] = audio->priv.fifo_in;
             }
         }
 
         if( n != 0 )
         {
-            return fifos;
+            return r->fifos;
         }
     }

HandBrake-0.9.6.tar.bz2/libhb/render.c -> HandBrake-0.9.8.tar.bz2/libhb/render.c Changed

@@ -468,6 +468,7 @@
             {
                 out->stop = cfr_stop;
             }
+            pv->out_last_stop = out->stop;
         }
         else
         {
@@ -477,7 +478,8 @@
             // each of which is a frame time long.
             double excess_dur = (double)out->stop - cfr_stop;
             out->stop = cfr_stop;
-            for ( ; excess_dur >= pv->frame_rate; excess_dur -= cfr_stop )
+            pv->out_last_stop = out->stop;
+            for ( ; excess_dur >= pv->frame_rate; excess_dur -= pv->frame_rate )
             {
                 /* next frame too far ahead - dup current frame */
                 hb_buffer_t *dup = hb_buffer_init( out->size );
@@ -487,12 +489,12 @@
                 dup->start = cfr_stop;
                 cfr_stop += pv->frame_rate;
                 dup->stop = cfr_stop;
+                pv->out_last_stop = dup->stop;
                 out = insert_buffer_in_chain( out, dup );
                 ++pv->dups;
                 ++pv->count_frames;
             }
         }
-        pv->out_last_stop = out->stop;
         out = out->next;
     }
 }

HandBrake-0.9.6.tar.bz2/libhb/scan.c -> HandBrake-0.9.8.tar.bz2/libhb/scan.c Changed

@@ -9,8 +9,6 @@
 #include "a52dec/a52.h"
 #include "dca.h"
 
-#define HB_MAX_PREVIEWS 30 // 30 previews = every 5 minutes of a 2.5 hour video
-
 typedef struct
 {
     hb_handle_t  * h;
@@ -402,12 +400,33 @@
 
 typedef struct {
     int n;
-    int t[HB_MAX_PREVIEWS];
-    int b[HB_MAX_PREVIEWS];
-    int l[HB_MAX_PREVIEWS];
-    int r[HB_MAX_PREVIEWS];
+    int *t;
+    int *b;
+    int *l;
+    int *r;
 } crop_record_t;
 
+static crop_record_t * crop_record_init( int max_previews )
+{
+    crop_record_t *crops = calloc( 1, sizeof(*crops) );
+
+    crops->t = calloc( max_previews, sizeof(int) );
+    crops->b = calloc( max_previews, sizeof(int) );
+    crops->l = calloc( max_previews, sizeof(int) );
+    crops->r = calloc( max_previews, sizeof(int) );
+
+    return crops;
+}
+
+static void crop_record_free( crop_record_t *crops )
+{
+    free( crops->t );
+    free( crops->b );
+    free( crops->l );
+    free( crops->r );
+    free( crops );
+}
+
 static void record_crop( crop_record_t *crops, int t, int b, int l, int r )
 {
     crops->t[crops->n] = t;
@@ -508,7 +527,7 @@
     int doubled_frame_count = 0;
     int interlaced_preview_count = 0;
     info_list_t * info_list = calloc( data->preview_count+1, sizeof(*info_list) );
-    crop_record_t *crops = calloc( 1, sizeof(*crops) );
+    crop_record_t *crops = crop_record_init( data->preview_count );
 
     list_es  = hb_list_init();
 
@@ -559,7 +578,7 @@
         if ( *data->die )
         {
             free( info_list );
-            free( crops );
+            crop_record_free( crops );
             return 0;
         }
         if (data->bd)
@@ -717,7 +736,7 @@
         }
 
         /* Check preview for interlacing artifacts */
-        if( hb_detect_comb( vid_buf, vid_info.width, vid_info.height, 10, 30, 9, 10, 30, 9 ) )
+        if( hb_detect_comb( vid_buf, 10, 30, 9, 10, 30, 9 ) )
         {
             hb_deep_log( 2, "Interlacing detected in preview frame %i", i+1);
             interlaced_preview_count++;
@@ -851,9 +870,20 @@
         title->height = vid_info.height;
         if ( vid_info.rate && vid_info.rate_base )
         {
+            // if the frame rate is very close to one of our "common" framerates,
+            // assume it actually is said frame rate; e.g. some 24000/1001 sources
+            // may have a rate_base of 1126124 (instead of 1126125)
+            for( i = 0; i < hb_video_rates_count; i++ )
+            {
+                if( is_close_to( vid_info.rate_base, hb_video_rates[i].rate, 100 ) )
+                {
+                    vid_info.rate_base = hb_video_rates[i].rate;
+                    break;
+                }
+            }
             title->rate = vid_info.rate;
             title->rate_base = vid_info.rate_base;
-            if( is_close_to( vid_info.rate_base, 900900, 100 ) )
+            if( vid_info.rate_base == 900900 )
             {
                 if( pulldown_count >= npreviews / 4 )
                 {
@@ -943,7 +973,7 @@
             title->detected_interlacing = 0;
         }
     }
-    free( crops );
+    crop_record_free( crops );
     free( info_list );
 
     while( ( buf_es = hb_list_item( list_es, 0 ) ) )

HandBrake-0.9.6.tar.bz2/libhb/stream.c -> HandBrake-0.9.8.tar.bz2/libhb/stream.c Changed

@@ -12,7 +12,6 @@
 #include "hbffmpeg.h"
 #include "lang.h"
 #include "a52dec/a52.h"
-#include "mp4v2/mp4v2.h"
 #include "libbluray/bluray.h"
 
 #define min(a, b) a < b ? a : b
@@ -250,10 +249,10 @@
 static off_t align_to_next_packet(hb_stream_t *stream);
 static int64_t pes_timestamp( const uint8_t *pes );
 
-static void hb_ts_stream_init(hb_stream_t *stream);
+static int hb_ts_stream_init(hb_stream_t *stream);
 static hb_buffer_t * hb_ts_stream_decode(hb_stream_t *stream);
 static void hb_init_audio_list(hb_stream_t *stream, hb_title_t *title);
-static void hb_ts_stream_find_pids(hb_stream_t *stream);
+static int hb_ts_stream_find_pids(hb_stream_t *stream);
 
 static void hb_ps_stream_init(hb_stream_t *stream);
 static hb_buffer_t * hb_ps_stream_decode(hb_stream_t *stream);
@@ -614,10 +613,10 @@
                    " offset %d bytes", psize, offset);
             stream->packetsize = psize;
             stream->hb_stream_type = transport;
-            hb_ts_stream_init(stream);
-            return 1;
+            if (hb_ts_stream_init(stream) == 0)
+                return 1;
         }
-        if ( hb_stream_check_for_ps(stream) != 0 )
+        else if ( hb_stream_check_for_ps(stream) != 0 )
         {
             hb_log("file is MPEG Program Stream");
             stream->hb_stream_type = program;
@@ -2133,7 +2132,7 @@
  *
  **********************************************************************/
 
-static void hb_ts_stream_init(hb_stream_t *stream)
+static int hb_ts_stream_init(hb_stream_t *stream)
 {
     int i;
 
@@ -2161,7 +2160,10 @@
     stream->ts.packet = malloc( stream->packetsize );
 
     // Find the audio and video pids in the stream
-    hb_ts_stream_find_pids(stream);
+    if (hb_ts_stream_find_pids(stream) < 0)
+    {
+        return -1;
+    }
 
     // hb_ts_resolve_pid_types reads some data, so the TS buffers
     // are needed here.
@@ -2229,6 +2231,7 @@
                 hb_stream_delete_ts_entry(stream, i);
         }
     }
+    return 0;
 }
 
 static void hb_ps_stream_init(hb_stream_t *stream)
@@ -2919,6 +2922,13 @@
                 pes_info->dts = pes_info->pts;
             }
         }
+        // A user encountered a stream that has garbage DTS timestamps. 
+        // DTS should never be > PTS.  Such broken timestamps leads to 
+        // HandBrake computing negative buffer start times. 
+        if (pes_info->dts > pes_info->pts) 
+        { 
+            pes_info->dts = pes_info->pts; 
+        } 
 
         if ( has_escr )
             bits_skip(&bb_hdr, 8 * 6);
@@ -3694,7 +3704,10 @@
                 if ( decode_ps_map( stream, buf->data, buf->size ) )
                 {
                     hb_log("Found program stream map");
-                    goto done;
+                    // Normally, we could quit here since the program
+                    // stream map *should* map all streams. But once
+                    // again Tivo breaks things by not always creating
+                    // complete maps.  So continue processing...
                 }
                 else
                 {
@@ -3828,7 +3841,6 @@
         }
         hb_stream_seek( stream, 0.2 );
     }
-done:
     hb_buffer_close( &buf );
 }
 
@@ -4257,7 +4269,7 @@
 }
 
 
-static void hb_ts_stream_find_pids(hb_stream_t *stream)
+static int hb_ts_stream_find_pids(hb_stream_t *stream)
 {
     // To be different from every other broadcaster in the world, New Zealand TV
     // changes PMTs (and thus video & audio PIDs) when 'programs' change. Since
@@ -4286,8 +4298,8 @@
 
         if ((pid == 0x0000) && (stream->ts_number_pat_entries == 0))
         {
-          decode_PAT(buf, stream);
-          continue;
+            decode_PAT(buf, stream);
+            continue;
         }
 
         int pat_index = 0;
@@ -4312,16 +4324,21 @@
             if (stream->pat_info[pat_index].program_number != 0 &&
                 pid == stream->pat_info[pat_index].program_map_PID)
             {
-              if (build_program_map(buf, stream) > 0)
-                break;
+                if (build_program_map(buf, stream) > 0)
+                {
+                    break;
+                }
             }
         }
         // Keep going  until we have a complete set of PIDs
         if ( ts_index_of_video( stream ) >= 0 )
           break;
     }
+    if ( ts_index_of_video( stream ) < 0 )
+        return -1;
     update_ts_streams( stream, stream->pmt_info.PCR_PID, 0, -1, P, NULL );
- }
+    return 0;
+}
 
 
 // convert a PES PTS or DTS to an int64

HandBrake-0.9.6.tar.bz2/libhb/sync.c -> HandBrake-0.9.8.tar.bz2/libhb/sync.c Changed

HandBrake-0.9.6.tar.bz2/macosx/Controller.m -> HandBrake-0.9.8.tar.bz2/macosx/Controller.m Changed

@@ -2433,32 +2433,15 @@
     [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"];
     
     /* Auto Passthru */
-    if ([fAudioAutoPassthruBox isHidden])
-    {
-        // every passthru is allowed, fallback is AC3
-        [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAACPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAC3Pass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSHDPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowMP3Pass"];
-        // just in case we need it for display purposes
-        [queueFileJob setObject:@"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"];
-        // actual fallback encoder
-        [queueFileJob setObject:[NSNumber numberWithInt:HB_ACODEC_AC3] forKey: @"JobAudioEncoderFallback"];
-        
-    }
-    else
-    {
-        [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
-        [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
-        // just in case we need it for display purposes
-        [queueFileJob setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
-        // actual fallback encoder
-        [queueFileJob setObject:[NSNumber numberWithInt:[[fAudioFallbackPopUp selectedItem] tag]] forKey: @"JobAudioEncoderFallback"];
-    }
+    [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
+    [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
+    [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
+    [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
+    [queueFileJob setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
+    // just in case we need it for display purposes
+    [queueFileJob setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
+    // actual fallback encoder
+    [queueFileJob setObject:[NSNumber numberWithInt:[[fAudioFallbackPopUp selectedItem] tag]] forKey: @"JobAudioEncoderFallback"];
     
     /* Audio */
     [self writeToActivityLog: "createQueueFileItem: Getting Audio from prepareAudioForQueueFileJob ..."];
@@ -3285,37 +3268,28 @@
     
     
     /* Auto Passthru */
-    if ([fAudioAutoPassthruBox isHidden])
+    job->acodec_copy_mask = 0;
+    if ([fAudioAllowAACPassCheck state] == NSOnState)
     {
-        // every passthru is allowed, fallback is AC3
-        job->acodec_copy_mask = HB_ACODEC_PASS_MASK;
-        job->acodec_fallback = HB_ACODEC_AC3;
+        job->acodec_copy_mask |= HB_ACODEC_FFAAC;
     }
-    else
+    if ([fAudioAllowAC3PassCheck state] == NSOnState)
     {
-        job->acodec_copy_mask = 0;
-        if ([fAudioAllowAACPassCheck state] == NSOnState)
-        {
-            job->acodec_copy_mask |= HB_ACODEC_FFAAC;
-        }
-        if ([fAudioAllowAC3PassCheck state] == NSOnState)
-        {
-            job->acodec_copy_mask |= HB_ACODEC_AC3;
-        }
-        if ([fAudioAllowDTSHDPassCheck state] == NSOnState)
-        {
-            job->acodec_copy_mask |= HB_ACODEC_DCA_HD;
-        }
-        if ([fAudioAllowDTSPassCheck state] == NSOnState)
-        {
-            job->acodec_copy_mask |= HB_ACODEC_DCA;
-        }
-        if ([fAudioAllowMP3PassCheck state] == NSOnState)
-        {
-            job->acodec_copy_mask |= HB_ACODEC_MP3;
-        }
-        job->acodec_fallback = [[fAudioFallbackPopUp selectedItem] tag];
+        job->acodec_copy_mask |= HB_ACODEC_AC3;
+    }
+    if ([fAudioAllowDTSHDPassCheck state] == NSOnState)
+    {
+        job->acodec_copy_mask |= HB_ACODEC_DCA_HD;
+    }
+    if ([fAudioAllowDTSPassCheck state] == NSOnState)
+    {
+        job->acodec_copy_mask |= HB_ACODEC_DCA;
     }
+    if ([fAudioAllowMP3PassCheck state] == NSOnState)
+    {
+        job->acodec_copy_mask |= HB_ACODEC_MP3;
+    }
+    job->acodec_fallback = [[fAudioFallbackPopUp selectedItem] tag];
     
     /* Audio tracks and mixdowns */
 	[fAudioDelegate prepareAudioForJob: job];
@@ -5789,9 +5763,8 @@
         /* Turbo 1st pass for 2 Pass Encoding */
         [fVidTurboPassCheck setState:[[chosenPreset objectForKey:@"VideoTurboTwoPass"] intValue]];
         
-        /* Auto Passthru */
-        /* If the preset has Auto Passthru fields, use them;
-         * else assume every passthru is allowed and the fallback is AC3 */
+        /* Auto Passthru: if the preset has Auto Passthru fields, use them.
+         * Otherwise assume every passthru is allowed and the fallback is AC3 */
         id tempObject;
         if ((tempObject = [chosenPreset objectForKey:@"AudioAllowAACPass"]) != nil)
         {
@@ -6365,25 +6338,12 @@
         [preset setObject:[NSNumber numberWithInt:[fPictureController grayscale]] forKey:@"VideoGrayScale"];
         
         /* Auto Pasthru */
-        if ([fAudioAutoPassthruBox isHidden])
-        {
-            // every passthru is allowed, fallback is AC3
-            [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAACPass"];
-            [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowAC3Pass"];
-            [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSHDPass"];
-            [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowDTSPass"];
-            [preset setObject:[NSNumber numberWithInt:1] forKey: @"AudioAllowMP3Pass"];
-            [preset setObject:@"AC3 (ffmpeg)" forKey: @"AudioEncoderFallback"];
-        }
-        else
-        {
-            [preset setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
-            [preset setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
-            [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
-            [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
-            [preset setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
-            [preset setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
-        }
+        [preset setObject:[NSNumber numberWithInt:[fAudioAllowAACPassCheck state]] forKey: @"AudioAllowAACPass"];
+        [preset setObject:[NSNumber numberWithInt:[fAudioAllowAC3PassCheck state]] forKey: @"AudioAllowAC3Pass"];
+        [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSHDPassCheck state]] forKey: @"AudioAllowDTSHDPass"];
+        [preset setObject:[NSNumber numberWithInt:[fAudioAllowDTSPassCheck state]] forKey: @"AudioAllowDTSPass"];
+        [preset setObject:[NSNumber numberWithInt:[fAudioAllowMP3PassCheck state]] forKey: @"AudioAllowMP3Pass"];
+        [preset setObject:[fAudioFallbackPopUp titleOfSelectedItem] forKey: @"AudioEncoderFallback"];
         
         /* Audio */
         NSMutableArray *audioListArray = [[NSMutableArray alloc] init];

HandBrake-0.9.6.tar.bz2/macosx/HBPresets.h -> HandBrake-0.9.8.tar.bz2/macosx/HBPresets.h Changed

HandBrake-0.9.6.tar.bz2/macosx/HBPresets.m -> HandBrake-0.9.8.tar.bz2/macosx/HBPresets.m Changed

@@ -1,8 +1,8 @@
 /*  HBPresets.m $
-
-   This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License. */
+ 
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
 
 #import "HBPresets.h"
 
@@ -10,7 +10,7 @@
 - (id)init 
 {
     self = [super init];
-   return self;
+    return self;
 }
 
 /* Called by -addFactoryPresets in Controller.mm */
@@ -40,16 +40,16 @@
 - (NSDictionary *)createDevicesPresetFolder
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-/*Set whether or not this is a folder, 1 is bool for folder*/
+    /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-
-
+    
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"Devices" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
     
@@ -65,15 +65,16 @@
     [childrenArray addObject:[self createiPadPreset]];
     [childrenArray addObject:[self createAppleTVPreset]];
 	[childrenArray addObject:[self createAppleTv2Preset]];
+    [childrenArray addObject:[self createAppleTv3Preset]];
     [childrenArray addObject:[self createAndroidMidPreset]];
     [childrenArray addObject:[self createAndroidHighPreset]];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
     
     [childrenArray autorelease];
-
-
-
+    
+    
+    
     [preset autorelease];
     return preset;
 }
@@ -81,16 +82,16 @@
 - (NSDictionary *)createRegularPresetFolder
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-/*Set whether or not this is a folder, 1 is bool for folder*/
+    /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-
-
+    
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"Regular" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
     
@@ -104,9 +105,9 @@
     [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
     
     [childrenArray autorelease];
-
-
-
+    
+    
+    
     [preset autorelease];
     return preset;
 }
@@ -114,16 +115,16 @@
 - (NSDictionary *)createLegacyPresetFolder
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-/*Set whether or not this is a folder, 1 is bool for folder*/
+    /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: YES] forKey:@"Folder"];
-
-
+    
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"Legacy" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
     
@@ -137,9 +138,9 @@
     [preset setObject:[NSMutableArray arrayWithArray: childrenArray] forKey:@"ChildrenArray"];
     
     [childrenArray autorelease];
-
-
-
+    
+    
+    
     [preset autorelease];
     return preset;
 }
@@ -155,53 +156,53 @@
 - (NSDictionary *)createAppleTVPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"AppleTV" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
     /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's settings for the AppleTV and 2009's iPhone and iPod Touch lineup. Provides a good balance between quality and file size, and pushes the devices to their limits. Includes Dolby Digital 5.1 AC3 sound for the AppleTV." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* 64-bit MP4 file */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-
+    
     /* x264 Option String (We can use this to tweak the appleTV output)*/
     [preset setObject:@"cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /* Basic Picture Settings */
     /* Use Max Picture settings for whatever the dvd is.*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
@@ -209,7 +210,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -217,7 +218,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
@@ -225,7 +226,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -240,7 +241,7 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     /* Track 2 */
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
@@ -254,12 +255,12 @@
     [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack2Array autorelease];
     [audioListArray addObject:audioTrack2Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -267,53 +268,53 @@
 - (NSDictionary *)createAppleUniversalPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"Universal" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
     /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's universally compatible, full resolution settings for all current Apple devices: iPod (6G and up), iPhone, AppleTV, and Macs" forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* 64-bit MP4 file */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4LargeFile"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-
+    
     /* x264 Option String (We can use this to tweak the appleTV output)*/
     [preset setObject:@"cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /* Basic Picture Settings */
     /* Use Max Picture settings for whatever the dvd is.*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
@@ -321,7 +322,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -329,7 +330,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
@@ -337,7 +338,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -352,7 +353,7 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     /* Track 2 */
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
@@ -366,12 +367,12 @@
     [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack2Array autorelease];
     [audioListArray addObject:audioTrack2Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -379,61 +380,61 @@
 - (NSDictionary *)createiPadPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"iPad" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
     /*Set whether or not this is a folder, 1 is bool for folder*/
     [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's preset for the iPad (1st gen) is optimized for viewing on its 1024x768 display." forKey:@"PresetDescription"];
-
+    [preset setObject:@"HandBrake's preset for the iPad (all generations) is optimized for a good balance between quality and filesize." forKey:@"PresetDescription"];
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* 64-bit MP4 file */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-
+    
     /* x264 Option String (We can use this to tweak the output)*/
     [preset setObject:@"" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"29.97 (NTSC Video)" forKey:@"VideoFramerate"];
     [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
     
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /* Basic Picture Settings */
     /* Use Max Picture settings for whatever the dvd is.*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-    [preset setObject:[NSNumber numberWithInt:1024] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:1280] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -441,7 +442,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
@@ -449,7 +450,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -464,12 +465,12 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -685,74 +686,87 @@
     return preset;
 }
 
-- (NSDictionary *)createClassicPreset
+- (NSDictionary *)createAppleTv3Preset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+	
     /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"Classic" forKey:@"PresetName"];
-
-    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
+    [preset setObject:@"AppleTV 3" forKey:@"PresetName"];
+	
+    /*Set whether or not this is a user preset where 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    /*Set whether or not this is a folder, 1 is bool for folder*/
+    [preset setObject:[NSNumber numberWithBool: NO] forKey:@"Folder"];
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+	
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+	
     /* Get the New Preset Description from the field in the AddPresetPanel */
-    [preset setObject:@"HandBrake's traditional, faster, lower-quality settings." forKey:@"PresetDescription"];
-
+    [preset setObject:@"HandBrake's preset for the Apple TV (3rd gen) is optimized for up to 1080p playback." forKey:@"PresetDescription"];
+	
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+	
+    /* 64-bit MP4 file */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
+	
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
-
+	[preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+	
     /* Video encoder */
-    [preset setObject:@"MPEG-4 (FFmpeg)" forKey:@"VideoEncoder"];
-
-    /* x264 Option String */
-    [preset setObject:@"" forKey:@"x264Option"];
-
+    [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
+	
+    /* x264 Option String (We can use this to tweak the output)*/
+    [preset setObject:@"b-adapt=2" forKey:@"x264Option"];
+	
     /* Video quality */
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
-    [preset setObject:@"1000" forKey:@"VideoAvgBitrate"];
-
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
+    [preset setObject:@"2500" forKey:@"VideoAvgBitrate"];
+    [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
+	
     /* Video framerate */
-    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
-    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    [preset setObject:@"30" forKey:@"VideoFramerate"];
+    [preset setObject:@"pfr" forKey:@"VideoFramerateMode"];
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+	
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
-    /*Picture Settings*/
+	
+    /* Basic Picture Settings */
     /* Use Max Picture settings for whatever the dvd is.*/
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
+    [preset setObject:[NSNumber numberWithInt:1920] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
-    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
-
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
+    
+    /* We use Loose Anamorphic with a Modulus of 2 */
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureModulus"];
+	
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
-    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    /* Note: decided to use Fast Decomb. This makes this the only device preset using
+     * decomb that we have. Fast Decomb is better than no decomb imo and has basically no
+     * speed hit on progressive sources. Once Default decomb is sped up, we can switch */
+    [preset setObject:[NSNumber numberWithInt:3] forKey:@"PictureDecomb"];
+	
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];    
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-    
+	
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -767,66 +781,174 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
+	
+    /* Track 2 */
+    NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
+    [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
+    [audioTrack2Array setObject:@"AC3 Passthru" forKey:@"AudioEncoder"];
+    [audioTrack2Array setObject:@"None" forKey:@"AudioMixdown"];
+    [audioTrack2Array setObject:@"Auto" forKey:@"AudioSamplerate"];
+    [audioTrack2Array setObject:@"160" forKey:@"AudioBitrate"];
+    /* Note: we ignore specified bitrate for AC3 Passthru in libhb and use
+     * the sources bitrate, however we need to initially set the value to something so
+     * the macgui doesnt barf, so 160 seems as good as anything */
+    [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
+    [audioTrack2Array autorelease];
+    [audioListArray addObject:audioTrack2Array];
+	
+	
+    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
+	
+    /* Subtitles*/
+    [preset setObject:@"None" forKey:@"Subtitles"];
+	
+    [preset autorelease];
+    return preset;
+}
 
-    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
-    /* Subtitles*/
-    [preset setObject:@"None" forKey:@"Subtitles"];
-
-    [preset autorelease];
-    return preset;
-}
-
-- (NSDictionary *)createHighProfilePreset
-{
-    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
-    /* Get the New Preset Name from the field in the AddPresetPanel */
-    [preset setObject:@"High Profile" forKey:@"PresetName"];
 
+- (NSDictionary *)createClassicPreset
+{
+    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+    
+    /* Get the New Preset Name from the field in the AddPresetPanel */
+    [preset setObject:@"Classic" forKey:@"PresetName"];
+    
     /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
+    
+    /* Get the New Preset Description from the field in the AddPresetPanel */
+    [preset setObject:@"HandBrake's traditional, faster, lower-quality settings." forKey:@"PresetDescription"];
+    
+    /* File Format */
+    [preset setObject:@"MP4 file" forKey:@"FileFormat"];
+    
+    /* Chapter Markers*/
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"ChapterMarkers"];
+    
+    /* Video encoder */
+    [preset setObject:@"MPEG-4 (FFmpeg)" forKey:@"VideoEncoder"];
+    
+    /* x264 Option String */
+    [preset setObject:@"" forKey:@"x264Option"];
+    
+    /* Video quality */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
+    [preset setObject:@"1000" forKey:@"VideoAvgBitrate"];
+    
+    /* Video framerate */
+    [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
+    [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
+    
+    /* GrayScale */
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
+    
+    /* 2 Pass Encoding */
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
+    
+    /*Picture Settings*/
+    /* Use Max Picture settings for whatever the dvd is.*/
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureWidth"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
+    
+    /* Explicitly set the filters for built-in presets */
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
+    
+    /* Set crop settings here */
+    /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
+    
+    /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
+     * not listed will be set to "None" and not encoded */
+    NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
+    
+    /* Track 1 */        
+    NSMutableDictionary *audioTrack1Array = [[NSMutableDictionary alloc] init];
+    [audioTrack1Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
+    [audioTrack1Array setObject:@"AAC (faac)" forKey:@"AudioEncoder"];
+    [audioTrack1Array setObject:@"Dolby Pro Logic II"  forKey:@"AudioMixdown"];
+    [audioTrack1Array setObject:@"Auto" forKey:@"AudioSamplerate"];
+    [audioTrack1Array setObject:@"160" forKey:@"AudioBitrate"];
+    [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
+    [audioTrack1Array autorelease];
+    [audioListArray addObject:audioTrack1Array];
+    
+    [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
+    
+    /* Subtitles*/
+    [preset setObject:@"None" forKey:@"Subtitles"];
+    
+    [preset autorelease];
+    return preset;
+}
 
+- (NSDictionary *)createHighProfilePreset
+{
+    NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
+    
+    /* Get the New Preset Name from the field in the AddPresetPanel */
+    [preset setObject:@"High Profile" forKey:@"PresetName"];
+    
+    /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
+    
+    /*Set whether or not this is default, at creation set to 0*/
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
+    
+    /*Get the whether or not to apply pic settings in the AddPresetPanel*/
+    [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* 64-bit MP4 file */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4LargeFile"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-
+    
     /* x264 Option String */
     [preset setObject:@"b-adapt=2:rc-lookahead=50" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"1800" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
-
+    
     /*Picture Settings*/
     /* Use Max Picture settings for whatever the dvd is.*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
@@ -834,23 +956,23 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureDecombDeinterlace"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDenoise"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
-    [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureDetelecine"];
+    [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"PictureDecomb"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -865,7 +987,7 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     /* Track 2 */
     NSMutableDictionary *audioTrack2Array = [[NSMutableDictionary alloc] init];
     [audioTrack2Array setObject:[NSNumber numberWithInt:1] forKey:@"AudioTrack"];
@@ -879,12 +1001,12 @@
     [audioTrack2Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack2Array autorelease];
     [audioListArray addObject:audioTrack2Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -892,56 +1014,56 @@
 - (NSDictionary *)createiPhonePreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"iPhone & iPod Touch" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's settings for all iPhones and iPod Touches going back to the original iPhone 2G." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"960" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /*Picture Settings*/
     /* Use a width of 480 for the iPhone*/
     [preset setObject:[NSNumber numberWithInt:480] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -949,7 +1071,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
@@ -957,7 +1079,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -972,12 +1094,12 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -985,55 +1107,55 @@
 - (NSDictionary *)createIpodHighPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"iPod Legacy" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's high resolution settings for older 5 and 5.5G iPods. Good video quality, great for viewing on a TV using your iPod. This is the iPod High-Rez preset from 0.9.2." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
     [preset setObject:@"1500" forKey:@"VideoAvgBitrate"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /*Picture Settings*/
     /* Use a width of 640 for iPod TV-out */
     [preset setObject:[NSNumber numberWithInt:640] forKey:@"PictureWidth"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -1041,7 +1163,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
@@ -1049,7 +1171,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -1064,12 +1186,12 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -1077,48 +1199,48 @@
 - (NSDictionary *)createIpodLowPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"iPod" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's low resolution settings for the iPod (5G and up). Optimized for great playback on the iPod screen, with smaller file size." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"];
     [preset setObject:@"700" forKey:@"VideoAvgBitrate"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
-
+    
     /*Picture Settings*/
     /* Use a width of 320 for the iPod screen */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
@@ -1126,7 +1248,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -1134,14 +1256,14 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -1156,12 +1278,12 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }
@@ -1169,50 +1291,50 @@
 - (NSDictionary *)createNormalPreset
 {
     NSMutableDictionary *preset = [[NSMutableDictionary alloc] init];
-
+    
     /* Get the New Preset Name from the field in the AddPresetPanel */
     [preset setObject:@"Normal" forKey:@"PresetName"];
-
+    
     /*Set whether or not this is a user preset or factory 0 is factory, 1 is user*/
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"Type"];
-
+    
     /*Set whether or not this is default, at creation set to 0*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"Default"];
-
+    
     /*Get the whether or not to apply pic settings in the AddPresetPanel*/
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"UsesPictureSettings"];
-
+    
     /* Get the New Preset Description from the field in the AddPresetPanel */
     [preset setObject:@"HandBrake's normal, default settings." forKey:@"PresetDescription"];
-
+    
     /* File Format */
     [preset setObject:@"MP4 file" forKey:@"FileFormat"];
-
+    
     /* Chapter Markers*/
-     [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
-
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"ChapterMarkers"];
+    
     /* Video encoder */
     [preset setObject:@"H.264 (x264)" forKey:@"VideoEncoder"];
-
+    
     /* x264 Option String */
     [preset setObject:@"ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0" forKey:@"x264Option"];
-
+    
     /* Video quality */
     [preset setObject:[NSNumber numberWithInt:2] forKey:@"VideoQualityType"];
     [preset setObject:@"1500" forKey:@"VideoAvgBitrate"];
     [preset setObject:[NSNumber numberWithFloat:20.0] forKey:@"VideoQualitySlider"];
-
+    
     /* Video framerate */
     [preset setObject:@"Same as source" forKey:@"VideoFramerate"];
     [preset setObject:@"vfr" forKey:@"VideoFramerateMode"];
-
+    
     /* GrayScale */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoGrayScale"];
-
+    
     /* 2 Pass Encoding */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTwoPass"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VideoTurboTwoPass"];
-
+    
     /*Picture Settings*/
     /* Use Max Picture settings for whatever the dvd is.*/
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PictureAutoCrop"];
@@ -1220,7 +1342,7 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureHeight"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureKeepRatio"];
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"PicturePAR"];
-
+    
     /* Explicitly set the filters for built-in presets */
     [preset setObject:[NSNumber numberWithInt:1] forKey:@"UsesPictureFilters"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeinterlace"];
@@ -1228,14 +1350,14 @@
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"VFR"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDeblock"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureDetelecine"];
-
+    
     /* Set crop settings here */
     /* The Auto Crop Matrix in the Picture Window autodetects differences in crop settings */
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureTopCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureBottomCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureLeftCrop"];
     [preset setObject:[NSNumber numberWithInt:0] forKey:@"PictureRightCrop"];
-
+    
     /* Audio - Is done on a track by track basis, ONLY specifiy the tracks we want set as any track
      * not listed will be set to "None" and not encoded */
     NSMutableArray *audioListArray = [[NSMutableArray alloc] init];
@@ -1250,12 +1372,12 @@
     [audioTrack1Array setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackDRCSlider"];
     [audioTrack1Array autorelease];
     [audioListArray addObject:audioTrack1Array];
-
+    
     [preset setObject:[NSMutableArray arrayWithArray: audioListArray] forKey:@"AudioList"];
-
+    
     /* Subtitles*/
     [preset setObject:@"None" forKey:@"Subtitles"];
-
+    
     [preset autorelease];
     return preset;
 }

HandBrake-0.9.6.tar.bz2/make/configure.py -> HandBrake-0.9.8.tar.bz2/make/configure.py Changed

HandBrake-0.9.6.tar.bz2/make/include/contrib.defs -> HandBrake-0.9.8.tar.bz2/make/include/contrib.defs Changed

HandBrake-0.9.6.tar.bz2/make/include/gcc.defs -> HandBrake-0.9.8.tar.bz2/make/include/gcc.defs Changed

HandBrake-0.9.6.tar.bz2/make/include/main.defs -> HandBrake-0.9.8.tar.bz2/make/include/main.defs Changed

HandBrake-0.9.8.tar.bz2/make/variant/gnu.defs Added

HandBrake-0.9.8.tar.bz2/make/variant/kfreebsd.defs Added

HandBrake-0.9.6.tar.bz2/scripts/manicure.rb -> HandBrake-0.9.8.tar.bz2/scripts/manicure.rb Changed

@@ -361,22 +361,24 @@
           audioEncoders << "lame"
         when /FLAC/
           audioEncoders << "ffflac"
+        when /Auto Pass/
+          audioEncoders << "copy"
       end
       
       #Mixdowns
       case audioTrack["AudioMixdown"]
-      when /Mono/
-        audioMixdowns << "mono"
-      when /Stereo/
-        audioMixdowns << "stereo"
-      when /Dolby Surround/
-        audioMixdowns << "dpl1"
-      when /Dolby Pro Logic II/
-        audioMixdowns << "dpl2"
-      when /discrete/
-        audioMixdowns << "6ch"
-      when /None/
-        audioMixdowns << "auto"
+        when /Mono/
+          audioMixdowns << "mono"
+        when /Stereo/
+          audioMixdowns << "stereo"
+        when /Dolby Surround/
+          audioMixdowns << "dpl1"
+        when /Dolby Pro Logic II/
+          audioMixdowns << "dpl2"
+        when /discrete/
+          audioMixdowns << "6ch"
+        when /None/
+          audioMixdowns << "auto"
       end
       
       #Samplerates
@@ -404,6 +406,63 @@
     commandString << " -6 " << audioMixdowns
     commandString << " -R " << audioSamplerates
     commandString << " -D " << audioTrackDRCs
+    
+    #Auto Passthru Mask
+    audioCopyMask = ""
+    
+    if hash["AudioAllowAACPass"].to_i == 1
+      audioCopyMask << "aac"
+    end
+    if hash["AudioAllowAC3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "ac3"
+    end
+    if hash["AudioAllowDTSHDPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dtshd"
+    end
+    if hash["AudioAllowDTSPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dts"
+    end
+    if hash["AudioAllowMP3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "mp3"
+    end
+    
+    if audioCopyMask.size > 0
+      commandString << " --audio-copy-mask " << audioCopyMask
+    end
+    
+    #Auto Passthru Fallback
+    audioEncoderFallback = ""
+    
+    case hash["AudioEncoderFallback"]
+      when /AC3/
+        audioEncoderFallback << "ffac3"
+      when "AAC (ffmpeg)"
+        audioEncoderFallback << "ffaac"
+      when /AAC/
+        audioEncoderFallback << "faac"
+      when /Vorbis/
+        audioEncoderFallback << "vorbis"
+      when /MP3/
+        audioEncoderFallback << "lame"
+      when /FLAC/
+        audioEncoderFallback << "ffflac"
+    end
+    
+    if audioEncoderFallback.size > 0
+      commandString << " --audio-fallback " << audioEncoderFallback
+    end
         
     #Container
     commandString << " -f "
@@ -424,6 +483,11 @@
       commandString << " -4"
     end
     
+    #MP4 Optimize for HTTP Streaming
+    if hash["Mp4HttpOptimize"].to_i == 1
+      commandString << " -O"
+    end
+    
     #Cropping
     if hash["PictureAutoCrop"] == 0
       commandString << " --crop "
@@ -479,9 +543,17 @@
         commandString << " --denoise=\"strong\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
       
     end
     
@@ -494,6 +566,11 @@
       commandString << " --custom-anamorphic"
     end
 
+    #Modulus
+    if hash["PictureModulus"]
+      commandString << " --modulus " << hash["PictureModulus"].to_s
+    end
+
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << " -m" end
     if hash["VideoGrayScale"] == 1 then commandString << " -g" end
@@ -627,22 +704,24 @@
           audioEncoders << "lame"
         when /FLAC/
           audioEncoders << "ffflac"
+        when /Auto Pass/
+          audioEncoders << "copy"
       end
       
       #Mixdowns
       case audioTrack["AudioMixdown"]
-      when /Mono/
-        audioMixdowns << "mono"
-      when /Stereo/
-        audioMixdowns << "stereo"
-      when /Dolby Surround/
-        audioMixdowns << "dpl1"
-      when /Dolby Pro Logic II/
-        audioMixdowns << "dpl2"
-      when /discrete/
-        audioMixdowns << "6ch"
-      when /None/
-        audioMixdowns << "auto"
+        when /Mono/
+          audioMixdowns << "mono"
+        when /Stereo/
+          audioMixdowns << "stereo"
+        when /Dolby Surround/
+          audioMixdowns << "dpl1"
+        when /Dolby Pro Logic II/
+          audioMixdowns << "dpl2"
+        when /discrete/
+          audioMixdowns << "6ch"
+        when /None/
+          audioMixdowns << "auto"
       end
       
       #Samplerates
@@ -671,6 +750,63 @@
     commandString << " -R " << audioSamplerates
     commandString << " -D " << audioTrackDRCs
     
+    #Auto Passthru Mask
+    audioCopyMask = ""
+    
+    if hash["AudioAllowAACPass"].to_i == 1
+      audioCopyMask << "aac"
+    end
+    if hash["AudioAllowAC3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "ac3"
+    end
+    if hash["AudioAllowDTSHDPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dtshd"
+    end
+    if hash["AudioAllowDTSPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dts"
+    end
+    if hash["AudioAllowMP3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "mp3"
+    end
+    
+    if audioCopyMask.size > 0
+      commandString << " --audio-copy-mask " << audioCopyMask
+    end
+    
+    #Auto Passthru Fallback
+    audioEncoderFallback = ""
+    
+    case hash["AudioEncoderFallback"]
+      when /AC3/
+        audioEncoderFallback << "ffac3"
+      when "AAC (ffmpeg)"
+        audioEncoderFallback << "ffaac"
+      when /AAC/
+        audioEncoderFallback << "faac"
+      when /Vorbis/
+        audioEncoderFallback << "vorbis"
+      when /MP3/
+        audioEncoderFallback << "lame"
+      when /FLAC/
+        audioEncoderFallback << "ffflac"
+    end
+    
+    if audioEncoderFallback.size > 0
+      commandString << " --audio-fallback " << audioEncoderFallback
+    end
+    
     #Container
     commandString << " -f "
     case hash["FileFormat"]
@@ -690,6 +826,11 @@
       commandString << " -4"
     end
     
+    #MP4 Optimize for HTTP Streaming
+    if hash["Mp4HttpOptimize"].to_i == 1
+      commandString << " -O"
+    end
+    
     #Cropping
     if hash["PictureAutoCrop"] == 0
       commandString << " --crop "
@@ -745,9 +886,18 @@
         commandString << " --denoise=\"strong\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
+      
     end
 
     #Anamorphic
@@ -759,6 +909,11 @@
       commandString << " --custom-anamorphic"
     end
     
+    #Modulus
+    if hash["PictureModulus"]
+      commandString << " --modulus " << hash["PictureModulus"].to_s
+    end
+    
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << " -m" end
     if hash["VideoGrayScale"] == 1 then commandString << " -g" end
@@ -805,6 +960,11 @@
       commandString << "job->largeFileSize = 1;\n    "
     end
     
+    #MP4 Optimize for HTTP Streaming
+    if hash["Mp4HttpOptimize"].to_i == 1
+      commandString << "job->mp4_optimize = 1;\n    "
+    end
+    
     #Video encoder
     if hash["VideoEncoder"] != "MPEG-4 (FFmpeg)"
       commandString << "vcodec = "
@@ -888,22 +1048,24 @@
           audioEncoders << "lame"
         when /FLAC/
           audioEncoders << "ffflac"
+        when /Auto Pass/
+          audioEncoders << "copy"
       end
 
       #Mixdowns
       case audioTrack["AudioMixdown"]
-      when /Mono/
-        audioMixdowns << "mono"
-      when /Stereo/
-        audioMixdowns << "stereo"
-      when /Dolby Surround/
-        audioMixdowns << "dpl1"
-      when /Dolby Pro Logic II/
-        audioMixdowns << "dpl2"
-      when /discrete/
-        audioMixdowns << "6ch"
-      when /None/
-        audioMixdowns << "auto"
+        when /Mono/
+          audioMixdowns << "mono"
+        when /Stereo/
+          audioMixdowns << "stereo"
+        when /Dolby Surround/
+          audioMixdowns << "dpl1"
+        when /Dolby Pro Logic II/
+          audioMixdowns << "dpl2"
+        when /discrete/
+          audioMixdowns << "6ch"
+        when /None/
+          audioMixdowns << "auto"
       end
 
       #Samplerates
@@ -961,6 +1123,56 @@
     commandString << "\");\n    "
     commandString << "}\n    "
     
+    #Auto Passthru Mask
+    if hash["AudioAllowAACPass"]
+      commandString << "if( allowed_audio_copy == -1 )\n    "
+      commandString << "{\n    "
+      commandString << "    allowed_audio_copy = 0;\n    "
+      if hash["AudioAllowAACPass"].to_i == 1
+        commandString << "    allowed_audio_copy |= HB_ACODEC_AAC_PASS;\n    "
+      end
+      if hash["AudioAllowAC3Pass"].to_i == 1
+        commandString << "    allowed_audio_copy |= HB_ACODEC_AC3_PASS;\n    "
+      end
+      if hash["AudioAllowDTSHDPass"].to_i == 1
+        commandString << "    allowed_audio_copy |= HB_ACODEC_DCA_HD_PASS;\n    "
+      end
+      if hash["AudioAllowDTSPass"].to_i == 1
+        commandString << "    allowed_audio_copy |= HB_ACODEC_DCA_PASS;\n    "
+      end
+      if hash["AudioAllowMP3Pass"].to_i == 1
+        commandString << "    allowed_audio_copy |= HB_ACODEC_MP3_PASS;\n    "
+      end
+      commandString << "    allowed_audio_copy &= HB_ACODEC_PASS_MASK;\n    "
+      commandString << "}\n    "
+    end
+    
+    #Auto Passthru Fallback
+    audioEncoderFallback = ""
+    
+    case hash["AudioEncoderFallback"]
+      when /AC3/
+        audioEncoderFallback << "HB_ACODEC_AC3"
+      when "AAC (ffmpeg)"
+        audioEncoderFallback << "HB_ACODEC_FFAAC"
+      when /AAC/
+        audioEncoderFallback << "HB_ACODEC_FAAC"
+      when /Vorbis/
+        audioEncoderFallback << "HB_ACODEC_VORBIS"
+      when /MP3/
+        audioEncoderFallback << "HB_ACODEC_LAME"
+      when /FLAC/
+        audioEncoderFallback << "HB_ACODEC_FFFLAC"
+    end
+    
+    if audioEncoderFallback.size > 0
+      commandString << "if( !acodec_fallback )\n    "
+      commandString << "{\n    "
+      commandString << "    acodec_fallback = " << audioEncoderFallback
+      commandString << ";\n    "
+      commandString << "}\n    "
+    end
+    
     #Cropping
     if hash["PictureAutoCrop"] == 0
       commandString << "job->crop[0] = " << hash["PictureTopCrop"].to_s << ";\n    "
@@ -1028,13 +1240,23 @@
         commandString << "denoise_opt = \"7:7:5:5\";\n    "
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << "decomb = 1;\n    "
+        commandString << "decomb_opt = strdup(\"" << hash["PictureDecombCustom"].to_s << "\");\n    "
+      when 2
+        commandString << "decomb = 1;\n    "
+      when 3
+        commandString << "decomb = 1;\n    "
+        commandString << "decomb_opt = strdup(\"7:2:6:9:1:80\");\n    "
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << "detelecine = 1;\n    " end
       if hash["PictureDeblock"] != 0
         then
           commandString << "deblock = 1;\n    "
           commandString << "deblock_opt = \"" << hash["PictureDeblock"].to_s << "\";\n    "
         end
-      if hash["PictureDecomb"] == 2 then commandString << "decomb = 1;\n    " end
       
     end
     
@@ -1052,6 +1274,11 @@
       commandString << "}\n    "
     end
     
+    #Modulus
+    if hash["PictureModulus"]
+      commandString << "modulus = " << hash["PictureModulus"].to_s << ";\n    "
+    end
+    
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << "job->chapter_markers = 1;\n    " end
     if hash["VideoGrayScale"] == 1 then commandString << "job->grayscale = 1;\n    " end
@@ -1186,22 +1413,24 @@
           audioEncoders << "lame"
         when /FLAC/
           audioEncoders << "ffflac"
+        when /Auto Pass/
+          audioEncoders << "copy"
       end
       
       #Mixdowns
       case audioTrack["AudioMixdown"]
-      when /Mono/
-        audioMixdowns << "mono"
-      when /Stereo/
-        audioMixdowns << "stereo"
-      when /Dolby Surround/
-        audioMixdowns << "dpl1"
-      when /Dolby Pro Logic II/
-        audioMixdowns << "dpl2"
-      when /discrete/
-        audioMixdowns << "6ch"
-      when /None/
-        audioMixdowns << "auto"
+        when /Mono/
+          audioMixdowns << "mono"
+        when /Stereo/
+          audioMixdowns << "stereo"
+        when /Dolby Surround/
+          audioMixdowns << "dpl1"
+        when /Dolby Pro Logic II/
+          audioMixdowns << "dpl2"
+        when /discrete/
+          audioMixdowns << "6ch"
+        when /None/
+          audioMixdowns << "auto"
       end
       
       #Samplerates
@@ -1230,6 +1459,63 @@
     commandString << " -R " << audioSamplerates
     commandString << " -D " << audioTrackDRCs
     
+    #Auto Passthru Mask
+    audioCopyMask = ""
+    
+    if hash["AudioAllowAACPass"].to_i == 1
+      audioCopyMask << "aac"
+    end
+    if hash["AudioAllowAC3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "ac3"
+    end
+    if hash["AudioAllowDTSHDPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dtshd"
+    end
+    if hash["AudioAllowDTSPass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "dts"
+    end
+    if hash["AudioAllowMP3Pass"].to_i == 1
+      if audioCopyMask.size > 0
+        audioCopyMask << ","
+      end
+      audioCopyMask << "mp3"
+    end
+    
+    if audioCopyMask.size > 0
+      commandString << " --audio-copy-mask " << audioCopyMask
+    end
+    
+    #Auto Passthru Fallback
+    audioEncoderFallback = ""
+    
+    case hash["AudioEncoderFallback"]
+      when /AC3/
+        audioEncoderFallback << "ffac3"
+      when "AAC (ffmpeg)"
+        audioEncoderFallback << "ffaac"
+      when /AAC/
+        audioEncoderFallback << "faac"
+      when /Vorbis/
+        audioEncoderFallback << "vorbis"
+      when /MP3/
+        audioEncoderFallback << "lame"
+      when /FLAC/
+        audioEncoderFallback << "ffflac"
+    end
+    
+    if audioEncoderFallback.size > 0
+      commandString << " --audio-fallback " << audioEncoderFallback
+    end
+    
     #Container
     commandString << " -f "
     case hash["FileFormat"]
@@ -1249,6 +1535,11 @@
       commandString << " -4"
     end
     
+    #MP4 Optimize for HTTP Streaming
+    if hash["Mp4HttpOptimize"].to_i == 1
+      commandString << " -O"
+    end
+    
     #Cropping
     if hash["PictureAutoCrop"] == 0
       commandString << " --crop "
@@ -1304,9 +1595,18 @@
         commandString << " --denoise=\\\"strong\\\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
+      
     end
     
     #Anamorphic
@@ -1318,6 +1618,11 @@
       commandString << " --custom-anamorphic"
     end
     
+    #Modulus
+    if hash["PictureModulus"]
+      commandString << " --modulus " << hash["PictureModulus"].to_s
+    end
+    
     #Booleans
     if hash["ChapterMarkers"] == 1 then commandString << " -m" end
     if hash["VideoGrayScale"] == 1 then commandString << " -g" end

HandBrake-0.9.6.tar.bz2/test/test.c -> HandBrake-0.9.8.tar.bz2/test/test.c Changed

@@ -66,7 +66,7 @@
 static hb_list_t * audios = NULL;
 static hb_audio_config_t * audio = NULL;
 static int    num_audio_tracks = 0;
-static int    allowed_audio_copy = HB_ACODEC_PASS_MASK;
+static int    allowed_audio_copy = -1;
 static char * mixdowns    = NULL;
 static char * dynamic_range_compression = NULL;
 static char * audio_gain  = NULL;
@@ -902,7 +902,7 @@
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 1024;
+                    maxWidth = 1280;
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
@@ -1000,6 +1000,56 @@
                     job->chapter_markers = 1;
                     
                 }
+                
+                if (!strcmp(preset_name, "AppleTV 3"))
+                {
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->largeFileSize = 1;
+                    vcodec = HB_VCODEC_X264;
+                    job->vquality = 20.0;
+                    job->cfr = 2;
+                    if( !atracks )
+                    {
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,copy:ac3");
+                    }
+                    if( !abitrates )
+                    {
+                        abitrates = str_split("160,160", ',');
+                    }
+                    if( !mixdowns )
+                    {
+                        mixdowns = strdup("dpl2,auto");
+                    }
+                    if( !arates )
+                    {
+                        arates = strdup("Auto,Auto");
+                    }
+                    if( !dynamic_range_compression )
+                    {
+                        dynamic_range_compression = strdup("0.0,0.0");
+                    }
+                    maxWidth = 1920;
+                    if( !advanced_opts )
+                    {
+                        advanced_opts = strdup("b-adapt=2");
+                    }
+                    decomb = 1;
+                    decomb_opt = strdup("7:2:6:9:1:80");
+                    if( !anamorphic_mode )
+                    {
+                        anamorphic_mode = 2;
+                    }
+                    modulus = 2;
+                    job->chapter_markers = 1;
+                    
+                }
 
                 if (!strcmp(preset_name, "Android Mid"))
                 {
@@ -1170,7 +1220,6 @@
                     {
                         advanced_opts = strdup("b-adapt=2:rc-lookahead=50");
                     }
-                    detelecine = 1;
                     decomb = 1;
                     if( !anamorphic_mode )
                     {
@@ -2082,7 +2131,7 @@
                 if( audio->out.codec == HB_ACODEC_AUTO_PASS )
                 {
                     // Auto Passthru
-                    job->acodec_copy_mask = allowed_audio_copy;
+                    job->acodec_copy_mask = allowed_audio_copy == -1 ? HB_ACODEC_PASS_MASK : allowed_audio_copy;
                     job->acodec_fallback = acodec_fallback ? get_acodec_for_string( acodec_fallback ) : 0;
                     // sanitize the fallback; -1 isn't a valid HB_ACODEC_* value
                     if( job->acodec_fallback == -1 )
@@ -2920,7 +2969,7 @@
     "                            Separated by commas for more than one subtitle track.\n"
     "                            Example: \"1,2,3\" for multiple tracks.\n"
     "                            If \"string\" is omitted, the first track is forced.\n"
-    "        --subtitle-burn     \"Burn\" the selected subtitle into the video track\n"
+    "        --subtitle-burned   \"Burn\" the selected subtitle into the video track\n"
     "          <number>          If \"number\" is omitted, the first track is burned.\n"
     "                            \"number\" is an index into the subtitle list\n"
     "                            specified with '--subtitle'.\n"
@@ -2972,41 +3021,43 @@
     fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
     printf("\n< Devices\n");
-
+    
     printf("\n   + Universal:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6\n");
-
+    
     printf("\n   + iPod:  -e x264  -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
-
+    
     printf("\n   + iPhone & iPod Touch:  -e x264  -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-
+    
     printf("\n   + iPhone 4:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 960 --loose-anamorphic -m\n");
-
-    printf("\n   + iPad:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1024 --loose-anamorphic -m\n");
-
+    
+    printf("\n   + iPad:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
+    
     printf("\n   + AppleTV:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
-
+    
     printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
-
+    
+    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1920 --decomb=\"7:2:6:9:1:80\" --loose-anamorphic --modulus 2 -m -x b-adapt=2\n");
+    
     printf("\n   + Android Mid:  -e x264  -q 22.0 -r 29.97 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-
+    
     printf("\n   + Android High:  -e x264  -q 22.0 -r 29.97 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 720 --loose-anamorphic -x weightp=0:cabac=0\n");
-
+    
     printf("\n>\n");
-
+    
     printf("\n< Regular\n");
-
+    
     printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0\n");
-
-    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
-
+    
+    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
+    
     printf("\n>\n");
-
+    
     printf("\n< Legacy\n");
-
+    
     printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n");
-
+    
     printf("\n   + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n");
-
+    
     printf("\n>\n");
 
 }

HandBrake-0.9.6.tar.bz2/win/CS/Controls/AudioPanel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/Controls/AudioPanel.cs Changed

@@ -12,6 +12,7 @@
     using System.Collections.Specialized;
     using System.ComponentModel;
     using System.Drawing;
+    using System.Globalization;
     using System.Linq;
     using System.Windows.Forms;
 
@@ -366,7 +367,7 @@
                 case "drp_audioSample":
 
                     double samplerate;
-                    double.TryParse(drp_audioSample.Text, out samplerate);
+                    double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
                     track.SampleRate = samplerate;
                     break;
                 case "drp_audioBitrate":
@@ -443,7 +444,7 @@
             double samplerate;
 
             int.TryParse(drp_audioBitrate.Text, out bitrate);
-            double.TryParse(drp_audioSample.Text, out samplerate);
+            double.TryParse(drp_audioSample.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out samplerate);
 
             // Create the Model
             AudioTrack track = new AudioTrack
@@ -1005,6 +1006,7 @@
                 case "DTS-HD Passthru":
                 case "AAC Passthru":
                 case "MP3 Passthru":
+                case "Auto Passthru":
                     drp_audioMix.SelectedItem = None;
                     break;
             }

HandBrake-0.9.6.tar.bz2/win/CS/Functions/Main.cs -> HandBrake-0.9.8.tar.bz2/win/CS/Functions/Main.cs Changed

@@ -179,7 +179,6 @@
             {
                 // Get the Source Name and remove any invalid characters
                 string sourceName = Path.GetInvalidFileNameChars().Aggregate(mainWindow.SourceName, (current, character) => current.Replace(character.ToString(), string.Empty));
-                sourceName = Path.GetFileNameWithoutExtension(sourceName);
 
                 // Remove Underscores
                 if (UserSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore))
@@ -372,7 +371,7 @@
             }
             catch (Exception e)
             {
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, string.Empty);
+                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, 0);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, string.Empty);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, string.Empty);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, string.Empty);

HandBrake-0.9.6.tar.bz2/win/CS/Functions/QueryGenerator.cs -> HandBrake-0.9.8.tar.bz2/win/CS/Functions/QueryGenerator.cs Changed

@@ -238,7 +238,6 @@
                     query += string.Format(" --start-at frame:{0} --stop-at frame:{1}", mainWindow.drop_chapterStart.Text, calculatedDuration);
                     break;
                 case 3: // Preview
-                    query += " --previews " + UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount) + " ";
                     query += " --start-at-preview " + preview;
                     query += " --stop-at duration:" + duration + " ";
                     break;
@@ -493,7 +492,7 @@
                               : string.Format(",{0}", Converters.GetCliMixDown(audioTrack.MixDown));
 
                 // Audio Samplerates (-R)
-                string rate = audioTrack.SampleRate == 0 ? "Auto" : audioTrack.SampleRate.ToString(); // Default to "Auto"
+                string rate = audioTrack.SampleRate == 0 ? "Auto" : audioTrack.SampleRate.ToString(Culture); // Default to "Auto"
                 samplerates += string.IsNullOrEmpty(samplerates) ? rate : string.Format(",{0}", rate);
 
                 // Audio Bitrates (-B)
@@ -638,6 +637,12 @@
             if (UserSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav))
                 query += " --no-dvdnav";
 
+            if (UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount) != 10)
+            {
+                query += string.Format(
+                    " --previews {0} ", UserSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount));
+            }
+
             return query;
         }

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/EncodeTask.cs Changed

@@ -33,6 +33,96 @@
         }
 
         #region Source
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EncodeTask"/> class. 
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        public EncodeTask(EncodeTask task)
+        {
+            this.AdvancedEncoderOptions = task.AdvancedEncoderOptions;
+            this.AllowedPassthruOptions = new AllowedPassthru(task.AllowedPassthruOptions);
+            this.Anamorphic = task.Anamorphic;
+            this.Angle = task.Angle;
+
+            this.AudioTracks = new ObservableCollection<AudioTrack>();
+            foreach (AudioTrack track in task.AudioTracks)
+            {
+                this.AudioTracks.Add(new AudioTrack(track));
+            }
+
+
+            this.ChapterNames = new ObservableCollection<ChapterMarker>();
+            foreach (ChapterMarker track in task.ChapterNames)
+            {
+                this.ChapterNames.Add(new ChapterMarker(track));
+            }
+
+            this.ChapterMarkersFilePath = task.ChapterMarkersFilePath;
+            this.Cropping = new Cropping(task.Cropping);
+            this.CustomDecomb = task.CustomDecomb;
+            this.CustomDeinterlace = task.CustomDeinterlace;
+            this.CustomDenoise = task.CustomDenoise;
+            this.CustomDetelecine = task.CustomDetelecine;
+            this.Deblock = task.Deblock;
+            this.Decomb = task.Decomb;
+            this.Deinterlace = task.Deinterlace;
+            this.Denoise = task.Denoise;
+            this.Destination = task.Destination;
+            this.Detelecine = task.Detelecine;
+            this.DisableLibDvdNav = task.DisableLibDvdNav;
+            this.DisplayWidth = task.DisplayWidth;
+            this.EndPoint = task.EndPoint;
+            this.Framerate = task.Framerate;
+            this.FramerateMode = task.FramerateMode;
+            this.Grayscale = task.Grayscale;
+            this.HasCropping = task.HasCropping;
+            this.Height = task.Height;
+            this.IncludeChapterMarkers = task.IncludeChapterMarkers;
+            this.IPod5GSupport = task.IPod5GSupport;
+            this.KeepDisplayAspect = task.KeepDisplayAspect;
+            this.LargeFile = task.LargeFile;
+            this.MaxHeight = task.MaxHeight;
+            this.MaxWidth = task.MaxWidth;
+            this.Modulus = task.Modulus;
+            this.OptimizeMP4 = task.OptimizeMP4;
+            this.OutputFormat = task.OutputFormat;
+            this.PixelAspectX = task.PixelAspectX;
+            this.PixelAspectY = task.PixelAspectY;
+            this.PointToPointMode = task.PointToPointMode;
+            this.PresetBuildNumber = task.PresetBuildNumber;
+            this.PresetDescription = task.PresetDescription;
+            this.PresetName = task.PresetName;
+            this.Quality = task.Quality;
+            this.Source = task.Source;
+            this.StartPoint = task.StartPoint;
+
+            this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
+            foreach (SubtitleTrack subtitleTrack in task.SubtitleTracks)
+            {
+                this.SubtitleTracks.Add(new SubtitleTrack(subtitleTrack));
+            }
+
+            this.Title = task.Title;
+            this.TurboFirstPass = task.TurboFirstPass;
+            this.TwoPass = task.TwoPass;
+            this.Type = task.Type;
+            this.UsesMaxPictureSettings = task.UsesMaxPictureSettings;
+            this.UsesPictureFilters = task.UsesPictureFilters;
+            this.UsesPictureSettings = task.UsesPictureSettings;
+            this.Verbosity = task.Verbosity;
+            this.VideoBitrate = task.VideoBitrate;
+            this.VideoEncoder = task.VideoEncoder;
+            this.VideoEncodeRateType = task.VideoEncodeRateType;
+            this.Width = task.Width;
+            this.x264Preset = task.x264Preset;
+            this.x264Profile = task.x264Profile;
+            this.X264Tune = task.X264Tune;
+        }
+
         /// <summary>
         /// Gets or sets Source.
         /// </summary>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AllowedPassthru.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioTrack.cs Changed

@@ -11,6 +11,7 @@
 {
     using System;
     using System.ComponentModel;
+    using System.Globalization;
 
     using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Parsing;
@@ -83,6 +84,25 @@
             this.ScannedTrack = new Audio();
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AudioTrack"/> class.
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="track">
+        /// The track.
+        /// </param>
+        public AudioTrack(AudioTrack track)
+        {
+            this.bitrate = track.Bitrate;
+            this.drc = track.DRC;
+            this.encoder = track.Encoder;
+            this.gain = track.Gain;
+            this.mixDown = track.MixDown;
+            this.sampleRate = track.SampleRate;
+            this.scannedTrack = new Audio();
+            this.trackName = track.TrackName;
+        }
+
         #endregion
 
         #region Public Properties
@@ -241,7 +261,7 @@
         {
             get
             {
-                return this.SampleRate == 0 ? "Auto" : this.SampleRate.ToString();
+                return this.SampleRate == 0 ? "Auto" : this.SampleRate.ToString(CultureInfo.InvariantCulture);
             }
         }

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/ChapterMarker.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs Changed

@@ -28,8 +28,38 @@
 
         #endregion
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubtitleTrack"/> class.
+        /// </summary>
+        public SubtitleTrack()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SubtitleTrack"/> class.
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="subtitle">
+        /// The subtitle.
+        /// </param>
+        public SubtitleTrack(SubtitleTrack subtitle)
+        {
+            this.Burned = subtitle.Burned;
+            this.Default = subtitle.Default;
+            this.Forced = subtitle.Forced;
+            this.sourceTrack = subtitle.SourceTrack;
+            this.SrtCharCode = subtitle.SrtCharCode;
+            this.SrtFileName = subtitle.SrtFileName;
+            this.SrtLang = subtitle.SrtLang;
+            this.SrtOffset = subtitle.SrtOffset;
+            this.SrtPath = subtitle.SrtPath;
+            this.SubtitleType = subtitle.SubtitleType;
+            this.SourceTrack = subtitle.SourceTrack;
+        }
+
         #region Public Properties
 
+
         /// <summary>
         ///   Gets or sets a value indicating whether Burned.
         /// </summary>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/ScanService.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs Changed

@@ -3,6 +3,8 @@
     Homepage: <http://handbrake.fr>.
     It may be used under the terms of the GNU General Public License. */
 
+using System.Linq;
+
 namespace HandBrake.ApplicationServices.Services
 {
     using System;
@@ -123,6 +125,7 @@
         {
             try
             {
+                // Load up the users current settings file.
                 if (File.Exists(this.settingsFile))
                 {
                     using (StreamReader reader = new StreamReader(this.settingsFile))
@@ -131,13 +134,35 @@
                         this.userSettings = data;
                     }
                 }
+                else
+                {
+                    this.userSettings = new SerializableDictionary<string, object>();
+                }
+
+                // Add any missing / new settings
+                SerializableDictionary<string, object> defaults = this.GetDefaults();
+                foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))
+                {
+                    this.userSettings.Add(item.Key, item.Value);
+                    this.Save();
+                }
             }
             catch (Exception exc)
             {
-                throw new GeneralApplicationException(
-                    "HandBrake has detected corruption in the settings file. User settings will now be reset to defaults.",
-                    "Please restart HandBrake before continuing.",
-                    exc);
+                try
+                {
+                    this.userSettings = this.GetDefaults();
+                    if (File.Exists(this.settingsFile))
+                    {
+                        File.Delete(this.settingsFile);
+                    }
+                    this.Save();
+                }
+                catch (Exception)
+                {
+                }
+
+                throw;
             }
         }
 
@@ -158,62 +183,21 @@
         }
 
         /// <summary>
-        /// This is just a utility method for creating a defaults xml file. Don't use this!!!
+        /// Load Default Settings
         /// </summary>
-        private void SetAllDefaults()
+        /// <returns>
+        /// The get defaults.
+        /// </returns>
+        private SerializableDictionary<string, object> GetDefaults()
         {
-            userSettings = new SerializableDictionary<string, object>();
-            userSettings[ASUserSettingConstants.X264Step] = 0.25;
-            userSettings[ASUserSettingConstants.Verbosity] = 1;
-            userSettings[ASUserSettingConstants.WhenCompleteAction] = "Do Nothing";
-            userSettings[ASUserSettingConstants.GrowlEncode] = false;
-            userSettings[ASUserSettingConstants.GrowlQueue] = false;
-            userSettings[ASUserSettingConstants.ProcessPriority] = "Below Normal";
-            userSettings[ASUserSettingConstants.PreventSleep] = true;
-            userSettings[ASUserSettingConstants.ShowCLI] = false;
-            userSettings[ASUserSettingConstants.SaveLogToCopyDirectory] = false;
-            userSettings[ASUserSettingConstants.SaveLogWithVideo] = false;
-            userSettings[ASUserSettingConstants.DisableLibDvdNav] = false;
-            userSettings[ASUserSettingConstants.SendFile] = false;
-            userSettings[ASUserSettingConstants.MinScanDuration] = 10;
-            userSettings[ASUserSettingConstants.HandBrakeBuild] = 0;
-            userSettings[ASUserSettingConstants.HandBrakeVersion] = string.Empty;
-            userSettings["updateStatus"] = true;
-            userSettings["tooltipEnable"] = true;
-            userSettings["defaultPreset"] = string.Empty;
-            userSettings["skipversion"] = 0;
-            userSettings["autoNaming"] = true;
-            userSettings["autoNamePath"] = string.Empty;
-            userSettings["appcast_i686"] = "http://handbrake.fr/appcast.i386.xml";
-            userSettings["appcast_x64"] = "http://handbrake.fr/appcast_unstable.x86_64.xml";
-            userSettings["autoNameFormat"] = "{source}-{title}";
-            userSettings["VLC_Path"] = "C:\\Program Files\\VideoLAN\\vlc\\vlc.exe";
-            userSettings["MainWindowMinimize"] = true;
-            userSettings["QueryEditorTab"] = false;
-            userSettings["presetNotification"] = false;
-            userSettings["trayIconAlerts"] = true;
-            userSettings["lastUpdateCheckDate"] = DateTime.Today;
-            userSettings["daysBetweenUpdateCheck"] = 7;
-            userSettings["useM4v"] = 0;
-            userSettings["PromptOnUnmatchingQueries"] = true;
-            userSettings["NativeLanguage"] = "Any";
-            userSettings["DubMode"] = 255;
-            userSettings["HandBrakeExeHash"] = string.Empty;
-            userSettings["previewScanCount"] = 10;
-            userSettings["clearOldLogs"] = true;
-            userSettings["AutoNameTitleCase"] = true;
-            userSettings["AutoNameRemoveUnderscore"] = true;
-            userSettings["ActivityWindowLastMode"] = 0;
-            userSettings["useClosedCaption"] = false;
-            userSettings["batchMinDuration"] = "00:18:00";
-            userSettings["batchMaxDuration"] = "02:30:00";
-            userSettings["defaultPlayer"] = false;
-            userSettings["SelectedLanguages"] = new StringCollection();
-            userSettings["DubModeAudio"] = 0;
-            userSettings["DubModeSubtitle"] = 0;
-            userSettings["addOnlyOneAudioPerLanguage"] = true;
-            userSettings["MinTitleLength"] = 10;
-            userSettings["ShowAdvancedAudioPassthruOpts"] = false;
+            if (File.Exists("defaultsettings.xml"))
+            {
+                using (StreamReader reader = new StreamReader("defaultsettings.xml"))
+                {
+                    return (SerializableDictionary<string, object>)serializer.Deserialize(reader);
+                }
+            }
+            return new SerializableDictionary<string, object>();
         }
     }
 }

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs Changed

@@ -70,7 +70,7 @@
                             track.SampleRate = value == "Auto" ? 0 : double.Parse(value);
                             break;
                         case "AudioTrack":
-                           //track.SourceTrack = value;
+                            //track.SourceTrack = value;
                             break;
                         case "AudioTrackDRCSlider":
                             track.DRC = double.Parse(value);
@@ -97,7 +97,7 @@
 
                 switch (key)
                 {
-                        // Output Settings
+                    // Output Settings
                     case "FileFormat":
                         parsed.OutputFormat = Converters.GetFileFormat(value.Replace("file", string.Empty).Trim());
                         break;
@@ -105,13 +105,13 @@
                         parsed.OptimizeMP4 = value == "1";
                         break;
                     case "Mp4LargeFile":
-                        parsed.IPod5GSupport = value == "1";
+                        parsed.LargeFile = value == "1";
                         break;
                     case "Mp4iPodCompatible":
                         parsed.IPod5GSupport = value == "1";
                         break;
 
-                        // Picture Settings
+                    // Picture Settings
                     case "PictureAutoCrop":
                         parsed.HasCropping = value != "1";
                         break;
@@ -154,16 +154,23 @@
                         }
                         break;
 
-                        // Filters
+                    // Filters
                     case "PictureDeblock":
                         parsed.Deblock = int.Parse(value);
                         break;
                     case "PictureDecomb":
                         parsed.Decomb = Decomb.Off;
-                        // Don't place custom here as it's handled in the filter panel
-                        if (value == "2")
+                        switch (value)
                         {
-                            parsed.Decomb = Decomb.Default;
+                            case "1":
+                                parsed.Decomb = Decomb.Custom;
+                                break;
+                            case "2":
+                                parsed.Decomb = Decomb.Default;
+                                break;
+                            case "3":
+                                parsed.Decomb = Decomb.Fast;
+                                break;
                         }
                         break;
                     case "PictureDecombCustom":
@@ -181,7 +188,9 @@
                             case "0":
                                 parsed.Deinterlace = Deinterlace.Off;
                                 break;
-                                // Don't place custom here as it's handled in the filter panel
+                            case "1":
+                                parsed.Deinterlace = Deinterlace.Custom;
+                                break;
                             case "2":
                                 parsed.Deinterlace = Deinterlace.Fast;
                                 break;
@@ -205,7 +214,9 @@
                             case "0":
                                 parsed.Denoise = Denoise.Off;
                                 break;
-                                // Don't place custom here as it's handled in the filter panel
+                            case "1":
+                                parsed.Denoise = Denoise.Custom;
+                                break;
                             case "2":
                                 parsed.Denoise = Denoise.Weak;
                                 break;
@@ -228,6 +239,10 @@
                         parsed.Detelecine = Detelecine.Off;
                         if (value == "1")
                         {
+                            parsed.Detelecine = Detelecine.Custom;
+                        }
+                        if (value == "2")
+                        {
                             parsed.Detelecine = Detelecine.Default;
                         }
                         break;
@@ -238,7 +253,7 @@
                         }
                         break;
 
-                        // Video Tab
+                    // Video Tab
                     case "VideoAvgBitrate":
                         if (!string.IsNullOrEmpty(value))
                         {
@@ -292,17 +307,17 @@
                         parsed.TwoPass = value == "1";
                         break;
 
-                        // Chapter Markers Tab
+                    // Chapter Markers Tab
                     case "ChapterMarkers":
                         parsed.IncludeChapterMarkers = value == "1";
                         break;
 
-                        // Advanced x264 tab
+                    // Advanced x264 tab
                     case "x264Option":
                         parsed.AdvancedEncoderOptions = value;
                         break;
 
-                        // Preset Information
+                    // Preset Information
                     case "PresetBuildNumber":
                         parsed.PresetBuildNumber = int.Parse(value);
                         break;
@@ -371,11 +386,12 @@
                 if (!File.Exists(filename))
                     return null;
 
-                StreamReader sr = File.OpenText(filename);
                 string fromfile = string.Empty;
-                int fileChar;
-                while ((fileChar = sr.Read()) != -1)
-                    fromfile += Convert.ToChar(fileChar);
+                using (StreamReader sr = File.OpenText(filename))
+                {
+                    int fileChar;
+                    while ((fileChar = sr.Read()) != -1) fromfile += Convert.ToChar(fileChar);
+                }
 
                 XmlDocument doc = new XmlDocument();
                 doc.LoadXml(fromfile);
@@ -417,27 +433,28 @@
         public static void Export(string path, Preset preset)
         {
             EncodeTask parsed = QueryParserUtility.Parse(preset.Query);
-            XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented };
+            using (XmlTextWriter xmlWriter = new XmlTextWriter(path, Encoding.UTF8) { Formatting = Formatting.Indented })
+            {
+                // Header
+                xmlWriter.WriteStartDocument();
+                xmlWriter.WriteDocType(
+                    "plist", "-//Apple//DTD PLIST 1.0//EN", @"http://www.apple.com/DTDs/PropertyList-1.0.dtd", null);
 
-            // Header
-            xmlWriter.WriteStartDocument();
-            xmlWriter.WriteDocType("plist", "-//Apple//DTD PLIST 1.0//EN",
-                                @"http://www.apple.com/DTDs/PropertyList-1.0.dtd", null);
+                xmlWriter.WriteStartElement("plist");
+                xmlWriter.WriteStartElement("array");
 
-            xmlWriter.WriteStartElement("plist");
-            xmlWriter.WriteStartElement("array");
+                // Add New Preset Here. Can write multiple presets here if required in future.
+                WritePreset(xmlWriter, parsed, preset);
 
-            // Add New Preset Here. Can write multiple presets here if required in future.
-            WritePreset(xmlWriter, parsed, preset);
+                // Footer
+                xmlWriter.WriteEndElement();
+                xmlWriter.WriteEndElement();
 
-            // Footer
-            xmlWriter.WriteEndElement();
-            xmlWriter.WriteEndElement();
-
-            xmlWriter.WriteEndDocument();
+                xmlWriter.WriteEndDocument();
 
-            // Closeout
-            xmlWriter.Close();
+                // Closeout
+                xmlWriter.Close();
+            }
         }
 
         /// <summary>
@@ -502,11 +519,15 @@
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
                     break;
                 case Decomb.Default:
-                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "2");
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
                     break;
-                default:
-                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "2");
+                case Decomb.Fast:
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "3");
+                    AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", string.Empty);
+                    break;
+                case Decomb.Custom:
+                    AddEncodeElement(xmlWriter, "PictureDecomb", "integer", "1");
                     AddEncodeElement(xmlWriter, "PictureDecombCustom", "string", parsed.CustomDecomb);
                     break;
             }
@@ -519,19 +540,19 @@
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
                     break;
                 case Deinterlace.Fast:
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "2");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
                     break;
                 case Deinterlace.Slow:
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "2");
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "3");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
                     break;
                 case Deinterlace.Slower:
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "3");
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", string.Empty);
                     break;
-                default:
-                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "4");
+                case Deinterlace.Custom:
+                    AddEncodeElement(xmlWriter, "PictureDeinterlace", "integer", "1");
                     AddEncodeElement(xmlWriter, "PictureDeinterlaceCustom", "string", parsed.CustomDeinterlace);
                     break;
             }
@@ -543,24 +564,24 @@
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
                     break;
                 case Denoise.Weak:
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "1");
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "2");
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
                     break;
                 case Denoise.Medium:
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "2");
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "3");
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
                     break;
                 case Denoise.Strong:
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "3");
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "4");
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", string.Empty);
                     break;
-                default:
-                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "4");
+                case Denoise.Custom:
+                    AddEncodeElement(xmlWriter, "PictureDenoise", "integer", "1");
                     AddEncodeElement(xmlWriter, "PictureDenoiseCustom", "string", parsed.CustomDenoise);
                     break;
             }
 
-            int detelecine;
+            int detelecine = 0;
             switch (parsed.Detelecine)
             {
                 case Detelecine.Off:
@@ -569,7 +590,7 @@
                 case Detelecine.Default:
                     detelecine = 2;
                     break;
-                default:
+                case Detelecine.Custom:
                     detelecine = 1;
                     break;
             }
@@ -727,7 +748,7 @@
 
             xmlWriter.WriteElementString("key", "AudioTrackGainSlider");
             xmlWriter.WriteElementString("real", audioTrack.Gain.ToString());
-            
+
             xmlWriter.WriteEndElement();
         }
         #endregion

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrake.Interop/HandBrakeInterop/Model/Cropping.cs Changed

@@ -9,7 +9,10 @@
 
 namespace HandBrake.Interop.Model
 {
-	public class Cropping
+    /// <summary>
+    /// The Cropping Model
+    /// </summary>
+    public class Cropping
 	{
         /// <summary>
         /// Initializes a new instance of the <see cref="Cropping"/> class. 
@@ -19,6 +22,21 @@
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="Cropping"/> class.
+        /// Copy Constructor
+        /// </summary>
+        /// <param name="croping">
+        /// The croping.
+        /// </param>
+        public Cropping(Cropping croping)
+        {
+            this.Top = croping.Top;
+            this.Bottom = croping.Bottom;
+            this.Left = croping.Left;
+            this.Right = croping.Right;
+        }
+
+        /// <summary>
         /// Initializes a new instance of the <see cref="Cropping"/> class. 
         /// </summary>
         /// <param name="top">
@@ -41,12 +59,33 @@
             this.Right = right;
         }
 
-		public int Top { get; set; }
-		public int Bottom { get; set; }
-		public int Left { get; set; }
-		public int Right { get; set; }
+        /// <summary>
+        /// Gets or sets Top.
+        /// </summary>
+        public int Top { get; set; }
 
-		public Cropping Clone()
+        /// <summary>
+        /// Gets or sets Bottom.
+        /// </summary>
+        public int Bottom { get; set; }
+
+        /// <summary>
+        /// Gets or sets Left.
+        /// </summary>
+        public int Left { get; set; }
+
+        /// <summary>
+        /// Gets or sets Right.
+        /// </summary>
+        public int Right { get; set; }
+
+        /// <summary>
+        /// Clone this model
+        /// </summary>
+        /// <returns>
+        /// A Cloned copy
+        /// </returns>
+        public Cropping Clone()
 		{
 			return new Cropping
 			{

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeCS.csproj -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeCS.csproj Changed

@@ -48,10 +48,11 @@
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <DefineConstants>
-    </DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <Optimize>true</Optimize>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -62,7 +63,9 @@
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs Added

@@ -0,0 +1,155 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EnumComboConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the EnumComboConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters
+{
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Windows.Data;
+    using System;
+
+    using HandBrake.ApplicationServices.Functions;
+    using HandBrake.Interop.Model.Encoding;
+    using HandBrake.Interop.Model.Encoding.x264;
+
+    /// <summary>
+    /// Enum Combo Converter
+    /// </summary>
+    public sealed class EnumComboConverter : IValueConverter
+    {
+        /// <summary>
+        /// Convert an Enum to it's display value (attribute)
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter. (A boolean which inverts the output)
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Visibility property
+        /// </returns>
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Lists
+            if (value is IEnumerable<x264Preset>)
+            {
+                return EnumHelper<x264Preset>.GetEnumDisplayValues(typeof(x264Preset));
+            }
+            if (value is IEnumerable<x264Profile>)
+            {
+                return EnumHelper<x264Profile>.GetEnumDisplayValues(typeof(x264Profile));
+            }
+            if (value is IEnumerable<x264Tune>)
+            {
+                return EnumHelper<x264Tune>.GetEnumDisplayValues(typeof(x264Tune));
+            }
+            if (value is IEnumerable<VideoEncoder>)
+            {
+                return EnumHelper<VideoEncoder>.GetEnumDisplayValues(typeof(VideoEncoder));
+            }
+            if (value is IEnumerable<Mixdown>)
+            {
+                return EnumHelper<Mixdown>.GetEnumDisplayValues(typeof(Mixdown));
+            }
+
+            if (value is IEnumerable<AudioEncoder>)
+            {
+                return EnumHelper<AudioEncoder>.GetEnumDisplayValues(typeof(AudioEncoder));
+            }
+
+
+
+            // Single Items
+            if (targetType == typeof(x264Preset) || value.GetType() == typeof(x264Preset))
+            {
+                return EnumHelper<x264Preset>.GetDisplay((x264Preset)value);
+            }
+            if (targetType == typeof(x264Profile) || value.GetType() == typeof(x264Profile))
+            {
+                return EnumHelper<x264Profile>.GetDisplay((x264Profile)value);
+            }
+            if (targetType == typeof(x264Tune) || value.GetType() == typeof(x264Tune))
+            {
+                return EnumHelper<x264Tune>.GetDisplay((x264Tune)value);
+            }
+            if (targetType == typeof(VideoEncoder) || value.GetType() == typeof(VideoEncoder))
+            {
+                return EnumHelper<VideoEncoder>.GetDisplay((VideoEncoder)value);
+            }
+            if (targetType == typeof(Mixdown) || value.GetType() == typeof(Mixdown))
+            {
+                return EnumHelper<Mixdown>.GetDisplay((Mixdown)value);
+            }
+            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))
+            {
+                return EnumHelper<AudioEncoder>.GetDisplay((AudioEncoder)value);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Convert Back for the IValueConverter Interface. 
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="targetType">
+        /// The target type.
+        /// </param>
+        /// <param name="parameter">
+        /// The parameter.
+        /// </param>
+        /// <param name="culture">
+        /// The culture.
+        /// </param>
+        /// <returns>
+        /// Nothing
+        /// </returns>
+        /// <exception cref="NotImplementedException">
+        /// This method is not used!
+        /// </exception>
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (targetType == typeof(x264Preset) || value.GetType() == typeof(x264Preset))
+            {
+                return EnumHelper<x264Preset>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(x264Profile) || value.GetType() == typeof(x264Profile))
+            {
+                return EnumHelper<x264Profile>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(x264Tune) || value.GetType() == typeof(x264Tune))
+            {
+                return EnumHelper<x264Tune>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(VideoEncoder) || value.GetType() == typeof(VideoEncoder))
+            {
+                return EnumHelper<VideoEncoder>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(Mixdown) || value.GetType() == typeof(Mixdown))
+            {
+                return EnumHelper<Mixdown>.GetValue(value.ToString());
+            }
+            if (targetType == typeof(AudioEncoder) || value.GetType() == typeof(AudioEncoder))
+            {
+                return EnumHelper<AudioEncoder>.GetValue(value.ToString());
+            }
+
+            return null;
+        }
+    }
+}

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/HandBrakeWPF.csproj Changed

@@ -48,29 +48,24 @@
     <Reference Include="Castle.Windsor">
       <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging">
-      <HintPath>..\libraries\caliburn\Common.Logging.dll</HintPath>
-    </Reference>
     <Reference Include="EagleBoost.Wpf.Presentation">
       <HintPath>..\libraries\EagleBoost.Wpf.Presentation.dll</HintPath>
     </Reference>
+    <Reference Include="GongSolutions.Wpf.DragDrop">
+      <HintPath>..\libraries\WPFDragDrop\GongSolutions.Wpf.DragDrop.dll</HintPath>
+    </Reference>
     <Reference Include="Ookii.Dialogs.Wpf">
       <HintPath>..\libraries\OokiiDialogs\Ookii.Dialogs.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
-    <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\libraries\caliburn\System.Windows.Interactivity.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -84,7 +79,7 @@
     </ApplicationDefinition>
     <Compile Include="Converters\BooleanConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
-    <Compile Include="Converters\AudioEnumConverter.cs" />
+    <Compile Include="Converters\EnumComboConverter.cs" />
     <Compile Include="Converters\FullPathToFileNameConverter.cs" />
     <Compile Include="Helpers\AutoNameHelper.cs" />
     <Compile Include="Helpers\ListBoxHelper.cs" />
@@ -103,6 +98,7 @@
     <Compile Include="ViewModels\AddPresetViewModel.cs" />
     <Compile Include="ViewModels\AudioViewModel.cs" />
     <Compile Include="ViewModels\AdvancedViewModel.cs" />
+    <Compile Include="ViewModels\Interfaces\ITabInterface.cs" />
     <Compile Include="ViewModels\VideoViewModel.cs" />
     <Compile Include="ViewModels\FiltersViewModel.cs" />
     <Compile Include="ViewModels\Interfaces\IFiltersViewModel.cs" />

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AdvancedViewModel.cs Changed

@@ -9,13 +9,16 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System.Collections.Generic;
     using System.ComponentModel.Composition;
 
     using Caliburn.Micro;
 
+    using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.Interop.Model.Encoding;
     using HandBrake.Interop.Model.Encoding.x264;
 
     using HandBrakeWPF.ViewModels.Interfaces;
@@ -48,6 +51,11 @@
         /// </summary>
         private x264Tune x264Tune;
 
+        /// <summary>
+        /// Backing field used to display / hide the x264 options
+        /// </summary>
+        private bool displayX264Options;
+
         #endregion
 
         #region Constructors and Destructors
@@ -63,6 +71,13 @@
         /// </param>
         public AdvancedViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
         {
+            X264Presets = EnumHelper<x264Preset>.GetEnumList();
+            X264Profiles = EnumHelper<x264Profile>.GetEnumList();
+            X264Tunes = EnumHelper<x264Tune>.GetEnumList();
+
+            this.x264Preset = x264Preset.None;
+            this.x264Profile = x264Profile.None;
+            this.x264Tune = x264Tune.None;
         }
 
         #endregion
@@ -133,6 +148,37 @@
             }
         }
 
+        /// <summary>
+        /// Gets or sets X264Presets.
+        /// </summary>
+        public IEnumerable<x264Preset> X264Presets { get; set; }
+
+        /// <summary>
+        /// Gets or sets X264Profiles.
+        /// </summary>
+        public IEnumerable<x264Profile> X264Profiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets X264Tunes.
+        /// </summary>
+        public IEnumerable<x264Tune> X264Tunes { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether DisplayX264Options.
+        /// </summary>
+        public bool DisplayX264Options
+        {
+            get
+            {
+                return this.displayX264Options;
+            }
+            set
+            {
+                this.displayX264Options = value;
+                this.NotifyOfPropertyChange(() => this.DisplayX264Options);
+            }
+        }
+
         #endregion
 
         #region Public Methods
@@ -157,6 +203,46 @@
             this.X264Tune = preset.Task.X264Tune;
         }
 
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        public void SetPreset(Preset preset)
+        {
+            if (preset != null && preset.Task != null)
+            {
+                this.Query = preset.Task.AdvancedEncoderOptions;
+                this.SetEncoder(preset.Task.VideoEncoder);
+
+                this.X264Preset = preset.Task.x264Preset;
+                this.X264Profile = preset.Task.x264Profile;
+                this.X264Tune = preset.Task.X264Tune;
+            }
+        }
+
+        /// <summary>
+        /// Set the currently selected encoder.
+        /// </summary>
+        /// <param name="encoder">
+        /// The Video Encoder.
+        /// </param>
+        public void SetEncoder(VideoEncoder encoder)
+        {
+            if (encoder == VideoEncoder.X264)
+            {
+                this.DisplayX264Options = true;
+            }
+            else
+            {
+                this.x264Preset = x264Preset.None;
+                this.x264Profile = x264Profile.None;
+                this.x264Tune = x264Tune.None;
+                this.DisplayX264Options = false;
+            }
+        }
+
         #endregion
     }
 }
\ No newline at end of file

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs Changed

@@ -123,6 +123,46 @@
         }
 
         /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        public void SetPreset(Preset preset)
+        {
+            if (preset != null && preset.Task != null)
+            {   
+                // Store the previously selected tracks
+                List<Audio> selectedTracks = this.AudioTracks.Select(track => track.ScannedTrack).ToList();
+                this.AudioTracks.Clear();
+                
+                // Add the tracks from the preset
+                foreach (AudioTrack track in preset.Task.AudioTracks)
+                {
+                    this.AudioTracks.Add(new AudioTrack(track));
+                }
+
+                // Attempt to restore the previously selected tracks.
+                // or fallback to the first source track.
+                foreach (AudioTrack track in this.AudioTracks)
+                {
+                    if (selectedTracks.Count != 0)
+                    {
+                        track.ScannedTrack = selectedTracks[0];
+                        selectedTracks.RemoveAt(0);
+                    } 
+                    else
+                    {
+                        if (this.SourceTracks != null)
+                        {
+                            track.ScannedTrack = this.SourceTracks.FirstOrDefault();
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
         /// Get Appropiate Bitrates for the selected encoder and mixdown.
         /// </summary>
         /// <param name="encoder">

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs Changed

@@ -217,6 +217,16 @@
         }
 
         /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        public void SetPreset(Preset preset)
+        {
+        }
+
+        /// <summary>
         /// Set the Source Chapters List
         /// </summary>
         /// <param name="sourceChapters">
@@ -229,10 +239,15 @@
             this.Chapters.Clear();
 
             // Then Add new Chapter Markers.
+            int counter = 1;
+
             foreach (Chapter chapter in this.SourceChapterList)
             {
-                var marker = new ChapterMarker(chapter.ChapterNumber, chapter.ChapterName);
+                string chapterName = string.IsNullOrEmpty(chapter.ChapterName) ? string.Format("Chapter {0}", counter) : chapter.ChapterName;
+                var marker = new ChapterMarker(chapter.ChapterNumber, chapterName);
                 this.Chapters.Add(marker);
+
+                counter += 1;
             }
         }

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAdvancedViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAdvancedViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IChaptersViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IChaptersViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IFiltersViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IFiltersViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPictureSettingsViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPictureSettingsViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs Changed

HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/ITabInterface.cs Added

@@ -0,0 +1,42 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ITabInterface.cs" company="HandBrake Project (http://handbrake.fr)">
+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+//   Defines the ITabInterface type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels.Interfaces
+{
+    using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Parsing;
+
+    /// <summary>
+    /// Common interface for all the main tab panels
+    /// </summary>
+    public interface ITabInterface
+    {
+        /// <summary>
+        /// Setup the window after a scan.
+        /// </summary>
+        /// <param name="selectedTitle">
+        /// The selected title.
+        /// </param>
+        /// <param name="currentPreset">
+        /// The Current preset
+        /// </param>
+        /// <param name="task">
+        /// The task.
+        /// </param>
+        void SetSource(Title selectedTitle, Preset currentPreset, EncodeTask task);
+
+        /// <summary>
+        /// Set the selected preset
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        void SetPreset(Preset preset);
+    }
+}

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IVideoViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/Interfaces/IVideoViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs Changed

@@ -168,7 +168,6 @@
             this.WindowTitle = "HandBrake WPF Test Application";
             this.CurrentTask = new EncodeTask();
             this.ScannedSource = new Source();
-            this.SelectedPreset = this.presetService.DefaultPreset;
 
             // Setup Events
             this.scanService.ScanStared += this.ScanStared;
@@ -283,7 +282,19 @@
             set
             {
                 this.selectedPreset = value;
-                this.NotifyOfPropertyChange("SelectedPreset");
+
+                if (this.SelectedPreset != null)
+                {
+                    this.PictureSettingsViewModel.SetPreset(this.SelectedPreset);
+                    this.VideoViewModel.SetPreset(this.SelectedPreset);
+                    this.FiltersViewModel.SetPreset(this.SelectedPreset);
+                    this.AudioViewModel.SetPreset(this.SelectedPreset);
+                    this.SubtitleViewModel.SetPreset(this.SelectedPreset);
+                    this.ChaptersViewModel.SetPreset(this.SelectedPreset);
+                    this.AdvancedViewModel.SetPreset(this.SelectedPreset);
+                }
+
+                this.NotifyOfPropertyChange(() => this.SelectedPreset);
             }
         }
 
@@ -523,6 +534,8 @@
                     this.CurrentTask.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName);
                     this.NotifyOfPropertyChange("CurrentTask");
 
+                    this.Duration = selectedTitle.Duration.ToString();
+
                     // Setup the tab controls
                     this.SetupTabs();
                 }
@@ -557,7 +570,8 @@
             set
             {
                 this.CurrentTask.StartPoint = value;
-                this.NotifyOfPropertyChange("SelectedStartPoint");
+                this.NotifyOfPropertyChange(() => this.SelectedStartPoint);
+                this.Duration = this.DurationCalculation();
             }
         }
 
@@ -573,7 +587,8 @@
             set
             {
                 this.CurrentTask.EndPoint = value;
-                this.NotifyOfPropertyChange("SelectedEndPoint");
+                this.NotifyOfPropertyChange(() => this.SelectedEndPoint);
+                this.Duration = this.DurationCalculation();
             }
         }
 
@@ -611,7 +626,6 @@
             }
         }
 
-
         #endregion
 
         #region Load and Shutdown Handling
@@ -620,7 +634,7 @@
         /// </summary>
         public override void OnLoad()
         {
-            // TODO
+            this.SelectedPreset = this.presetService.DefaultPreset;
         }
 
         /// <summary>
@@ -1088,6 +1102,30 @@
             }
         }
 
+        /// <summary>
+        /// Calculate the duration between the end and start point
+        /// </summary>
+        /// <returns>
+        /// The duration calculation.
+        /// </returns>
+        private string DurationCalculation()
+        {
+            double startEndDuration = this.SelectedEndPoint - this.SelectedStartPoint;
+            switch (this.SelectedPointToPoint)
+            {
+                case PointToPointMode.Chapters:
+                    return this.SelectedTitle.CalculateDuration(this.SelectedStartPoint, this.SelectedEndPoint).ToString();
+                    break;
+                case PointToPointMode.Seconds:
+                    return TimeSpan.FromSeconds(startEndDuration).ToString();
+                case PointToPointMode.Frames:
+                    startEndDuration = startEndDuration / selectedTitle.Fps;
+                    return TimeSpan.FromSeconds(startEndDuration).ToString();
+            }
+
+            return "--:--:--";
+        }
+
         #endregion
 
         #region Event Handlers

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs Changed

@@ -39,81 +39,16 @@
         #region Backing Fields
 
         /// <summary>
-        /// The crop bottom.
-        /// </summary>
-        private int cropBottom;
-
-        /// <summary>
-        /// The crop left.
-        /// </summary>
-        private int cropLeft;
-
-        /// <summary>
-        /// The crop right.
-        /// </summary>
-        private int cropRight;
-
-        /// <summary>
-        /// The crop top.
-        /// </summary>
-        private int cropTop;
-
-        /// <summary>
         /// The display size.
         /// </summary>
         private string displaySize;
 
         /// <summary>
-        /// The display width.
-        /// </summary>
-        private int displayWidth;
-
-        /// <summary>
-        /// The height.
-        /// </summary>
-        private int height;
-
-        /// <summary>
-        /// The is custom crop.
-        /// </summary>
-        private bool isCustomCrop;
-
-        /// <summary>
-        /// The maintain aspect ratio.
-        /// </summary>
-        private bool maintainAspectRatio;
-
-        /// <summary>
-        /// The par height.
-        /// </summary>
-        private int parHeight;
-
-        /// <summary>
-        /// The par width.
-        /// </summary>
-        private int parWidth;
-
-        /// <summary>
-        /// The selected anamorphic mode.
-        /// </summary>
-        private Anamorphic selectedAnamorphicMode;
-
-        /// <summary>
-        /// The selected modulus
-        /// </summary>
-        private int selectedModulus;
-
-        /// <summary>
         /// The source info.
         /// </summary>
         private string sourceInfo;
 
         /// <summary>
-        /// The width.
-        /// </summary>
-        private int width;
-
-        /// <summary>
         ///  Backing field for show custom anamorphic controls
         /// </summary>
         private bool showCustomAnamorphicControls;
@@ -137,9 +72,6 @@
         /// </summary>
         private Size sourceResolution;
 
-        /// <summary>
-        /// Source Aspect Ratio
-        /// </summary>
         private double sourceAspectRatio;
 
         /// <summary>
@@ -161,6 +93,7 @@
         /// </param>
         public PictureSettingsViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
         {
+            this.Task = new EncodeTask();
             this.SelectedModulus = 16;
             this.MaintainAspectRatio = true;
         }
@@ -170,6 +103,11 @@
         #region Public Properties
 
         /// <summary>
+        /// Gets or sets Task.
+        /// </summary>
+        public EncodeTask Task { get; set; }
+
+        /// <summary>
         /// Gets AnamorphicModes.
         /// </summary>
         public IEnumerable<Anamorphic> AnamorphicModes
@@ -187,11 +125,11 @@
         {
             get
             {
-                return this.cropBottom;
+                return this.Task.Cropping.Bottom;
             }
             set
             {
-                this.cropBottom = this.CorrectForModulus(this.cropBottom, value);
+                this.Task.Cropping.Bottom = this.CorrectForModulus(this.Task.Cropping.Bottom, value);
                 this.NotifyOfPropertyChange(() => this.CropBottom);
             }
         }
@@ -203,11 +141,11 @@
         {
             get
             {
-                return this.cropLeft;
+                return this.Task.Cropping.Left;
             }
             set
             {
-                this.cropLeft = this.CorrectForModulus(this.cropLeft, value);
+                this.Task.Cropping.Left = this.CorrectForModulus(this.Task.Cropping.Left, value);
                 this.NotifyOfPropertyChange(() => this.CropLeft);
             }
         }
@@ -219,11 +157,11 @@
         {
             get
             {
-                return this.cropRight;
+                return this.Task.Cropping.Right;
             }
             set
             {
-                this.cropRight = this.CorrectForModulus(this.cropRight, value);
+                this.Task.Cropping.Right = this.CorrectForModulus(this.Task.Cropping.Right, value);
                 this.NotifyOfPropertyChange(() => this.CropRight);
             }
         }
@@ -235,11 +173,12 @@
         {
             get
             {
-                return this.cropTop;
+                return this.Task.Cropping.Top;
             }
+
             set
             {
-                this.cropTop = this.CorrectForModulus(this.cropTop, value);
+                this.Task.Cropping.Top = this.CorrectForModulus(this.Task.Cropping.Top, value);
                 this.NotifyOfPropertyChange(() => this.CropTop);
             }
         }
@@ -267,11 +206,11 @@
         {
             get
             {
-                return this.displayWidth;
+                return this.Task.DisplayWidth.HasValue ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString()) : 0;
             }
             set
             {
-                this.displayWidth = value;
+                this.Task.DisplayWidth = value;
                 this.CustomAnamorphicAdjust();
                 this.NotifyOfPropertyChange(() => this.DisplayWidth);
             }
@@ -284,11 +223,11 @@
         {
             get
             {
-                return this.isCustomCrop;
+                return this.Task.HasCropping;
             }
             set
             {
-                this.isCustomCrop = value;
+                this.Task.HasCropping = value;
                 this.NotifyOfPropertyChange(() => this.IsCustomCrop);
             }
         }
@@ -300,11 +239,11 @@
         {
             get
             {
-                return this.maintainAspectRatio;
+                return this.Task.KeepDisplayAspect;
             }
             set
             {
-                this.maintainAspectRatio = value;
+                this.Task.KeepDisplayAspect = value;
                 this.WidthAdjust();
                 this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
             }
@@ -328,11 +267,11 @@
         {
             get
             {
-                return this.parHeight;
+                return this.Task.PixelAspectY;
             }
             set
             {
-                this.parHeight = value;
+                this.Task.PixelAspectY = value;
                 this.CustomAnamorphicAdjust();
                 this.NotifyOfPropertyChange(() => this.ParHeight);
             }
@@ -345,11 +284,11 @@
         {
             get
             {
-                return this.parWidth;
+                return this.Task.PixelAspectX;
             }
             set
             {
-                this.parWidth = value;
+                this.Task.PixelAspectX = value;
                 this.CustomAnamorphicAdjust();
                 this.NotifyOfPropertyChange(() => this.ParWidth);
             }
@@ -362,11 +301,11 @@
         {
             get
             {
-                return this.selectedAnamorphicMode;
+                return this.Task.Anamorphic;
             }
             set
             {
-                this.selectedAnamorphicMode = value;
+                this.Task.Anamorphic = value;
                 this.AnamorphicAdjust();
                 this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
             }
@@ -375,15 +314,15 @@
         /// <summary>
         /// Gets or sets SelectedModulus.
         /// </summary>
-        public int SelectedModulus
+        public int? SelectedModulus
         {
             get
             {
-                return this.selectedModulus;
+                return this.Task.Modulus;
             }
             set
             {
-                this.selectedModulus = value;
+                this.Task.Modulus = value;
                 this.ModulusAdjust();
                 this.NotifyOfPropertyChange(() => this.SelectedModulus);
             }
@@ -412,11 +351,12 @@
         {
             get
             {
-                return this.width;
+                return this.Task.Width.HasValue ? this.Task.Width.Value : 0;
             }
+
             set
             {
-                this.width = value;
+                this.Task.Width = value;
                 this.WidthAdjust();
                 this.NotifyOfPropertyChange(() => this.Width);
             }
@@ -429,11 +369,11 @@
         {
             get
             {
-                return this.height;
+                return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
             }
             set
             {
-                this.height = value;
+                this.Task.Height = value;
                 this.HeightAdjust();
                 this.NotifyOfPropertyChange(() => this.Height);
             }
@@ -525,6 +465,49 @@
                 this.MaintainAspectRatio = true;
             }
         }
+
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        public void SetPreset(Preset preset)
+        {
+            // TODO: These all need to be handled correctly.
+
+            if (Task.UsesMaxPictureSettings)
+            {
+                this.Task.MaxWidth = preset.Task.MaxWidth;
+                this.Task.MaxHeight = preset.Task.MaxHeight;
+                this.Task.Width = preset.Task.MaxWidth ?? 0;
+                this.Task.Height = preset.Task.MaxHeight ?? 0;
+            }
+            else
+            {
+                this.Task.Width = preset.Task.Width ?? 0;
+                this.Task.Height = preset.Task.Height ?? 0;
+            }
+
+            if (Task.Anamorphic == Anamorphic.Custom)
+            {
+                this.Task.DisplayWidth = preset.Task.DisplayWidth ?? 0;
+                this.Task.PixelAspectX = preset.Task.PixelAspectX;
+                this.Task.PixelAspectY = preset.Task.PixelAspectY;
+            }
+
+            this.Task.KeepDisplayAspect = preset.Task.KeepDisplayAspect;
+
+            if (this.Task.Modulus.HasValue)
+            {
+                this.Task.Modulus = preset.Task.Modulus;
+            }
+
+            if (preset.Task.HasCropping)
+            {
+                this.Task.Cropping = preset.Task.Cropping;
+            }
+        }
         #endregion
 
         /// <summary>
@@ -532,9 +515,10 @@
         /// </summary>
         private void WidthAdjust()
         {
-            if (this.width > this.sourceResolution.Width)
+            if (this.Width > this.sourceResolution.Width)
             {
-                this.width = this.sourceResolution.Width;
+                this.Task.Width = this.sourceResolution.Width;
+                this.NotifyOfPropertyChange(() => this.Task.Width);
             }
 
             switch (SelectedAnamorphicMode)
@@ -551,22 +535,22 @@
                         double newHeight = ((double)this.Width * this.sourceResolution.Width * SourceAspect.Height * crop_height) /
                                            (this.sourceResolution.Height * SourceAspect.Width * crop_width);
 
-                        this.height = (int)Math.Round(GetModulusValue(newHeight), 0);
+                        this.Task.Height = (int)Math.Round(GetModulusValue(newHeight), 0);
                         this.NotifyOfPropertyChange("Height");
                     }
                     break;
                 case Anamorphic.Strict:
-                    this.width = 0;
-                    this.height = 0;
+                    this.Task.Width = 0;
+                    this.Task.Height = 0;
 
-                    this.NotifyOfPropertyChange("Width");
-                    this.NotifyOfPropertyChange("Height");
+                    this.NotifyOfPropertyChange(() => this.Task.Width);
+                    this.NotifyOfPropertyChange(() => this.Task.Height);
                     this.SetDisplaySize();
                     break;
                 case Anamorphic.Loose:
-                    this.height = 0;
-                    this.NotifyOfPropertyChange("Width");
-                    this.NotifyOfPropertyChange("Height");
+                    this.Task.Height = 0;
+                    this.NotifyOfPropertyChange(() => this.Task.Width);
+                    this.NotifyOfPropertyChange(() => this.Task.Height);
                     this.SetDisplaySize();
                     break;
                 case Anamorphic.Custom:
@@ -580,9 +564,10 @@
         /// </summary>
         private void HeightAdjust()
         {
-            if (this.height > this.sourceResolution.Height)
+            if (this.Height > this.sourceResolution.Height)
             {
-                this.height = this.sourceResolution.Height;
+                this.Task.Height = this.sourceResolution.Height;
+                this.NotifyOfPropertyChange(() => this.Task.Height);
             }
 
             switch (SelectedAnamorphicMode)
@@ -596,8 +581,8 @@
                         double new_width = ((double)this.Height * this.sourceResolution.Height * SourceAspect.Width * crop_width) /
                                            (this.sourceResolution.Width * SourceAspect.Height * crop_height);
 
-                        this.Width = (int)Math.Round(GetModulusValue(new_width), 0);
-                        this.NotifyOfPropertyChange("Width");
+                        this.Task.Width = (int)Math.Round(GetModulusValue(new_width), 0);
+                        this.NotifyOfPropertyChange(() => this.Task.Width);
                     }
                     break;
                 case Anamorphic.Custom:
@@ -647,8 +632,8 @@
                     this.HeightControlEnabled = false;
                     this.ShowCustomAnamorphicControls = false;
 
-                    this.width = 0;
-                    this.height = 0;
+                    this.Width = 0;
+                    this.Height = 0;
                     this.NotifyOfPropertyChange(() => Width);
                     this.NotifyOfPropertyChange(() => Height);
                     this.SetDisplaySize();
@@ -659,8 +644,8 @@
                     this.HeightControlEnabled = false;
                     this.ShowCustomAnamorphicControls = false;
 
-                    this.width = this.sourceResolution.Width;
-                    this.height = 0;
+                    this.Width = this.sourceResolution.Width;
+                    this.Height = 0;
                     this.NotifyOfPropertyChange(() => Width);
                     this.NotifyOfPropertyChange(() => Height);
                     this.SetDisplaySize();
@@ -671,14 +656,14 @@
                     this.HeightControlEnabled = true;
                     this.ShowCustomAnamorphicControls = true;
 
-                    this.width = this.sourceResolution.Width;
-                    this.height = 0;
+                    this.Width = this.sourceResolution.Width;
+                    this.Height = 0;
                     this.NotifyOfPropertyChange(() => Width);
                     this.NotifyOfPropertyChange(() => Height);
 
-                    this.displayWidth = this.CalculateAnamorphicSizes().Width;
-                    this.parWidth = this.sourceParValues.Width;
-                    this.parHeight = this.sourceParValues.Height;
+                    this.DisplayWidth = this.CalculateAnamorphicSizes().Width;
+                    this.ParWidth = this.sourceParValues.Width;
+                    this.ParHeight = this.sourceParValues.Height;
                     this.NotifyOfPropertyChange(() => ParHeight);
                     this.NotifyOfPropertyChange(() => ParWidth);
                     this.NotifyOfPropertyChange(() => DisplayWidth);
@@ -798,12 +783,17 @@
         /// </returns>
         private double GetModulusValue(double value)
         {
-            double remainder = value % this.SelectedModulus;
+            if (this.SelectedModulus == null)
+            {
+                return 0;
+            }
+
+            double remainder = value % this.SelectedModulus.Value;
 
             if (remainder == 0)
                 return value;
 
-            return remainder >= ((double)this.SelectedModulus / 2) ? value + (this.SelectedModulus - remainder) : value - remainder;
+            return remainder >= ((double)this.SelectedModulus.Value / 2) ? value + (this.SelectedModulus.Value - remainder) : value - remainder;
         }
 
         /// <summary>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs Changed

@@ -9,13 +9,16 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System;
     using System.Collections.Generic;
     using System.ComponentModel.Composition;
 
     using Caliburn.Micro;
 
+    using HandBrake.ApplicationServices;
     using HandBrake.ApplicationServices.Functions;
     using HandBrake.ApplicationServices.Model;
+    using HandBrake.ApplicationServices.Model.Encoding;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.Interop.Model.Encoding;
@@ -29,41 +32,10 @@
     public class VideoViewModel : ViewModelBase, IVideoViewModel
     {
         #region Constants and Fields
-
-        /// <summary>
-        /// The average bitrate.
-        /// </summary>
-        private int averageBitrate;
-
-        /// <summary>
-        /// The is constant framerate.
-        /// </summary>
-        private bool isConstantFramerate;
-
         /// <summary>
-        /// The is constant quantity.
+        /// Backing field for the user setting service.
         /// </summary>
-        private bool isConstantQuantity;
-
-        /// <summary>
-        /// The is peak framerate.
-        /// </summary>
-        private bool isPeakFramerate;
-
-        /// <summary>
-        /// The is turbo first pass.
-        /// </summary>
-        private bool isTurboFirstPass;
-
-        /// <summary>
-        /// The is two pass.
-        /// </summary>
-        private bool isTwoPass;
-
-        /// <summary>
-        /// The is variable framerate.
-        /// </summary>
-        private bool isVariableFramerate;
+        private IUserSettingService userSettingService;
 
         /// <summary>
         /// The quality max.
@@ -76,24 +48,14 @@
         private int qualityMin;
 
         /// <summary>
-        /// The rf.
-        /// </summary>
-        private int rf;
-
-        /// <summary>
-        /// The selected framerate.
-        /// </summary>
-        private double? selectedFramerate;
-
-        /// <summary>
-        /// The selected video encoder.
+        /// The show peak framerate.
         /// </summary>
-        private VideoEncoder selectedVideoEncoder;
+        private bool showPeakFramerate;
 
         /// <summary>
         /// The show peak framerate.
         /// </summary>
-        private bool showPeakFramerate;
+        private int rf;
 
         #endregion
 
@@ -110,9 +72,12 @@
         /// </param>
         public VideoViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
         {
+            this.Task = new EncodeTask { VideoEncoder = VideoEncoder.X264 };
+            this.userSettingService = userSettingService;
             this.QualityMin = 0;
             this.QualityMax = 51;
             this.IsConstantQuantity = true;
+            this.VideoEncoders = EnumHelper<VideoEncoder>.GetEnumList();
         }
 
         #endregion
@@ -120,23 +85,9 @@
         #region Public Properties
 
         /// <summary>
-        /// Gets or sets AverageBitrate.
+        /// Gets or sets the current Encode Task.
         /// </summary>
-        public string AverageBitrate
-        {
-            get
-            {
-                return this.averageBitrate.ToString();
-            }
-            set
-            {
-                if (value != null)
-                {
-                    this.averageBitrate = int.Parse(value);
-                }
-                this.NotifyOfPropertyChange(() => this.AverageBitrate);
-            }
-        }
+        public EncodeTask Task { get; set; }
 
         /// <summary>
         /// Gets Framerates.
@@ -156,13 +107,13 @@
         {
             get
             {
-                return this.isConstantFramerate;
+                return this.Task.FramerateMode == FramerateMode.CFR;
             }
             set
             {
-                this.isConstantFramerate = value;
                 if (value)
                 {
+                    this.Task.FramerateMode = FramerateMode.CFR;
                     this.IsVariableFramerate = false;
                     this.IsPeakFramerate = false;
                 }
@@ -178,11 +129,23 @@
         {
             get
             {
-                return this.isConstantQuantity;
+                return this.Task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality;
             }
             set
             {
-                this.isConstantQuantity = value;
+                if (value)
+                {
+                    this.Task.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;
+                    this.Task.TwoPass = false;
+                    this.Task.TurboFirstPass = false;
+                    this.Task.VideoBitrate = null;
+                    this.NotifyOfPropertyChange(() => this.Task);
+                }
+                else
+                {
+                    this.Task.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
+                }
+
                 this.NotifyOfPropertyChange(() => this.IsConstantQuantity);
             }
         }
@@ -194,13 +157,13 @@
         {
             get
             {
-                return this.isPeakFramerate;
+                return this.Task.FramerateMode == FramerateMode.PFR;
             }
             set
             {
-                this.isPeakFramerate = value;
                 if (value)
                 {
+                    this.Task.FramerateMode = FramerateMode.PFR;
                     this.IsVariableFramerate = false;
                     this.IsConstantFramerate = false;
                 }
@@ -210,53 +173,21 @@
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether IsTurboFirstPass.
-        /// </summary>
-        public bool IsTurboFirstPass
-        {
-            get
-            {
-                return this.isTurboFirstPass;
-            }
-            set
-            {
-                this.isTurboFirstPass = value;
-                this.NotifyOfPropertyChange(() => this.IsTurboFirstPass);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether IsTwoPass.
-        /// </summary>
-        public bool IsTwoPass
-        {
-            get
-            {
-                return this.isTwoPass;
-            }
-            set
-            {
-                this.isTwoPass = value;
-                this.NotifyOfPropertyChange(() => this.IsTwoPass);
-            }
-        }
-
-        /// <summary>
         /// Gets or sets a value indicating whether IsVariableFramerate.
         /// </summary>
         public bool IsVariableFramerate
         {
             get
             {
-                return this.isVariableFramerate;
+                return this.Task.FramerateMode == FramerateMode.VFR;
             }
             set
             {
-                this.isVariableFramerate = value;
                 if (value)
                 {
                     this.IsPeakFramerate = false;
                     this.IsConstantFramerate = false;
+                    this.Task.FramerateMode = FramerateMode.VFR;
                 }
 
                 this.NotifyOfPropertyChange(() => this.IsVariableFramerate);
@@ -302,12 +233,44 @@
         {
             get
             {
-                return this.rf;
+                return rf;
             }
             set
             {
                 this.rf = value;
+
+                double cqStep = userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step);
+                switch (this.SelectedVideoEncoder)
+                {
+                    case VideoEncoder.FFMpeg:
+                    case VideoEncoder.FFMpeg2:
+                        this.Task.Quality = (32 - value);
+                        break;
+                    case VideoEncoder.X264:
+                        double rfValue = 51.0 - value * cqStep;
+                        rfValue = Math.Round(rfValue, 2);
+                        this.Task.Quality = rfValue;
+
+                        // TODO: Lossless warning.
+                        break;
+                    case VideoEncoder.Theora:
+                        Task.Quality = value;
+                        break;
+                }
+
                 this.NotifyOfPropertyChange(() => this.RF);
+                this.NotifyOfPropertyChange(() => this.DisplayRF);
+            }
+        }
+
+        /// <summary>
+        /// Gets DisplayRF.
+        /// </summary>
+        public double DisplayRF
+        {
+            get
+            {
+                return Task.Quality.HasValue ? this.Task.Quality.Value : 0;
             }
         }
 
@@ -318,43 +281,70 @@
         {
             get
             {
-                if (this.selectedFramerate == null)
+                if (this.Task.Framerate == null)
                 {
                     return "Same as source";
                 }
 
-                return this.selectedFramerate.ToString();
+                return this.Task.Framerate.ToString();
             }
             set
             {
                 if (value == "Same as source")
                 {
-                    this.selectedFramerate = null;
+                    this.Task.Framerate = null;
                     this.ShowPeakFramerate = false;
                 }
-                else
+                else if (!string.IsNullOrEmpty(value))
                 {
                     this.ShowPeakFramerate = true;
-                    this.selectedFramerate = double.Parse(value);
+                    if (this.Task.FramerateMode == FramerateMode.VFR)
+                    {
+                        this.Task.FramerateMode = FramerateMode.PFR; 
+                    } 
+                    this.Task.Framerate = double.Parse(value);
                 }
 
                 this.NotifyOfPropertyChange(() => this.SelectedFramerate);
+                this.NotifyOfPropertyChange(() => this.Task);
             }
         }
 
         /// <summary>
         /// Gets or sets SelectedVideoEncoder.
         /// </summary>
-        public string SelectedVideoEncoder
+        public VideoEncoder SelectedVideoEncoder
         {
             get
             {
-                return EnumHelper<VideoEncoder>.GetDisplay(this.selectedVideoEncoder);
+                return this.Task.VideoEncoder;
             }
             set
             {
-                this.selectedVideoEncoder = EnumHelper<VideoEncoder>.GetValue(value);
+                this.Task.VideoEncoder = value;
                 this.NotifyOfPropertyChange(() => this.SelectedVideoEncoder);
+
+                // Tell the Advanced Panel off the change
+                IAdvancedViewModel advancedViewModel = IoC.Get<IAdvancedViewModel>();
+                advancedViewModel.SetEncoder(this.Task.VideoEncoder);
+
+                // Update the Quality Slider
+                switch (this.SelectedVideoEncoder)
+                {
+                    case VideoEncoder.FFMpeg:
+                    case VideoEncoder.FFMpeg2:
+                        this.QualityMin = 1;
+                        this.QualityMax = 31;
+                        break;
+                    case VideoEncoder.X264:
+                        this.QualityMin = 0;
+                        this.QualityMax = (int)(51 / userSettingService.GetUserSetting<double>(ASUserSettingConstants.X264Step));
+                        break;
+                    case VideoEncoder.Theora:
+                        this.QualityMin = 0;
+                        this.QualityMax = 63;
+                        break;
+                }
             }
         }
 
@@ -375,15 +365,9 @@
         }
 
         /// <summary>
-        /// Gets VideoEncoders.
+        /// Gets or sets VideoEncoders.
         /// </summary>
-        public IEnumerable<string> VideoEncoders
-        {
-            get
-            {
-                return EnumHelper<VideoEncoder>.GetEnumDisplayValues(typeof(VideoEncoder));
-            }
-        }
+        public IEnumerable<VideoEncoder> VideoEncoders { get; set; }
 
         #endregion
 
@@ -403,6 +387,47 @@
         /// </param>
         public void SetSource(Title title, Preset preset, EncodeTask task)
         {
+            this.Task = task;
+        }
+
+        /// <summary>
+        /// Setup this tab for the specified preset.
+        /// </summary>
+        /// <param name="preset">
+        /// The preset.
+        /// </param>
+        public void SetPreset(Preset preset)
+        {
+            if (preset == null || preset.Task == null)
+            {
+                return;
+            }
+            
+            this.SelectedVideoEncoder = preset.Task.VideoEncoder;
+            this.SelectedFramerate = preset.Task.Framerate.ToString();
+            switch (preset.Task.FramerateMode)
+            {
+                case FramerateMode.CFR:
+                    this.IsConstantFramerate = true;
+                    break;
+                case FramerateMode.VFR:
+                    this.IsVariableFramerate = true;
+                    this.ShowPeakFramerate = false;
+                    break;
+                case FramerateMode.PFR:
+                    this.IsPeakFramerate = true;
+                    this.ShowPeakFramerate = true;
+                    break;
+            }
+             
+            // TODO Compute RF
+            this.RF = 20;
+
+            this.Task.TwoPass = preset.Task.TwoPass;
+            this.Task.TurboFirstPass = preset.Task.TurboFirstPass;
+            this.Task.VideoBitrate = preset.Task.VideoBitrate;
+
+            this.NotifyOfPropertyChange(() => this.Task);
         }
 
         #endregion

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/AdvancedView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AdvancedView.xaml Changed

@@ -2,10 +2,15 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300"
              x:Name="advancedView">
+    <UserControl.Resources>
+        <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Converters:EnumComboConverter x:Key="x264DisplayConverter" />
+    </UserControl.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -15,8 +20,42 @@
 
         <TextBlock Text="Advanced" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
 
-        <TextBox Grid.Row="2" Margin="10" Text="{Binding Query}" 
-                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
+        <Grid Grid.Row="1" Margin="10,10,0,0" Visibility="{Binding DisplayX264Options, Converter={StaticResource boolToVisConverter}}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <StackPanel Grid.Row="0" Orientation="Vertical" Margin="0,0,0,10">
+
+                <TextBlock Text="X264 Advanced Options:" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />
+                
+                <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,10">
+                    <TextBlock Text="Preset:" VerticalAlignment="Center" />
+                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
+                          ItemsSource="{Binding X264Presets, Converter={StaticResource x264DisplayConverter}}" 
+                          SelectedItem="{Binding X264Preset, Converter={StaticResource x264DisplayConverter}}"/>
+
+                    <TextBlock Text="Profile:" VerticalAlignment="Center" />
+                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
+                          ItemsSource="{Binding X264Profiles, Converter={StaticResource x264DisplayConverter}}" 
+                          SelectedItem="{Binding X264Profile, Converter={StaticResource x264DisplayConverter}}"/>
+
+
+                    <TextBlock Text="Tune:" VerticalAlignment="Center" />
+                    <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
+                          ItemsSource="{Binding X264Tunes, Converter={StaticResource x264DisplayConverter}}" 
+                          SelectedItem="{Binding X264Tune, Converter={StaticResource x264DisplayConverter}}"/>
+                </StackPanel>
+            </StackPanel>
+
+        </Grid>
+
+        <StackPanel Grid.Row="2" Margin="10" Height="100" VerticalAlignment="Top" >
+            <TextBlock Text="Advanced Query" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />
+            <TextBox Text="{Binding Query}" 
+                 VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />
+        </StackPanel>
 
     </Grid>
 </UserControl>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/AudioView.xaml Changed

@@ -6,7 +6,12 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:cal="http://www.caliburnproject.org"
              xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
-             mc:Ignorable="d">
+             xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
+    
+    <UserControl.Resources>
+        <Conveters:EnumComboConverter x:Key="enumComboConverter" />
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -25,7 +30,9 @@
         </Grid>
 
         <ListBox Grid.Row="2" ItemsSource="{Binding AudioTracks}" 
-                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10">
+                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
+                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
+                 dd:DragDrop.DropHandler="{Binding}">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
@@ -76,8 +83,8 @@
                                       SelectedItem="{Binding ScannedTrack}"/>
                             <TextBlock Text="Codec" FontWeight="Bold" Grid.Column="2" VerticalAlignment="Center" />
                             <ComboBox Width="100" Grid.Column="3" Margin="5,0,5,0" Height="22"
-                                      ItemsSource="{Binding DataContext.AudioEncoders, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-                                      SelectedItem="{Binding Encoder}"/>
+                                      ItemsSource="{Binding DataContext.AudioEncoders, Converter={StaticResource enumComboConverter},  RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
+                                      SelectedItem="{Binding Encoder, Converter={StaticResource enumComboConverter}}"/>
                             <TextBlock Text="Bitrate" FontWeight="Bold" Grid.Column="4" VerticalAlignment="Center" />
                             <ComboBox Width="70" Grid.Column="5" Margin="5,0,5,0" Height="22" 
                                       ItemsSource="{Binding DataContext.AudioBitrates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
@@ -90,8 +97,8 @@
                             
                             <TextBlock Text="Mixdown" FontWeight="Bold" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
                             <ComboBox Width="100" Grid.Column="1" Margin="5,0,5,0" Grid.Row="1" Height="22"
-                                      ItemsSource="{Binding DataContext.AudioMixdowns, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
-                                      SelectedItem="{Binding MixDown}"/>
+                                      ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+                                      SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"/>
                             <TextBlock Text="DRC" FontWeight="Bold" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center"/>
                             <NumericUpDown:NumericUpDown Width="45" Value="{Binding DRC}" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left"  Margin="5,0,5,0" />
                             <TextBlock Text="Gain" FontWeight="Bold" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center"/>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/ChaptersView.xaml Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/MainView.xaml Changed

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/QueueView.xaml Changed

@@ -4,7 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" mc:Ignorable="d" Title="{Binding Title}" 
+        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d" Title="{Binding Title}" 
              Width="600" Height="400"
              Background="#FFF0F0F0">
 
@@ -42,7 +43,9 @@
             <TextBlock Text="{Binding JobStatus}" />
         </StackPanel>
 
-        <ListBox Grid.Row="2" ItemsSource="{Binding QueueJobs}" SelectionMode="Extended" Background="LightGray" Margin="10,0,10,10">
+        <ListBox Grid.Row="2" ItemsSource="{Binding QueueJobs}" SelectionMode="Extended" Background="LightGray" Margin="10,0,10,10"
+                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
+                 dd:DragDrop.DropHandler="{Binding}">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -52,7 +55,7 @@
             </ListBox.ItemContainerStyle>
 
             <ListBox.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:Name="QueueItemTemplate">
 
                     <Grid HorizontalAlignment="Stretch" >
                         <Grid.ColumnDefinitions>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml Changed

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"
-             mc:Ignorable="d">
+             xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" mc:Ignorable="d">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -26,7 +26,9 @@
         </Grid>
 
         <ListBox Grid.Row="2" ItemsSource="{Binding SubtitleTracks}" 
-                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10">
+                 SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"
+                 dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"
+                 dd:DragDrop.DropHandler="{Binding}">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/Views/VideoView.xaml Changed

@@ -8,6 +8,7 @@
     <UserControl.Resources>
         <Converters:BooleanConverter x:Key="boolConverter" />
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+        <Converters:EnumComboConverter x:Key="enumComboConverter" />
     </UserControl.Resources>
    
     <Grid Margin="10,5,0,0">
@@ -29,7 +30,8 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
                     <TextBlock Text="Video Codec:" Width="100" />
-                    <ComboBox Width="120" ItemsSource="{Binding VideoEncoders}" SelectedItem="{Binding SelectedVideoEncoder}" />
+                    <ComboBox Width="120" ItemsSource="{Binding VideoEncoders, Converter={StaticResource enumComboConverter}, Mode=TwoWay}" 
+                              SelectedItem="{Binding SelectedVideoEncoder, Converter={StaticResource enumComboConverter}, Mode=TwoWay}" />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal">
@@ -49,7 +51,7 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
                     <RadioButton Content="Constant Quality:" IsChecked="{Binding IsConstantQuantity}"  Margin="0,0,10,0"/>
-                    <TextBlock Text="{Binding RF}" Width="25" />
+                    <TextBlock Text="{Binding DisplayRF}" Width="25" />
                     <TextBlock Text="RF" FontWeight="Bold" />
                 </StackPanel>
 
@@ -58,14 +60,14 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
                     <RadioButton Content="Avg Bitrate (kbps):" IsChecked="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,10,0"/>
-                    <TextBox Width="75" Text="{Binding AverageBitrate}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
+                    <TextBox Width="75" Text="{Binding Task.VideoBitrate}" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}" />
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="30,0,0,0">
                     <CheckBox Content="2-Pass Encoding" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
-                              IsChecked="{Binding IsTwoPass}" Margin="0,0,10,0" />
+                              IsChecked="{Binding Task.TwoPass}" Margin="0,0,10,0" />
                     <CheckBox Content="Turbo first pass" IsEnabled="{Binding IsConstantQuantity, Converter={StaticResource boolConverter}, ConverterParameter=true}"
-                              IsChecked="{Binding IsTurboFirstPass}" />
+                              IsChecked="{Binding Task.TurboFirstPass}" />
                 </StackPanel>
 
             </StackPanel>

HandBrake-0.9.6.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml -> HandBrake-0.9.8.tar.bz2/win/CS/HandBrakeWPF/defaultsettings.xml Changed

@@ -170,18 +170,18 @@
   </item>
   <item>
     <key>
-      <string>appcast</string>
+      <string>appcast_i686</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.xml</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast.i386.xml</anyType>
     </value>
   </item>
   <item>
     <key>
-      <string>appcast_unstable</string>
+      <string>appcast_x64</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.xml</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">http://handbrake.fr/appcast_unstable.x86_64.xml</anyType>
     </value>
   </item>
   <item>
@@ -274,7 +274,7 @@
   </item>
   <item>
     <key>
-      <string>NativeLanguageForSubtitles</string>
+      <string>NativeLanguageSubtitles</string>
     </key>
     <value>
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
@@ -424,4 +424,12 @@
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
     </value>
   </item>
+  <item>
+    <key>
+      <string>HandBrakePlatform</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">MinGW i686</anyType>
+    </value>
+  </item>
 </dictionary>
\ No newline at end of file

HandBrake-0.9.6.tar.bz2/win/CS/Installer/Installer.nsi -> HandBrake-0.9.8.tar.bz2/win/CS/Installer/Installer.nsi Changed

@@ -8,8 +8,8 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "0.9.6"
-!define PRODUCT_VERSION_NUMBER "0.9.6"
+!define PRODUCT_VERSION "0.9.8"
+!define PRODUCT_VERSION_NUMBER "0.9.8"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -103,13 +103,13 @@
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"

HandBrake-0.9.6.tar.bz2/win/CS/Installer/Installer64.nsi -> HandBrake-0.9.8.tar.bz2/win/CS/Installer/Installer64.nsi Changed

@@ -8,8 +8,8 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "0.9.6"
-!define PRODUCT_VERSION_NUMBER "0.9.6"
+!define PRODUCT_VERSION "0.9.8"
+!define PRODUCT_VERSION_NUMBER "0.9.8"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -103,13 +103,13 @@
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"

HandBrake-0.9.6.tar.bz2/win/CS/Installer/MakeNightly.nsi.tmpl -> HandBrake-0.9.8.tar.bz2/win/CS/Installer/MakeNightly.nsi.tmpl Changed

@@ -103,13 +103,13 @@
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"
@@ -132,6 +132,7 @@
   File "*.dll"
   File "*.config"
   File "*.xml"
+  File "*.pdb"
 
   ; Copy the standard doc set into the doc folder
   SetOutPath "$INSTDIR\doc"

HandBrake-0.9.6.tar.bz2/win/CS/Installer/MakeNightly64.nsi.tmpl -> HandBrake-0.9.8.tar.bz2/win/CS/Installer/MakeNightly64.nsi.tmpl Changed

@@ -103,13 +103,13 @@
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"
@@ -131,6 +131,7 @@
   File "*.dll"
   File "*.config"
   File "*.xml"
+  File "*.pdb"
 
   ; Copy the standard doc set into the doc folder
   SetOutPath "$INSTDIR\doc"

HandBrake-0.9.6.tar.bz2/win/CS/Program.cs -> HandBrake-0.9.8.tar.bz2/win/CS/Program.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl -> HandBrake-0.9.8.tar.bz2/win/CS/Properties/AssemblyInfo.cs.tmpl Changed

HandBrake-0.9.6.tar.bz2/win/CS/ToolWindows/UpdateInfo.cs -> HandBrake-0.9.8.tar.bz2/win/CS/ToolWindows/UpdateInfo.cs Changed

HandBrake-0.9.6.tar.bz2/win/CS/defaultsettings.xml -> HandBrake-0.9.8.tar.bz2/win/CS/defaultsettings.xml Changed

@@ -245,7 +245,7 @@
       <string>daysBetweenUpdateCheck</string>
     </key>
     <value>
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">7</anyType>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:int" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">30</anyType>
     </value>
   </item>
   <item>
@@ -274,7 +274,7 @@
   </item>
   <item>
     <key>
-      <string>NativeLanguageForSubtitles</string>
+      <string>NativeLanguageSubtitles</string>
     </key>
     <value>
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">Any</anyType>
@@ -424,4 +424,12 @@
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>
     </value>
   </item>
+  <item>
+    <key>
+      <string>HandBrakePlatform</string>
+    </key>
+    <value>
+      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:string" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">MinGW i686</anyType>
+    </value>
+  </item>
 </dictionary>
\ No newline at end of file

HandBrake-0.9.6.tar.bz2/win/CS/doc/AUTHORS -> HandBrake-0.9.8.tar.bz2/win/CS/doc/AUTHORS Changed

@@ -1,6 +1,6 @@
 AUTHORS file for HandBrake <http://handbrake.fr/>
 
-Eric Petit <titer@m0k.org>
+Eric Petit 
  + Core (construct, multithreading, BeOS/OS X/Linux ports)
  + MPEG demuxer
  + MPEG-2, AC3 and MPGA decoders (w/ libmpeg2/liba52/libavcodec)
@@ -14,13 +14,13 @@
  + OS X interface
  + French translation
 
-Laurent Aimar <fenrir@via.ecp.fr>
+Laurent Aimar
  + H264 and Vorbis encoders (w/ libx264/libvorbis)
  + OGG/OGM muxer (w/ libogg)
  + Gtk2 interface
  + wxWidgets interface
 
-Van Jacobson <vanj.hb@gmail.com> (van)
+Van Jacobson (van)
  + Universal input architecture
  + MPEG Standard Target Decoder timing model
  + Auto-typing MPEG stream files
@@ -28,45 +28,45 @@
  + Minor dvd reader fixes
  + Chapter mark bug fixes
 
-John Allen (?) <johnallenemail@gmail.com> (johnallen)
+John Allen
  + Core enhancements
  + Threading enhancements
  + Simplified Mac OS X GUI
 
-Joe Crain <dynaflashtech@gmail.com> (dynaflash)
+Joe Crain (dynaflash)
  + Mac OS X GUI enhancements/rewrite
 
-Damiano Galassi <damiog@gmail.com> (ritsuka)
+Damiano Galassi (ritsuka)
  + Mac OS X GUI enhancements
 
-Edward Groenendaal <eddyg.hb@myreflection.org> (eddyg)
+Edward Groenendaal (eddyg)
  + Major bug fixes
  + Subtitle scan & Colour
  + Performance improvements
  
-David Foster <unknown> (davidfstr)
+David Foster (davidfstr)
  + Subtitles from file inputs
  + SSA subtitle support
 
-Rodney Hester <rhester@multics.dynalias.com> (rhester)
+Rodney Hester (rhester)
  + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
 
-Andrew Kimpton <awk@awkward.org> (awk)
+Andrew Kimpton (awk)
  + MPEG Audio fixes
  + MPEG Stream Support
 
-Chris Lee <clee@kde.org>
+Chris Lee 
  + PAR/anamorphic support
  + dvdread enhancements
  + Linux GUI
 
-Chris Long <chris.long@mac.com> (chrislong)
+Chris Long (chrislong)
  + iPod firmware 1.2+ 640x480 MPEG-4/H.264 support
 
 Brian Mario <Unknown> (brianmario)
  + Windows GUI
 
-Maurj <handbrake@maurj.com> (maurj)
+Maurj(maurj)
  + Dolby Surround and Dolby Pro Logic II mixdowns
  + 6-channel AAC audio from 5.1 source
  + Mono AAC audio from mono source
@@ -75,38 +75,45 @@
  + Mac OS X GUI enhancements
  + Support for DTS audio sources
 
-Mirkwood <mirkwood07@gmail.com> (mirkwood)
+Mirkwood (mirkwood)
  + Windows CLI port
 
-Nyx <unknown> (Nyx)
+Nyx 
  + Frame re-ordering and flushing in mp4
 
-Philippe Rigaux <pri@nopapers.org> (prigaux)
+Philippe Rigaux (prigaux)
  + 3rd party library integration
  + Mac OS X GUI enhancements
  + PAR/anamorphic support
  + Universal binary build process
  + Conversion from jam to make for compiles
 
-Jonathon Rubin <jb.rubin@gmail.com> (jbrjake)
+Jonathon Rubin (jbrjake)
  + Massive core enhancements
  + Significant improvements to H.264 support
 
-Scott <unknown> (s55)
+Scott(s55)
  + Windows GUI
  
-John Stebbins <jstebbins.hb@gmail.com> (j45)
+John Stebbins (j45)
  + GTK GUI
  + TrueHD demuxing
  + libavcodec video encoding quality enhancements
  + Numerous bug fixes
  
-Chris Thoman <cthoman@gmail.com> (huevos_rancheros)
+Chris Thoman (huevos_rancheros)
  + Ported video filters from libmpcodec
 
-Mark Krenek <markkrenek@mac.com> (travistex)
+Mark Krenek (travistex)
  + Mac OS X GUI enhancements
  + Mac OS X GUI Queueing system
 
-Kona 'mike' Blend <Kona8lend@gmail.com> (KonaBlend)
+Kona 'mike' Blend (KonaBlend)
  + Build System and related guides
+ 
+David Rickard (RandomEngy)
++ HandBrake Interop Library
+
+Tim Walker (Rodeo)
++ Miscellaneous fixes and enhancements
+

HandBrake-0.9.6.tar.bz2/win/CS/doc/COPYING -> HandBrake-0.9.8.tar.bz2/win/CS/doc/COPYING Changed

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-&#xc;
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-&#xc;
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-&#xc;
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-&#xc;
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-&#xc;
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
\ No newline at end of file

HandBrake-0.9.6.tar.bz2/win/CS/doc/CREDITS -> HandBrake-0.9.8.tar.bz2/win/CS/doc/CREDITS Changed

@@ -1,175 +1,32 @@
 CREDITS file for HandBrake <http://handbrake.fr/>
 
 HandBrake uses many cool libraries from the GNU/Linux world.
-Thank their authors!
 
-liba52 authors:
-  Aaron Holtzman
-  Michel Lespinasse
-  Gildas Bazin
-  Billy Biggs
-  Eduard Hasenleithner
-  Håkan Hjort
-  Charles M. Hannum
-  Chris Hodges
-  Michael Holzt
-  Angelos Keromytis
-  David I. Lehn
-  Don Mahurin
-  Jim Miller
-  Takefumi Sayo
-  Shoji Tokunaga
-
-libavcodec authors:
-  Fabrice Bellard
-  Alex Beregszaszi
-  Brian Foley
-  Arpad Gereoffy
-  Philip Gladstone
-  Falk Hueffner
-  Zdenek Kabelac
-  Nick Kurshev
-  Michael Niedermayer
-  François Revol
-  Dieter Shirley
-  Juan J. Sierralta
-  Lionel Ulmer
-
-libdca authors:
-  Gildas Bazin
-  Sam Hocevar
-
-libdvdread authors:
-  Björn Englund
-  Håkan Hjort
-  Billy Biggs
-  Christian Wolff
-
-libfaac authors:
-  M. Bakker
-  Tony Lenox
-  RageOMatic
-  thebard
-  Ivan Dimkovic
-  Krzysztof Nikiel
-  
-libfaad2 authors:
-  M. Bakker
-  Alexander Kurpiers
-  Volker Fischer
-  Gian-Carlo Pascutto
-
-libmp3lame authors:
-  Mike Cheng
-  Robert Hegemann
-  Frank Klemm
-  Alexander Leidinger
-  Naoki Shibata
-  Mark Taylor
-  Takehiro Tominiga
-  Iván Cavero Belaunde
-  Gabriel Bouvigne
-  Florian Bomers
-  CISC
-  John Dahlstrom
-  John Dee
-  Albert Faber
-  Peter Gubanov
-  Lars Magne Ingebrigtsen 	
-  Yosi Markovich
-  Zdenek Kabelac
-  Iwasa Kazmi
-  Guillaume Lessard
-  Steve Lhomme
-  Don Melton
-  Viral Shah
-  Acy Stapp
-  Roel VdB
-
-libmp4v2 authors:
-  Dave Mackie
-  Alix Marchandise-Franquet
-  Bill May
-  Massimo Villari
-  Waqar Mohsin
-  Richard Chen
-  Rob Arnold
-  Howdy Pierce
-  Steven Schultz
-  sergent@io.com
-  Sean Gilligan
-  Michael Rossberg
-  Luis F. Ramirez
-  Petter Reinholdtsen
-
-libmpeg2 authors:
-  Aaron Holtzman
-  Michel Lespinasse
-  Bruno Barreyra
-  Gildas Bazin
-  Alexander W. Chin
-  Stephen Crowley
-  Didier Gautheron
-  Ryan C. Gordon
-  Peter Gubanov
-  Håkan Hjort
-  Nicolas Joly
-  Gerd Knorr
-  David I. Lehn
-  Olie Lho
-  Rick Niles
-  Real Ouellet
-  Bajusz Peter
-  Franck Sicard
-  Brion Vibber
-  Martin Vogt
-  Fredrik Vraalsen
-
-libogg authors:
-  Christopher Montgomery
-  
-libmkv authors:
-  John A. Stebbins
-  Nathan Caldwell
-  Mike Matsnev
-  Nathan Caldwell
-  Christophe Devine
-
-libsamplerate authors:
-  Erik de Castro Lopo
-
-libvorbis authors:
-  Christopher Montgomery
-
-libx264 authors:
-  Laurent Aimar
-  
-libtheora authors:
-  Monty
-  Ralph Giles
-  Timothy B. Terriberry
-  Dan B. Miller
-  Rudolf Marek
-  Wim Tayman
-  Dan Lenski
-  Nils Pipenbrinck
-  Aaron Colwell
-  Thomas Vander Stichele
-  Jan Gerber
-  Conrad Parker
-  Cristian Adam
-  Sebastian Pippin
-  Simon Hosie
-  Mauricio Piacentini
-  Silvia Pfeiffer
-  Michael Smith
-  Andre Pang
-  calc
-  Chris Cheney
-  Brendan Cully
-  Edward Hervey
-  Adam Moss
-  Colin Ward
-  Jeremy C. Reed
-  Arc Riley
-  Rodolphe Ortalo
+Thanks to the authors of the following libraries which help power HandBrake:
+See the local project AUTHORS files for details of the individuals involved.
+
+liba52
+libbzip2
+libfaac
+libfaad2
+libavcodec
+libfontconfig
+libfreetype
+liblame
+libass
+libbluray
+libdca
+libdvdnav
+libdvdread
+libiconv
+libmkv
+libogg
+libsamplerate
+libtheora
+libvorbis
+libxml2
+libmp4v2
+libmpeg2dec
+libpthreadsw32
+libx264
+libzlib
\ No newline at end of file

HandBrake-0.9.6.tar.bz2/win/CS/doc/NEWS -> HandBrake-0.9.8.tar.bz2/win/CS/doc/NEWS Changed

@@ -1,5 +1,234 @@
 NEWS file for HandBrake <http://handbrake.fr/>
 
+Changes betwen 0.9.5 and 0.9.6:
+
+Encoders:
+---------
+
+-> Video:
+
+   - updated libx264 (revision 2146)
+   - MPEG-2 encoder (from libavcodec)
+   - advanced options support for libavcodec encoders
+     format: option1=value1:option2=value2
+             -bf 2 -trellis 2 becomes bf=2:trellis=2
+
+-> Audio:
+
+   - audio gain control (increase/decrease audio volume)
+
+   - updated libogg (1.3.0) and libvorbis (aoTuV b6.03)
+   - new AAC encoder (from libavcodec) (considered experimental)
+     (supported mixdowns: Mono/Stereo/Dolby, 5.1 will come later)
+     (should be on par with faac in terms of quality, sometimes better)
+   - FLAC encoder (16-bit, MKV container only)
+
+   - Mac OS X: HE-AAC encoding support, via Core Audio
+
+   - quality-based variable bitrate encoding support
+     works with: Lame MP3, Vorbis, Core Audio AAC
+     only implemented in CLI and Linux GUI
+
+   - AC3 encoder: set Dolby Surround flag in stream parameters when mixdown is Dolby Surround or Pro Logic II
+
+
+-> Audio Passthru:
+
+   - DTS Passthru to MP4 container (in addition to MKV) (supported by e.g. VLC, MPlayer)
+   - DTS-HD Passthru (MP4, MKV containers)
+   - MP3 Passthru (MP4, MKV containers)
+   - AAC Passthru (MP4, MKV containers)
+     (known issue: Magic Cookie not passed through from MPEG Program/Transport streams,
+      which will break playback in e.g. QuickTime Player)
+   - Auto Passthru: one encoder, multiple codecs
+     lets you define allowed codecs (from supported passthru codecs)
+     lets you pick a fallback encoder if passthru is not possible
+
+Muxers:
+-------
+
+   - start MKV clusters with a video keyframe whenever possible
+     should improve seeking and DLNA streaming
+
+   - bug fix: use ISO 639-2 bibliographic form for MKV language codes
+   - bug fix: fix crash due to division by zero in MP4 muxer
+   - bug fix: fix muxing of Closed Captions. Improper interleaving broke playback on some players
+
+Decoders:
+---------
+
+-> Video:
+
+   - updated libav* libraries from Libav (http://libav.org/) (v0.7-1696-gcae4f4b, late October 2011)
+     frame-based multithreading for H.264, VP8
+     10-bit decoding support for H.264, DNxHD
+     Apple ProRes decoding support
+   - improved average framerate detection
+   - duplicate frame detection for improved frame drop decision (CFR/PFR)
+   - new Same as source, Constant Framerate option
+     for devices that don't support variable framerate
+     automatically picks a constant framerate closest to the detected average framerate
+
+   - bug fix: fix problem when resolution changes in the middle of a video stream
+
+-> Audio:
+
+   - Blu-ray: make TrueHD, DTS-HD and E-AC3 Secondary Audio streams available for decoding and/or passthrough
+
+   - bug fix: libavcodec-decoded streams can now be decoded multiple times
+              previously, multiple decodes of the same source tracks weren't possible
+              and audio output tracks had to be dropped
+   - bug fix: fix audio screech at beginning of some audio tracks when decoding AC3
+   - bug fix: fix DTS decoder audio volume (was too low)
+   - bug fix: garbled audio when decoding DTS-HD audio from MKV containers
+   - bug fix: fix support for DTS-HD High Resolution Audio in MPEG Transport streams
+
+-> Subtitles:
+
+   - updated libass (0.10.0)
+   - improved handling of subtitles with overlapping timestamps
+   - improved handling of DVD subtitles without Stop Display commands
+   - SSA subtitles are now passed through to MKV without conversion to SRT/UTF-8
+
+   - bug fix: fix rendering problem with SSA subtitles when no font is embedded in the source video
+
+Demuxers:
+---------
+
+   - improved MPEG Program/Transport stream support
+     support for MPEG-1 Program streams
+     support for HD-DVD EVOB streams
+     improved handling of Transport streams that have no PCR
+   - WTV container support (via libavformat)
+
+   - bug fix: files with more than 20 tracks (video, audio, subtitles etc.) are now supported
+   - bug fix: some QuickTime MOV files were misdirected as MPEG Transport streams
+   - bug fix: fix detection of TrueType font attachments that don't have the correct MIME type
+
+Filters:
+--------
+
+   - new, much improved decomb filter (but slower)
+     new settings are default
+     old settings become decomb "Fast"
+
+Presets:
+--------
+
+   - improved "Normal" preset (much faster, similar file size and quality)
+   - removed obsolete legacy presets
+   - added new device presets for Android phones/tablets
+     recent and/or powerful devices recommended
+
+Mac OS X:
+---------
+
+-> DVD decryption:
+
+   - VLC 2.x or later will not work for DVD decryption
+     and is therefore unsupported as of HandBrake 0.9.6
+   - libdvdcss is now the preferred method for DVD decryption
+     already works with HandBrake 0.9.5
+     a .pkg installer is available from Videolan:
+     http://download.videolan.org/libdvdcss/last/macosx/
+
+-> Build system:
+
+   - support for Xcode 4 and Mac OS X 10.7 "Lion"
+   - Mac OS X 10.5 "Leopard" no longer supported
+
+Mac OS X GUI:
+-------------
+
+-> OS X 10.7 Lion support:
+
+   - bug fix: Live Preview window widgets updated to work under Lion
+   - bug fix: fixed positioning of widgets in the Audio panel under Lion
+
+-> Other:
+
+   - wider main window providing more room for various widgets
+
+Windows GUI:
+------------
+
+-> Preview window:
+
+   - complete redesign
+   - support for VLC or the system default video player
+   - dropped built-in QuickTime playback support
+
+-> Other:
+
+   - much improved control over the default audio and subtitle tracks selected (see Options)
+   - ability to set the minimal title length that will show up during a scan (see Options)
+   - several other usability improvements
+   - installer now has a silent option for easier network installs (launch the installer with /S)
+
+Linux GUI:
+----------
+
+-> Audio panel:
+
+   - new advanced audio options section for gain and audio track names
+   - dynamic range compression and samplerate moved to advanced audio options
+
+-> Other:
+
+   - minor UI tweaks and usability enhancements
+
+Miscellaneous:
+--------------
+
+   - Target Size is gone, and isn't coming back
+     Don't bother complaining on the forums
+
+   - CLI: support for x264 presets, tunes and profiles
+     new --x264-preset, --x264-tune and --x264-profile options
+
+   - DVD: fix issues with some discs (e.g. True Grit, Thor, Transformers 3)
+   - DVD: improved main feature detection
+
+   - updated libbluray (0.0.1-pre-213-ga869da8, late May 2011)
+
+
+Changes between 0.9.4 and 0.9.5:
+
+* Core Library
+  - BluRay disc structure support. (No decryption support) 
+  - Updated Libraries (x264, ffmpeg) 
+  - SSA Subtitle support. (Including burn-in) 
+  - MP3 audio now supported in MP4 files (Note: Limited Player compatibility) 
+  - VOBSUB subtitle now supported in MP4 files (Note: Limited Player compatibility) 
+  - Updated Presets for newer devices and better quality 
+  - AC3 encoding support.
+  - Many Bug fixes and other small improvements
+  - Improved DVD Main Feature detection (when using dvdnav)
+  - Universal audio downmix support (all audio types can be downmixed)
+
+*All GUIs
+  - Updated x264 Advanced Panel
+  - Video Quality Slider drops % value and only shows RF for x264
+  - Batch Scan (Scan Multiple files at once. N.B: Does not include multiple VIDEO_TS folders / Image files) 
+  - Peak framerate option (Capped VFR)
+  - Many Bug fixes
+  - Many Tweaks to improve usability.
+  - Ability to edit queue jobs
+  - Point-to-Point encoding (second or frame start and end times)
+
+* Mac GUI
+  - New Audio Panel supporting >4 Audio Tracks
+  - VLC detection in /Applications and ~/Applications
+
+* Windows GUI
+  - Encode Status in GUI. (CLI window is now always hidden)
+  - Improved Auto-Naming for Destination file name.
+  - Drag / Drop Video onto Main Window to scan.
+  
+* Linux GUI
+  - Multiple instance support (run multiple copies of ghb at once)
+  - Many Bug fixes and UI improvements. 
+  
 Changes between 0.9.3 and 0.9.4:
 
 Core:

HandBrake-0.9.6.tar.bz2/win/CS/doc/THANKS -> HandBrake-0.9.8.tar.bz2/win/CS/doc/THANKS Changed

@@ -1,70 +1,27 @@
 THANKS file for HandBrake <http://handbrake.fr/>
 
-Several people noticeably contributed to MediaFork and HandBrake development
-without writing code (submitting/checking translations, DVD samples, etc).
-Let's thank them here!
+Hosting:
 
-Chris (audley)
- + Inspiration and example of patching mpeg4ip for iPod atom support
+Github (http://github.com)
+SourceForge(http://sourceforge.net/projects/handbrake)
+Eric Petit (Running the servers behind HandBrake.fr)
+Freenode IRC (http://freenode.net/)
 
-Omar Ahmad Bhatti
- + Intensive beta testing, suggestions. Convinced me to port HandBrake
-   to OS X, which finally was a pretty good idea.
+Software:
 
-Hanna Bauer
-Adrien Marquette
-Norbert Rittel
- + German translation
+ReviewBoard (http://www.reviewboard.org/)
+PhpBB (http://www.phpbb.com/)
+hlscript (http://badmofo.org/hlscript/)
 
-Paul Bénéchet
-Luidgi Esposito
-Andrea Gianarro
-Emilio Gelosi
- + Italian translation
+Forum Moderators:
 
-Adam
- + Polish translation
-
-Nik Roby
- + Russian translation
-
-Leendert
- + Dutch translation
-
-Eric Kornblum
- + Sent me a sample DVD with LPCM tracks
-
-migol Superkid
- + Spanish translation
-
-pgjw
- + Portuguese translation
-
-cygma
- + Japanese translation
-
-Michelle De Sio
- + Sent me a sample DVD with MPEG audio tracks
-
-Ian Rickard
- + Enhanced icon
-
-Sébastien Noël
- + Debian packages (http://www.twolife.org/debian/repository.php)
-
-People who sent me an iTunes gift certificate: a BIG thanks!
-
-Paul (baggss)
- + Forum Moderator
- 
-Du'Wayne Caviness (Cavalicious)
- + Forum Moderator
- 
+Paul (baggss), 
+Du'Wayne Caviness (Cavalicious) 
 Edward Jackson. (TedJ)
- + Forum Moderator
- 
 Chuck (cvk_b)
- + Testing Team Member
-
 Nate Thompson (nightstrm)
- + Forum Moderator
\ No newline at end of file
+
+Other:
+
+Thanks to all of you who have contributed time, patches, testing, uploaded test files etc. 
+There are too many to name here, but we do appreciate the effort.

HandBrake-0.9.6.tar.bz2/win/CS/doc/TRANSLATIONS -> HandBrake-0.9.8.tar.bz2/win/CS/doc/TRANSLATIONS Changed

@@ -1,23 +1,7 @@
-$Id: TRANSLATIONS,v 1.2 2004/03/22 18:20:30 titer Exp $
-
 TRANSLATIONS file for HandBrake <http://handbrake.fr/>
 
 Translating HandBrake
 =====================
 
-***** HandBrake does not currently have a localization scheme for any of its interfaces.
-***** Information below is obsolete and only useful for historical purposes:
-
-Only the OS X interface of HandBrake can be translated at the moment.
-Localization is not implemented in BeOS and GTK GUIs.
-
-HandBrake uses the NSLocalizedString() OS X function to translate every
-item in the interface. Therefore, you don't need (and mustn't) modify
-the nib files. All you have to do is to write a Localizable.strings for
-your language. You can get it (for the latest release) at
-<http://handbrake.m0k.org/Localizable.strings>.
-
-Edit it with Xcode, save it to HandBrake/macosx/i18n/xx.strings (where
-'xx' are the two letters representing your language), then add 'xx' to
-the language list in the Jamrules file.
+HandBrake does not currently have a localization scheme for any of its interfaces.

HandBrake-0.9.6.tar.bz2/win/CS/frmMain.Designer.cs -> HandBrake-0.9.8.tar.bz2/win/CS/frmMain.Designer.cs Changed

@@ -60,7 +60,6 @@
             this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ChaptersMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.mnu_resetChapters = new System.Windows.Forms.ToolStripMenuItem();
-            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
             this.drop_format = new System.Windows.Forms.ComboBox();
             this.drop_chapterFinish = new System.Windows.Forms.ComboBox();
             this.drop_chapterStart = new System.Windows.Forms.ComboBox();
@@ -73,6 +72,7 @@
             this.radio_cq = new System.Windows.Forms.RadioButton();
             this.radio_avgBitrate = new System.Windows.Forms.RadioButton();
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();
+            this.btn_file_source = new System.Windows.Forms.ToolStripMenuItem();
             this.treeView_presets = new System.Windows.Forms.TreeView();
             this.presets_menu = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.pmnu_expandAll = new System.Windows.Forms.ToolStripMenuItem();
@@ -99,6 +99,7 @@
             this.Label47 = new System.Windows.Forms.Label();
             this.Label3 = new System.Windows.Forms.Label();
             this.tab_audio = new System.Windows.Forms.TabPage();
+            this.AudioSettings = new Handbrake.Controls.AudioPanel();
             this.AudioMenuRowHeightHack = new System.Windows.Forms.ImageList(this.components);
             this.tab_video = new System.Windows.Forms.TabPage();
             this.panel1 = new System.Windows.Forms.Panel();
@@ -109,13 +110,18 @@
             this.lbl_SliderValue = new System.Windows.Forms.Label();
             this.lbl_framerate = new System.Windows.Forms.Label();
             this.tab_picture = new System.Windows.Forms.TabPage();
+            this.PictureSettings = new Handbrake.Controls.PictureSettings();
             this.Check_ChapterMarkers = new System.Windows.Forms.CheckBox();
             this.tabs_panel = new System.Windows.Forms.TabControl();
             this.tab_filters = new System.Windows.Forms.TabPage();
+            this.Filters = new Handbrake.Controls.Filters();
             this.tab_subtitles = new System.Windows.Forms.TabPage();
+            this.Subtitles = new Handbrake.Controls.Subtitles();
             this.tab_chapters = new System.Windows.Forms.TabPage();
             this.label31 = new System.Windows.Forms.Label();
             this.tab_advanced = new System.Windows.Forms.TabPage();
+            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();
+            this.x264Panel = new Handbrake.Controls.x264Panel();
             this.tab_query = new System.Windows.Forms.TabPage();
             this.btn_clear = new System.Windows.Forms.Button();
             this.label34 = new System.Windows.Forms.Label();
@@ -180,12 +186,6 @@
             this.SourceLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
             this.openPreset = new System.Windows.Forms.OpenFileDialog();
             this.File_ChapterImport = new System.Windows.Forms.OpenFileDialog();
-            this.PictureSettings = new Handbrake.Controls.PictureSettings();
-            this.Filters = new Handbrake.Controls.Filters();
-            this.AudioSettings = new Handbrake.Controls.AudioPanel();
-            this.Subtitles = new Handbrake.Controls.Subtitles();
-            this.advancedEncoderOpts = new Handbrake.Controls.AdvancedEncoderOpts();
-            this.x264Panel = new Handbrake.Controls.x264Panel();
             notifyIconMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
             notifyIconMenu.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();
@@ -312,7 +312,11 @@
             "23.976",
             "24",
             "25",
-            "29.97"});
+            "29.97",
+            "30",
+            "50",
+            "59.94",
+            "60"});
             this.drp_videoFramerate.Location = new System.Drawing.Point(125, 62);
             this.drp_videoFramerate.Name = "drp_videoFramerate";
             this.drp_videoFramerate.Size = new System.Drawing.Size(125, 21);
@@ -427,15 +431,6 @@
             this.mnu_resetChapters.Text = "Reset Chapter Names";
             this.mnu_resetChapters.Click += new System.EventHandler(this.mnu_resetChapters_Click);
             // 
-            // btn_file_source
-            // 
-            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;
-            this.btn_file_source.Name = "btn_file_source";
-            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.btn_file_source.Size = new System.Drawing.Size(182, 22);
-            this.btn_file_source.Text = "Video File";
-            this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);
-            // 
             // drop_format
             // 
             this.drop_format.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -599,6 +594,15 @@
             this.check_2PassEncode.UseVisualStyleBackColor = false;
             this.check_2PassEncode.CheckedChanged += new System.EventHandler(this.check_2PassEncode_CheckedChanged);
             // 
+            // btn_file_source
+            // 
+            this.btn_file_source.Image = global::Handbrake.Properties.Resources.Movies_Small;
+            this.btn_file_source.Name = "btn_file_source";
+            this.btn_file_source.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
+            this.btn_file_source.Size = new System.Drawing.Size(182, 22);
+            this.btn_file_source.Text = "Video File";
+            this.btn_file_source.Click += new System.EventHandler(this.BtnFileScanClicked);
+            // 
             // treeView_presets
             // 
             this.treeView_presets.ContextMenuStrip = this.presets_menu;
@@ -824,6 +828,22 @@
             this.tab_audio.Text = "Audio";
             this.tab_audio.UseVisualStyleBackColor = true;
             // 
+            // AudioSettings
+            // 
+            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
+            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.AudioSettings.Location = new System.Drawing.Point(0, 0);
+            this.AudioSettings.Name = "AudioSettings";
+            allowedPassthru1.AudioAllowAACPass = true;
+            allowedPassthru1.AudioAllowAC3Pass = true;
+            allowedPassthru1.AudioAllowDTSHDPass = true;
+            allowedPassthru1.AudioAllowDTSPass = true;
+            allowedPassthru1.AudioAllowMP3Pass = true;
+            allowedPassthru1.AudioEncoderFallback = HandBrake.Interop.Model.Encoding.AudioEncoder.Ac3;
+            this.AudioSettings.PassthruSettings = allowedPassthru1;
+            this.AudioSettings.Size = new System.Drawing.Size(720, 310);
+            this.AudioSettings.TabIndex = 0;
+            // 
             // AudioMenuRowHeightHack
             // 
             this.AudioMenuRowHeightHack.ColorDepth = System.Windows.Forms.ColorDepth.Depth8Bit;
@@ -943,6 +963,19 @@
             this.tab_picture.Text = "Picture";
             this.tab_picture.UseVisualStyleBackColor = true;
             // 
+            // PictureSettings
+            // 
+            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
+            this.PictureSettings.CurrentlySelectedPreset = null;
+            this.PictureSettings.Enabled = false;
+            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.PictureSettings.Location = new System.Drawing.Point(0, 0);
+            this.PictureSettings.Name = "PictureSettings";
+            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);
+            this.PictureSettings.Size = new System.Drawing.Size(666, 279);
+            this.PictureSettings.SizeSet = false;
+            this.PictureSettings.TabIndex = 0;
+            // 
             // Check_ChapterMarkers
             // 
             this.Check_ChapterMarkers.AutoSize = true;
@@ -981,6 +1014,15 @@
             this.tab_filters.Text = "Video Filters";
             this.tab_filters.UseVisualStyleBackColor = true;
             // 
+            // Filters
+            // 
+            this.Filters.BackColor = System.Drawing.Color.Transparent;
+            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Filters.Location = new System.Drawing.Point(0, 0);
+            this.Filters.Name = "Filters";
+            this.Filters.Size = new System.Drawing.Size(713, 310);
+            this.Filters.TabIndex = 0;
+            // 
             // tab_subtitles
             // 
             this.tab_subtitles.Controls.Add(this.Subtitles);
@@ -992,6 +1034,15 @@
             this.tab_subtitles.Text = "Subtitles";
             this.tab_subtitles.UseVisualStyleBackColor = true;
             // 
+            // Subtitles
+            // 
+            this.Subtitles.BackColor = System.Drawing.Color.Transparent;
+            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Subtitles.Location = new System.Drawing.Point(0, 0);
+            this.Subtitles.Name = "Subtitles";
+            this.Subtitles.Size = new System.Drawing.Size(722, 310);
+            this.Subtitles.TabIndex = 0;
+            // 
             // tab_chapters
             // 
             this.tab_chapters.BackColor = System.Drawing.Color.Transparent;
@@ -1031,6 +1082,26 @@
             this.tab_advanced.Text = "Advanced";
             this.tab_advanced.UseVisualStyleBackColor = true;
             // 
+            // advancedEncoderOpts
+            // 
+            this.advancedEncoderOpts.AdavancedQuery = "";
+            this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent;
+            this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0);
+            this.advancedEncoderOpts.Name = "advancedEncoderOpts";
+            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);
+            this.advancedEncoderOpts.TabIndex = 1;
+            // 
+            // x264Panel
+            // 
+            this.x264Panel.BackColor = System.Drawing.Color.Transparent;
+            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.x264Panel.Location = new System.Drawing.Point(0, 0);
+            this.x264Panel.Name = "x264Panel";
+            this.x264Panel.Size = new System.Drawing.Size(720, 306);
+            this.x264Panel.TabIndex = 0;
+            this.x264Panel.X264Query = "";
+            // 
             // tab_query
             // 
             this.tab_query.Controls.Add(this.btn_clear);
@@ -1718,72 +1789,6 @@
             // 
             this.File_ChapterImport.Filter = "CSV Files|*.csv";
             // 
-            // PictureSettings
-            // 
-            this.PictureSettings.BackColor = System.Drawing.Color.Transparent;
-            this.PictureSettings.CurrentlySelectedPreset = null;
-            this.PictureSettings.Enabled = false;
-            this.PictureSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.PictureSettings.Location = new System.Drawing.Point(0, 0);
-            this.PictureSettings.Name = "PictureSettings";
-            this.PictureSettings.PresetMaximumResolution = new System.Drawing.Size(0, 0);
-            this.PictureSettings.Size = new System.Drawing.Size(666, 279);
-            this.PictureSettings.TabIndex = 0;
-            // 
-            // Filters
-            // 
-            this.Filters.BackColor = System.Drawing.Color.Transparent;
-            this.Filters.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Filters.Location = new System.Drawing.Point(0, 0);
-            this.Filters.Name = "Filters";
-            this.Filters.Size = new System.Drawing.Size(713, 310);
-            this.Filters.TabIndex = 0;
-            // 
-            // AudioSettings
-            // 
-            this.AudioSettings.BackColor = System.Drawing.Color.Transparent;
-            this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.AudioSettings.Location = new System.Drawing.Point(0, 0);
-            this.AudioSettings.Name = "AudioSettings";
-            allowedPassthru1.AudioAllowAACPass = true;
-            allowedPassthru1.AudioAllowAC3Pass = true;
-            allowedPassthru1.AudioAllowDTSHDPass = true;
-            allowedPassthru1.AudioAllowDTSPass = true;
-            allowedPassthru1.AudioAllowMP3Pass = true;
-            allowedPassthru1.AudioEncoderFallback = HandBrake.Interop.Model.Encoding.AudioEncoder.Ac3;
-            this.AudioSettings.PassthruSettings = allowedPassthru1;
-            this.AudioSettings.Size = new System.Drawing.Size(720, 310);
-            this.AudioSettings.TabIndex = 0;
-            // 
-            // Subtitles
-            // 
-            this.Subtitles.BackColor = System.Drawing.Color.Transparent;
-            this.Subtitles.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Subtitles.Location = new System.Drawing.Point(0, 0);
-            this.Subtitles.Name = "Subtitles";
-            this.Subtitles.Size = new System.Drawing.Size(722, 310);
-            this.Subtitles.TabIndex = 0;
-            // 
-            // advancedEncoderOpts
-            // 
-            this.advancedEncoderOpts.AdavancedQuery = "";
-            this.advancedEncoderOpts.BackColor = System.Drawing.Color.Transparent;
-            this.advancedEncoderOpts.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.advancedEncoderOpts.Location = new System.Drawing.Point(0, 0);
-            this.advancedEncoderOpts.Name = "advancedEncoderOpts";
-            this.advancedEncoderOpts.Size = new System.Drawing.Size(720, 209);
-            this.advancedEncoderOpts.TabIndex = 1;
-            // 
-            // x264Panel
-            // 
-            this.x264Panel.BackColor = System.Drawing.Color.Transparent;
-            this.x264Panel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.x264Panel.Location = new System.Drawing.Point(0, 0);
-            this.x264Panel.Name = "x264Panel";
-            this.x264Panel.Size = new System.Drawing.Size(720, 306);
-            this.x264Panel.TabIndex = 0;
-            this.x264Panel.X264Query = "";
-            // 
             // frmMain
             // 
             this.AllowDrop = true;

HandBrake-0.9.6.tar.bz2/win/CS/frmMain.cs -> HandBrake-0.9.8.tar.bz2/win/CS/frmMain.cs Changed

@@ -98,7 +98,7 @@
 
                 if (selectedTitle != null && !string.IsNullOrEmpty(selectedTitle.SourceName))
                 {
-                    return Path.GetFileName(selectedTitle.SourceName);
+                    return Path.GetFileNameWithoutExtension(selectedTitle.SourceName);
                 }
 
                 // We have a drive, selected as a folder.
@@ -223,7 +223,7 @@
                 if (info.NewVersionAvailable)
                 {
                     UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),
-                        userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeBuild));
+                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
                     updateWindow.ShowDialog();
                 }
             }
@@ -622,7 +622,7 @@
             Form preset = new frmAddPreset(this, presetHandler);
             if (preset.ShowDialog() == DialogResult.OK)
             {
-                TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black };
+                TreeNode presetTreeview = new TreeNode(presetHandler.LastPresetAdded.Name) { ForeColor = Color.Black, Tag = presetHandler.LastPresetAdded };
                 treeView_presets.Nodes.Add(presetTreeview);
                 presetHandler.LastPresetAdded = null;
             }
@@ -826,10 +826,19 @@
         {
             foreach (TreeNode treenode in treeView_presets.Nodes)
             {
+                if (treenode.Tag != null && ((Preset)treenode.Tag).Name == presetName)
+                {
+                    treeView_presets.SelectedNode = treenode;
+                    return;
+                }
+
                 foreach (TreeNode node in treenode.Nodes)
                 {
                     if (node.Text.Equals(presetName))
+                    {
                         treeView_presets.SelectedNode = node;
+                        return;
+                    }
                 }
             }
         }
@@ -2584,7 +2593,7 @@
 
                 if (info.NewVersionAvailable)
                 {
-                    UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeBuild));
+                    UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
                     updateWindow.ShowDialog();
                 }
                 else
@@ -2676,6 +2685,7 @@
 
         #endregion
 
+
         // This is the END of the road ****************************************
     }
 }
\ No newline at end of file

HandBrake-0.9.8.tar.bz2/win/CS/libraries/WPFDragDrop Added

HandBrake-0.9.8.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.XML Added

@@ -0,0 +1,270 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>GongSolutions.Wpf.DragDrop</name>
+    </assembly>
+    <members>
+        <member name="T:GongSolutions.Wpf.DragDrop.IDropTarget">
+            <summary>
+            Interface implemented by Drop Handlers.
+            </summary>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)">
+            <summary>
+            Updates the current drag state.
+            </summary>
+            
+            <param name="dropInfo">
+            Information about the drag.
+            </param>
+            
+            <remarks>
+            To allow a drop at the current drag position, the <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects"/> property on 
+            <paramref name="dropInfo"/> should be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/>
+            and <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.Data"/> should be set to a non-null value.
+            </remarks>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)">
+            <summary>
+            Performs a drop.
+            </summary>
+            
+            <param name="dropInfo">
+            Information about the drop.
+            </param>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.DropInfo">
+            <summary>
+            Holds information about a the target of a drag drop operation.
+            </summary>
+            
+            <remarks>
+            The <see cref="T:GongSolutions.Wpf.DragDrop.DropInfo"/> class holds all of the framework's information about the current 
+            target of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.DragOver(GongSolutions.Wpf.DragDrop.DropInfo)"/> method to determine whether 
+            the current drop target is valid, and by <see cref="M:GongSolutions.Wpf.DragDrop.IDropTarget.Drop(GongSolutions.Wpf.DragDrop.DropInfo)"/> to perform the drop.
+            </remarks>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.DropInfo.#ctor(System.Object,System.Windows.DragEventArgs,GongSolutions.Wpf.DragDrop.DragInfo)">
+            <summary>
+            Initializes a new instance of the DropInfo class.
+            </summary>
+            
+            <param name="sender">
+            The sender of the drag event.
+            </param>
+            
+            <param name="e">
+            The drag event.
+            </param>
+            
+            <param name="dragInfo">
+            Information about the source of the drag, if the drag came from within the framework.
+            </param>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Data">
+            <summary>
+            Gets the drag data.
+            </summary>
+            
+            <remarks>
+            If the drag came from within the framework, this will hold:
+            
+            - The dragged data if a single item was dragged.
+            - A typed IEnumerable if multiple items were dragged.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo">
+            <summary>
+            Gets a <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.DragInfo"/> object holding information about the source of the drag, 
+            if the drag came from within the framework.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.DropTargetAdorner">
+            <summary>
+            Gets or sets the class of drop target to display.
+            </summary>
+            
+            <remarks>
+            The standard drop target adorner classes are held in the <see cref="T:GongSolutions.Wpf.DragDrop.DropTargetAdorners"/>
+            class.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.Effects">
+            <summary>
+            Gets or sets the allowed effects for the drop.
+            </summary>
+            
+            <remarks>
+            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drop handler in order 
+            for a drop to be possible.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.InsertIndex">
+            <summary>
+            Gets the current insert position within <see cref="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection"/>.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetCollection">
+            <summary>
+            Gets the collection that the target ItemsControl is bound to.
+            </summary>
+            
+            <remarks>
+            If the current drop target is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetItem">
+            <summary>
+            Gets the object that the current drop target is bound to.
+            </summary>
+            
+            <remarks>
+            If the current drop target is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.TargetGroup">
+            <summary>
+            Gets the current group target.
+            </summary>
+            
+            <remarks>
+            If the drag is currently over an ItemsControl with groups, describes the group that
+            the drag is currently over.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTarget">
+            <summary>
+            Gets the control that is the current drop target.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetItem">
+            <summary>
+            Gets the item in an ItemsControl that is the current drop target.
+            </summary>
+            
+            <remarks>
+            If the current drop target is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DropInfo.VisualTargetOrientation">
+            <summary>
+            Gets th orientation of the current drop target.
+            </summary>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.IDragSource">
+            <summary>
+            Interface implemented by Drag Handlers.
+            </summary>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)">
+            <summary>
+            Queries whether a drag can be started.
+            </summary>
+            
+            <param name="dragInfo">
+            Information about the drag.
+            </param>
+            
+            <remarks>
+            To allow a drag to be started, the <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects"/> property on <paramref name="dragInfo"/> 
+            should be set to a value other than <see cref="!:DragDropEffects.None"/>. 
+            </remarks>
+        </member>
+        <member name="T:GongSolutions.Wpf.DragDrop.DragInfo">
+            <summary>
+            Holds information about a the source of a drag drop operation.
+            </summary>
+            
+            <remarks>
+            The <see cref="T:GongSolutions.Wpf.DragDrop.DragInfo"/> class holds all of the framework's information about the source
+            of a drag. It is used by <see cref="M:GongSolutions.Wpf.DragDrop.IDragSource.StartDrag(GongSolutions.Wpf.DragDrop.DragInfo)"/> to determine whether a drag 
+            can start, and what the dragged data should be.
+            </remarks>
+        </member>
+        <member name="M:GongSolutions.Wpf.DragDrop.DragInfo.#ctor(System.Object,System.Windows.Input.MouseButtonEventArgs)">
+            <summary>
+            Initializes a new instance of the DragInfo class.
+            </summary>
+            
+            <param name="sender">
+            The sender of the mouse event that initiated the drag.
+            </param>
+            
+            <param name="e">
+            The mouse event that initiated the drag.
+            </param>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Data">
+            <summary>
+            Gets or sets the drag data.
+            </summary>
+            
+            <remarks>
+            This must be set by a drag handler in order for a drag to start.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.DragStartPosition">
+            <summary>
+            Gets the position of the click that initiated the drag, relative to <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/>.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.Effects">
+            <summary>
+            Gets or sets the allowed effects for the drag.
+            </summary>
+            
+            <remarks>
+            This must be set to a value other than <see cref="F:System.Windows.DragDropEffects.None"/> by a drag handler in order 
+            for a drag to start.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.MouseButton">
+            <summary>
+            Gets the mouse button that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceCollection">
+            <summary>
+            Gets the collection that the source ItemsControl is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItem">
+            <summary>
+            Gets the object that a dragged item is bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be null.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.SourceItems">
+            <summary>
+            Gets a collection of objects that the selected items in an ItemsControl are bound to.
+            </summary>
+            
+            <remarks>
+            If the control that initated the drag is unbound or not an ItemsControl, this will be empty.
+            </remarks>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource">
+            <summary>
+            Gets the control that initiated the drag.
+            </summary>
+        </member>
+        <member name="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSourceItem">
+            <summary>
+            Gets the item in an ItemsControl that started the drag.
+            </summary>
+            
+            <remarks>
+            If the control that initiated the drag is an ItemsControl, this property will hold the item
+            container of the clicked item. For example, if <see cref="P:GongSolutions.Wpf.DragDrop.DragInfo.VisualSource"/> is a ListBox this
+            will hold a ListBoxItem.
+            </remarks>
+        </member>
+    </members>
+</doc>

HandBrake-0.9.8.tar.bz2/win/CS/libraries/WPFDragDrop/GongSolutions.Wpf.DragDrop.dll Added

handbrake-rpmlintrc Changed

Changes of Revision 5