OSDN Git Service

import 0.9.4
[handbrake-jp/handbrake-jp.git] / test / test.c
index 59cf0eb..ad21868 100644 (file)
@@ -9,11 +9,20 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
+#include <inttypes.h>
+
+#if defined( __MINGW32__ )
+#include <conio.h>
+#endif
+
+#if defined( PTW32_STATIC_LIB )
+#include <pthread.h>
+#endif
 
 #include "hb.h"
 #include "parsecsv.h"
 
-#ifdef __APPLE_CC__
+#if defined( __APPLE_CC__ )
 #import <CoreServices/CoreServices.h>
 #include <IOKit/IOKitLib.h>
 #include <IOKit/storage/IOMedia.h>
 #endif
 
 /* Options */
-static int    debug       = HB_DEBUG_NONE;
+static int    debug       = HB_DEBUG_ALL;
 static int    update      = 0;
+static int    dvdnav      = 1;
 static char * input       = NULL;
 static char * output      = NULL;
 static char * format      = NULL;
 static int    titleindex  = 1;
 static int    longest_title = 0;
-static int    subtitle_scan = 0;
-static int    subtitle_force = 0;
 static char * native_language = NULL;
+static int    native_dub  = 0;
 static int    twoPass     = 0;
 static int    deinterlace           = 0;
 static char * deinterlace_opt       = 0;
@@ -57,9 +66,18 @@ static char * abitrates   = NULL;
 static char * acodecs     = NULL;
 static char * anames      = NULL;
 static int    default_acodec = HB_ACODEC_FAAC;
-static int    default_arate = 48000;
 static int    default_abitrate = 160;
-static int    sub         = 0;
+static int    audio_explicit = 0;
+static char ** subtracks   = NULL;
+static char ** subforce    = NULL;
+static char * subburn     = NULL;
+static char * subdefault  = NULL;
+static char ** srtfile     = NULL;
+static char ** srtcodeset  = NULL;
+static char ** srtoffset   = NULL;
+static char ** srtlang     = NULL;
+static int     srtdefault  = -1;
+static int    subtitle_scan = 0;
 static int    width       = 0;
 static int    height      = 0;
 static int    crop[4]     = { -1,-1,-1,-1 };
@@ -69,22 +87,24 @@ static float  vquality    = -1.0;
 static int    vbitrate    = 0;
 static int    size        = 0;
 static int    mux         = 0;
-static int    pixelratio  = 0;
-static int    loosePixelratio = 0;
+static int    anamorphic_mode  = 0;
 static int    modulus       = 0;
 static int    par_height    = 0;
 static int    par_width     = 0;
+static int    display_width = 0;
+static int    keep_display_aspect = 0;
+static int    itu_par       = 0;
+static int    angle = 0;
 static int    chapter_start = 0;
 static int    chapter_end   = 0;
 static int    chapter_markers = 0;
 static char * marker_file   = NULL;
-static int       crf                   = 1;
 static char      *x264opts             = NULL;
 static char      *x264opts2    = NULL;
 static int       maxHeight             = 0;
 static int       maxWidth              = 0;
 static int    turbo_opts_enabled = 0;
-static char * turbo_opts = "ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
+static char * turbo_opts = "ref=1:subme=2:me=dia:analyse=none:trellis=0:no-fast-pskip=0:8x8dct=0:weightb=0";
 static int    largeFileSize = 0;
 static int    preset        = 0;
 static char * preset_name   = 0;
@@ -92,6 +112,13 @@ static int    cfr           = 0;
 static int    mp4_optimize  = 0;
 static int    ipod_atom     = 0;
 static int    color_matrix  = 0;
+static int    preview_count = 10;
+static int    store_previews = 0;
+static int    start_at_preview = 0;
+static int64_t stop_at_pts    = 0;
+static int    stop_at_frame = 0;
+static char * stop_at_string = NULL;
+static char * stop_at_token = NULL;
 
 /* Exit cleanly on Ctrl-C */
 static volatile int die = 0;
@@ -114,7 +141,7 @@ static char* bsd_name_for_path(char *path);
 static int device_is_dvd(char *device);
 static io_service_t get_iokit_service( char *device );
 static int is_dvd_service( io_service_t service );
-static is_whole_media_service( io_service_t service );
+static int is_whole_media_service( io_service_t service );
 #endif
 
 /* Only print the "Muxing..." message once */
@@ -137,6 +164,14 @@ int main( int argc, char ** argv )
     int           build;
     char        * version;
 
+/* win32 _IOLBF (line-buffering) is the same as _IOFBF (full-buffering).
+ * force it to unbuffered otherwise informative output is not easily parsed.
+ */
+#if defined( _WIN32 ) || defined( __MINGW32__ )
+    setvbuf( stdout, NULL, _IONBF, 0 );
+    setvbuf( stderr, NULL, _IONBF, 0 );
+#endif
+
     audios = hb_list_init();
 
     /* Parse command line */
@@ -146,15 +181,21 @@ int main( int argc, char ** argv )
         return 1;
     }
 
+#if defined( PTW32_STATIC_LIB )
+    pthread_win32_process_attach_np();
+    pthread_win32_thread_attach_np();
+#endif
+
     /* Register our error handler */
     hb_register_error_handler(&hb_cli_error_handler);
 
     /* Init libhb */
     h = hb_init( debug, update );
+    hb_dvd_set_dvdnav( dvdnav );
 
     /* Show version */
-    fprintf( stderr, "HandBrake %s (%d) - http://handbrake.fr/\n",
-             hb_get_version( h ), hb_get_build( h ) );
+    fprintf( stderr, "%s - %s - %s\n",
+             HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
     /* Check for update */
     if( update )
@@ -196,12 +237,35 @@ int main( int argc, char ** argv )
          */
         titleindex = 0;
     }
-    hb_scan( h, input, titleindex );
+
+    hb_scan( h, input, titleindex, preview_count, store_previews );
 
     /* Wait... */
     while( !die )
     {
-#if !defined(SYS_BEOS)
+#if defined( __MINGW32__ )
+        if( _kbhit() ) {
+            switch( _getch() )
+            {
+                case 0x03: /* ctrl-c */
+                case 'q':
+                    fprintf( stdout, "\nEncoding Quit by user command\n" );
+                    die = 1;
+                    break;
+                case 'p':
+                    fprintf( stdout, "\nEncoding Paused by user command, 'r' to resume\n" );
+                    hb_pause( h );
+                    break;
+                case 'r':
+                    hb_resume( h );
+                    break;
+                case 'h':
+                    ShowCommands();
+                    break;
+            }
+        }
+        hb_snooze( 200 );
+#elif !defined(SYS_BEOS)
         fd_set         fds;
         struct timeval tv;
         int            ret;
@@ -286,9 +350,15 @@ int main( int argc, char ** argv )
        if( x264opts ) free (x264opts );
        if( x264opts2 ) free (x264opts2 );
     if (preset_name) free (preset_name);
+    if( stop_at_string ) free( stop_at_string );
 
     fprintf( stderr, "HandBrake has exited.\n" );
 
+#if defined( PTW32_STATIC_LIB )
+    pthread_win32_thread_detach_np();
+    pthread_win32_process_detach_np();
+#endif
+
     return 0;
 }
 
@@ -304,7 +374,6 @@ static void ShowCommands()
 static void PrintTitleInfo( hb_title_t * title )
 {
     hb_chapter_t  * chapter;
-    hb_audio_config_t    * audio;
     hb_subtitle_t * subtitle;
     int i;
 
@@ -312,10 +381,14 @@ static void PrintTitleInfo( hb_title_t * title )
     fprintf( stderr, "  + vts %d, ttn %d, cells %d->%d (%d blocks)\n",
              title->vts, title->ttn, title->cell_start, title->cell_end,
              title->block_count );
+    if (dvdnav)
+        fprintf( stderr, "  + angle(s) %d\n", title->angle_count );
     fprintf( stderr, "  + duration: %02d:%02d:%02d\n",
              title->hours, title->minutes, title->seconds );
-    fprintf( stderr, "  + size: %dx%d, aspect: %.2f, %.3f fps\n",
+    fprintf( stderr, "  + size: %dx%d, pixel aspect: %d/%d, display aspect: %.2f, %.3f fps\n",
              title->width, title->height,
+             title->pixel_aspect_width,
+             title->pixel_aspect_height,
              (float) title->aspect,
              (float) title->rate / title->rate_base );
     fprintf( stderr, "  + autocrop: %d/%d/%d/%d\n", title->crop[0],
@@ -336,20 +409,29 @@ static void PrintTitleInfo( hb_title_t * title )
         audio = hb_list_audio_config_item( title->list_audio, i );
         if( ( audio->in.codec == HB_ACODEC_AC3 ) || ( audio->in.codec == HB_ACODEC_DCA) )
         {
-            fprintf( stderr, "    + %d, %s, %dHz, %dbps\n", i + 1,
-                     audio->lang.description, audio->in.samplerate, audio->in.bitrate );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s), %dHz, %dbps\n", 
+                     i + 1,
+                     audio->lang.description, 
+                     audio->lang.iso639_2,
+                     audio->in.samplerate, 
+                     audio->in.bitrate );
         }
         else
         {
-            fprintf( stderr, "    + %d, %s\n", i + 1, audio->lang.description );
+            fprintf( stderr, "    + %d, %s (iso639-2: %s)\n", 
+                     i + 1, 
+                     audio->lang.description,
+                     audio->lang.iso639_2 );
         }
     }
     fprintf( stderr, "  + subtitle tracks:\n" );
     for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
     {
         subtitle = hb_list_item( title->list_subtitle, i );
-        fprintf( stderr, "    + %d, %s (iso639-2: %s)\n", i + 1, subtitle->lang,
-            subtitle->iso639_2);
+        fprintf( stderr, "    + %d, %s (iso639-2: %s) (%s)\n", 
+                 i + 1, subtitle->lang,
+                 subtitle->iso639_2,
+                 (subtitle->format == TEXTSUB) ? "Text" : "Bitmap");
     }
 
     if(title->detected_interlacing)
@@ -360,6 +442,24 @@ static void PrintTitleInfo( hb_title_t * title )
 
 }
 
+static int test_sub_list( char ** list, char * needle, int pos )
+{
+    int i;
+
+    if ( list == NULL || needle == NULL )
+        return 0;
+
+    if ( list[0] == NULL && pos == 1 )
+        return 1;
+
+    for ( i = 0; list[i] != NULL; i++ )
+    {
+        if ( strcasecmp( list[i], needle ) == 0 )
+            return i + 1;
+    }
+    return 0;
+}
+
 static int HandleEvents( hb_handle_t * h )
 {
     hb_state_t s;
@@ -388,6 +488,7 @@ static int HandleEvents( hb_handle_t * h )
             hb_title_t * title;
             hb_job_t   * job;
             int i;
+            int sub_burned = 0;
 
             /* Audio argument string parsing variables */
             int acodec = 0;
@@ -406,8 +507,8 @@ static int HandleEvents( hb_handle_t * h )
                 die = 1;
                 break;
             }
-           if( longest_title )
-           {
+               if( longest_title )
+               {
                 int i;
                 int longest_title_idx=0;
                 int longest_title_pos=-1;
@@ -462,7 +563,7 @@ static int HandleEvents( hb_handle_t * h )
 
             PrintTitleInfo( title );
 
-            if( chapter_start && chapter_end )
+            if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame )
             {
                 job->chapter_start = MAX( job->chapter_start,
                                           chapter_start );
@@ -472,48 +573,62 @@ static int HandleEvents( hb_handle_t * h )
                                           job->chapter_end );
             }
 
+            if ( angle )
+            {
+                job->angle = angle;
+            }
+
             if (preset)
             {
                 fprintf( stderr, "+ Using preset: %s", preset_name);
 
                 if (!strcmp(preset_name, "Universal"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.589999973773956;
-                    job->crf = 1;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
                     }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
+                    }
                     if( !abitrates )
                     {
-                        abitrates = strdup("160,auto");
+                        abitrates = strdup("160,160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("48,Auto");
+                        mixdowns = strdup("dpl2,auto");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac,ac3");
+                        arates = strdup("48,Auto");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2,auto");
+                        dynamic_range_compression = strdup("0.0,0.0");
                     }
                     maxWidth = 720;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=30:cabac=0:ref=3:mixed-refs=1:analyse=all:me=umh:no-fast-pskip=1");
+                        x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6");
                     }
-                    pixelratio = 2;
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
                 }
 
                 if (!strcmp(preset_name, "iPod"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
                     job->vbitrate = 700;
@@ -521,537 +636,353 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         atracks = strdup("1");
                     }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("48");
+                        mixdowns = strdup("dpl2");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac");
+                        arates = strdup("48");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0");
                     }
                     maxWidth = 320;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
+                        x264opts = strdup("level=30:bframes=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");
                     }
                     job->chapter_markers = 1;
                 }
 
                 if (!strcmp(preset_name, "iPhone & iPod Touch"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.589999973773956;
-                    job->crf = 1;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1");
                     }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("128");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("48");
+                        mixdowns = strdup("dpl2");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac");
+                        arates = strdup("48");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0");
                     }
                     maxWidth = 480;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=30:cabac=0:ref=2:mixed-refs:analyse=all:me=umh:no-fast-pskip=1");
+                        x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0");
                     }
                     job->chapter_markers = 1;
                 }
 
                 if (!strcmp(preset_name, "AppleTV"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.589999973773956;
-                    job->crf = 1;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
                     }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("160,auto");
-                    }
-                    if( !arates )
-                    {
-                        arates = strdup("48,Auto");
-                    }
                     if( !acodecs )
                     {
                         acodecs = strdup("faac,ac3");
                     }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2,auto");
-                    }
-                    maxWidth = 960;
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("level=30:cabac=0:ref=3:mixed-refs=1:bframes=6:weightb=1:direct=auto:no-fast-pskip=1:me=umh:subq=7:analyse=all");
-                    }
-                    pixelratio = 2;
-                    job->chapter_markers = 1;
-                }
-
-                if (!strcmp(preset_name, "QuickTime"))
-                {
-                    mux = HB_MUX_MP4;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
                     if( !abitrates )
                     {
-                        abitrates = strdup("160");
-                    }
-                    if( !arates )
-                    {
-                        arates = strdup("Auto");
-                    }
-                    if( !acodecs )
-                    {
-                        acodecs = strdup("faac");
+                        abitrates = strdup("160,160");
                     }
                     if( !mixdowns )
                     {
-                        mixdowns = strdup("dpl2");
-                    }
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip=1:psy-rd=1,1");
-                    }
-                    pixelratio = 1;
-                    job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "AppleTV Legacy"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->largeFileSize = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1,1");
-                    }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("160,auto");
+                        mixdowns = strdup("dpl2,auto");
                     }
                     if( !arates )
                     {
                         arates = strdup("48,Auto");
                     }
-                    if( !acodecs )
+                    if( !dynamic_range_compression )
                     {
-                        acodecs = strdup("faac,ac3");
-                    }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2,auto");
+                        dynamic_range_compression = strdup("0.0,0.0");
                     }
+                    maxWidth = 960;
                     if( !x264opts )
                     {
-                        x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0");
+                        x264opts = strdup("cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0");
                     }
-                    pixelratio = 1;
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "iPhone Legacy"))
+                if (!strcmp(preset_name, "Normal"))
                 {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 960;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1");
                     }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("128");
-                    }
-                    if( !arates )
-                    {
-                        arates = strdup("48");
-                    }
                     if( !acodecs )
                     {
                         acodecs = strdup("faac");
                     }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2");
-                    }
-                    maxWidth = 480;
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1");
-                    }
-                    job->chapter_markers = 1;
-                }
-
-                if (!strcmp(preset_name, "iPod Legacy"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("48");
+                        mixdowns = strdup("dpl2");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac");
+                        arates = strdup("48");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 640;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
+                        x264opts = strdup("ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0");
                     }
+                    anamorphic_mode = 1;
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Normal"))
+                if (!strcmp(preset_name, "High Profile"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
-                        atracks = strdup("1");
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
                     }
                     if( !abitrates )
                     {
-                        abitrates = strdup("160");
+                        abitrates = strdup("160,160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("Auto");
+                        mixdowns = strdup("dpl2,auto");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac");
+                        arates = strdup("48,Auto");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0,0.0");
                     }
                     if( !x264opts )
                     {
-                        x264opts = strdup("ref=2:bframes=2:me=umh");
+                        x264opts = strdup("b-adapt=2:rc-lookahead=50");
                     }
-                    pixelratio = 1;
+                    detelecine = 1;
+                    decomb = 1;
+                    anamorphic_mode = 2;
                     job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
                 if (!strcmp(preset_name, "Classic"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
                     job->vbitrate = 1000;
                     if( !atracks )
                     {
                         atracks = strdup("1");
                     }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("160");
-                    }
-                    if( !arates )
-                    {
-                        arates = strdup("Auto");
-                    }
                     if( !acodecs )
                     {
                         acodecs = strdup("faac");
                     }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2");
-                    }
-                }
-
-                if (!strcmp(preset_name, "Animation"))
-                {
-                    mux = HB_MUX_MKV;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1000;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("160");
                     }
-                    if( !arates )
-                    {
-                        arates = strdup("Auto");
-                    }
-                    if( !acodecs )
-                    {
-                        acodecs = strdup("faac");
-                    }
                     if( !mixdowns )
                     {
                         mixdowns = strdup("dpl2");
                     }
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2:psy-rd=1,1:subme=9");
-                    }
-                    detelecine = 1;
-                    decomb = 1;
-                    pixelratio = 1;
-                    job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "Constant Quality Rate"))
-                {
-                    mux = HB_MUX_MKV;
-                    vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.600000023841858;
-                    job->crf = 1;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("auto");
-                    }
                     if( !arates )
                     {
-                        arates = strdup("Auto");
+                        arates = strdup("48");
                     }
-                    if( !acodecs )
+                    if( !dynamic_range_compression )
                     {
-                        acodecs = strdup("ac3");
+                        dynamic_range_compression = strdup("0.0");
                     }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("auto");
-                    }
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh:subme=9:psy-rd=1,1");
-                    }
-                    pixelratio = 1;
-                    job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Film"))
+                if (!strcmp(preset_name, "AppleTV Legacy"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
+                    job->vbitrate = 2500;
                     if( !atracks )
                     {
-                        atracks = strdup("1");
+                        atracks = strdup("1,1");
+                    }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac,ac3");
                     }
                     if( !abitrates )
                     {
-                        abitrates = strdup("auto");
+                        abitrates = strdup("160,160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("Auto");
+                        mixdowns = strdup("dpl2,auto");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("ac3");
+                        arates = strdup("48,Auto");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("auto");
+                        dynamic_range_compression = strdup("0.0,0.0");
                     }
                     if( !x264opts )
                     {
-                        x264opts = strdup("ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:no-fast-pskip:psy-rd=1,1");
+                        x264opts = strdup("ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0");
                     }
-                    pixelratio = 1;
+                    anamorphic_mode = 1;
                     job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Television"))
+                if (!strcmp(preset_name, "iPhone Legacy"))
                 {
-                    mux = HB_MUX_MKV;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1300;
+                    job->vbitrate = 960;
                     if( !atracks )
                     {
                         atracks = strdup("1");
                     }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("160");
-                    }
-                    if( !arates )
-                    {
-                        arates = strdup("Auto");
-                    }
                     if( !acodecs )
                     {
                         acodecs = strdup("faac");
                     }
-                    if( !mixdowns )
-                    {
-                        mixdowns = strdup("dpl2");
-                    }
-                    if( !x264opts )
-                    {
-                        x264opts = strdup("ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip=1:psy-rd=1,1");
-                    }
-                    detelecine = 1;
-                    decomb = 1;
-                    pixelratio = 1;
-                    job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "PSP"))
-                {
-                    mux = HB_MUX_MP4;
-                    job->vbitrate = 1024;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("128");
                     }
-                    if( !arates )
-                    {
-                        arates = strdup("48");
-                    }
-                    if( !acodecs )
-                    {
-                        acodecs = strdup("faac");
-                    }
                     if( !mixdowns )
                     {
                         mixdowns = strdup("dpl2");
                     }
-                    maxWidth = 368;
-                    maxHeight = 208;
-                    job->chapter_markers = 1;
-                }
-
-                if (!strcmp(preset_name, "PS3"))
-                {
-                    mux = HB_MUX_MP4;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    if( !atracks )
-                    {
-                        atracks = strdup("1");
-                    }
-                    if( !abitrates )
-                    {
-                        abitrates = strdup("160");
-                    }
                     if( !arates )
                     {
                         arates = strdup("48");
                     }
-                    if( !acodecs )
-                    {
-                        acodecs = strdup("faac");
-                    }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0");
                     }
-                    job->crop[0] = 0;
-                    job->crop[1] = 0;
-                    job->crop[2] = 0;
-                    job->crop[4] - 0;
+                    maxWidth = 480;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=41:me=umh");
+                        x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0");
                     }
-                    pixelratio = 1;
+                    job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Xbox 360"))
+                if (!strcmp(preset_name, "iPod Legacy"))
                 {
-                    mux = HB_MUX_MP4;
+                    if( !mux )
+                    {
+                        mux = HB_MUX_MP4;
+                    }
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2000;
+                    job->vbitrate = 1500;
                     if( !atracks )
                     {
                         atracks = strdup("1");
                     }
+                    if( !acodecs )
+                    {
+                        acodecs = strdup("faac");
+                    }
                     if( !abitrates )
                     {
                         abitrates = strdup("160");
                     }
-                    if( !arates )
+                    if( !mixdowns )
                     {
-                        arates = strdup("48");
+                        mixdowns = strdup("dpl2");
                     }
-                    if( !acodecs )
+                    if( !arates )
                     {
-                        acodecs = strdup("faac");
+                        arates = strdup("48");
                     }
-                    if( !mixdowns )
+                    if( !dynamic_range_compression )
                     {
-                        mixdowns = strdup("dpl2");
+                        dynamic_range_compression = strdup("0.0");
                     }
+                    maxWidth = 640;
                     if( !x264opts )
                     {
-                        x264opts = strdup("level=40:ref=2:mixed-refs:bframes=3:weightb:subme=9:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1");
-                    }
-                    pixelratio = 1;
+                        x264opts = strdup("level=30:bframes=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");
                     }
+                    job->chapter_markers = 1;
+                }
             }
 
                        if ( chapter_markers )
@@ -1129,38 +1060,13 @@ static int HandleEvents( hb_handle_t * h )
 
             job->deinterlace = deinterlace;
             job->grayscale   = grayscale;
-            if (loosePixelratio)
-            {
-                job->pixel_ratio = 2;
-                if (modulus)
-                {
-                    job->modulus = modulus;
-                }
-                if( par_width && par_height )
-                {
-                    job->pixel_ratio = 3;
-                    job->pixel_aspect_width = par_width;
-                    job->pixel_aspect_height = par_height;
-                }
-            }
-            else
-            {
-                job->pixel_ratio = pixelratio;
-            }
-
+            
             /* Add selected filters */
             job->filters = hb_list_init();
             if( detelecine )
             {
                 hb_filter_detelecine.settings = detelecine_opt;
                 hb_list_add( job->filters, &hb_filter_detelecine );
-                
-                if( !vrate )
-                {
-                    /* No framerate specified, so using same as source.
-                       That means VFR, so set detelecine up to drop frames. */
-                           job->vfr = 1;
-                }
             }
             if( decomb )
             {
@@ -1183,31 +1089,151 @@ static int HandleEvents( hb_handle_t * h )
                 hb_list_add( job->filters, &hb_filter_denoise );
             }
 
-            if( width && height )
+            switch( anamorphic_mode )
             {
-                job->width  = width;
-                job->height = height;
-            }
-            else if( width )
-            {
-                job->width = width;
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
-            }
-            else if( height && !loosePixelratio)
-            {
-                job->height = height;
-                hb_fix_aspect( job, HB_KEEP_HEIGHT );
-            }
-            else if( !width && !height && !pixelratio && !loosePixelratio )
-            {
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
-            }
-            else if (!width && loosePixelratio)
-            {
-                /* Default to full width when one isn't specified for loose anamorphic */
-                job->width = title->width - job->crop[2] - job->crop[3];
-                /* The height will be thrown away in hb.c but calculate it anyway */
-                hb_fix_aspect( job, HB_KEEP_WIDTH );
+                case 0: // Non-anamorphic
+                    
+                    if( width && height )
+                    {
+                        job->width  = width;
+                        job->height = height;
+                    }
+                    else if( width )
+                    {
+                        job->width = width;
+                        hb_fix_aspect( job, HB_KEEP_WIDTH );
+                    }
+                    else if( height )
+                    {
+                        job->height = height;
+                        hb_fix_aspect( job, HB_KEEP_HEIGHT );
+                    }
+                    else if( !width && !height )
+                    {
+                        hb_fix_aspect( job, HB_KEEP_WIDTH );
+                    }
+
+                break;
+                
+                case 1: // Strict anammorphic
+                    job->anamorphic.mode = anamorphic_mode;
+                break;
+                
+                case 2: // Loose anamorphic
+                    job->anamorphic.mode = 2;
+                    
+                    if (modulus)
+                    {
+                        job->anamorphic.modulus = modulus;
+                    }
+                    
+                    if( itu_par )
+                    {
+                        job->anamorphic.itu_par = itu_par;
+                    }
+                    
+                    if( width )
+                    {
+                        job->width = width;
+                    }
+                    else if( !width && !height )
+                    {
+                        /* Default to full width when one isn't specified for loose anamorphic */
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                    }
+                    
+                break;
+                
+                case 3: // Custom Anamorphic 3: Power User Jamboree 
+                    job->anamorphic.mode = 3;
+                    
+                    if (modulus)
+                    {
+                        job->anamorphic.modulus = modulus;
+                    }
+                    
+                    if( itu_par )
+                    {
+                        job->anamorphic.itu_par = itu_par;
+                    }
+                    
+                    if( par_width && par_height )
+                    {
+                        job->anamorphic.par_width = par_width;
+                        job->anamorphic.par_height = par_height;
+                    }
+                    
+                    if( keep_display_aspect )
+                    {
+                        job->anamorphic.keep_display_aspect = 1;
+                        
+                        /* First, what *is* the display aspect? */
+                        int cropped_width = title->width - job->crop[2] - job->crop[3];
+                        int cropped_height = title->height - job->crop[0] - job->crop[1];
+                        
+                        /* XXX -- I'm assuming people want to keep the source
+                           display AR even though they might have already
+                           asked for ITU values instead. */
+                        float source_display_width = (float)cropped_width *
+                            (float)title->pixel_aspect_width / (float)title->pixel_aspect_height;
+                        float display_aspect = source_display_width / (float)cropped_height;
+                        /* When keeping display aspect, we have to rank some values
+                           by priority in order to consistently handle situations
+                           when more than one might be specified by default.
+                           
+                           * First off, PAR gets ignored. (err make this reality)
+                           * Height will be respected over all other settings,
+                           * If it isn't set, display_width will be followed.
+                           * If it isn't set, width will be followed.          */
+                        if( height )
+                        {
+                            /* We scale the display width to the new height */
+                            display_width = (int)( (double)height * display_aspect );
+                        }
+                        else if( display_width )
+                        {
+                            /* We scale the height to the new display width */
+                            height = (int)( (double)display_width / display_aspect );
+                        }
+                    }
+                    
+                    if( display_width )
+                    {
+                        /* Adjust the PAR to create the new display width
+                           from the default job width. */
+                        job->anamorphic.dar_width = display_width;
+                        
+                        job->anamorphic.dar_height = height ?
+                                                        height :
+                                                        title->height - job->crop[0] - job->crop[1];
+                    }
+                    
+                    if( width && height )
+                    {
+                        /* Use these storage dimensions */
+                        job->width  = width;
+                        job->height = height;
+                    }
+                    else if( width )
+                    {
+                        /* Use just this storage width */
+                        job->width = width;
+                        job->height = title->height - job->crop[0] - job->crop[1];
+                    }
+                    else if( height )
+                    {
+                        /* Use just this storage height. */
+                        job->height = height;
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                    }
+                    else if( !width && !height )
+                    {
+                        /* Assume source dimensions after cropping. */
+                        job->width = title->width - job->crop[2] - job->crop[3];
+                        job->height = title->height - job->crop[0] - job->crop[1];
+                    }
+                    
+                break;
             }
 
             if( vquality >= 0.0 && ( ( vquality <= 1.0 ) || ( vcodec == HB_VCODEC_X264 ) || (vcodec == HB_VCODEC_FFMPEG) ) )
@@ -1234,10 +1260,18 @@ static int HandleEvents( hb_handle_t * h )
             }
             if( vrate )
             {
-                job->cfr = 1;
+                job->cfr = cfr;
                 job->vrate = 27000000;
                 job->vrate_base = vrate;
             }
+            else if ( cfr )
+            {
+                // cfr or pfr flag with no rate specified implies
+                // use the title rate.
+                job->cfr = cfr;
+                job->vrate = title->rate;
+                job->vrate_base = title->rate_base;
+            }
 
             /* Grab audio tracks */
             if( atracks )
@@ -1292,8 +1326,59 @@ static int HandleEvents( hb_handle_t * h )
             }
 
             /* Parse audio tracks */
-            if( hb_list_count(audios) == 0 )
+            if( native_language && native_dub )
             {
+                if( hb_list_count( audios ) == 0 || !audio_explicit )
+                {
+                    for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+                    {
+                        char audio_lang[4];
+                        int track = i;
+                        
+                        audio = hb_list_audio_config_item( title->list_audio, i );
+                        
+                        strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                        
+                        if( strncasecmp( native_language, audio_lang, 
+                                         sizeof( audio_lang ) ) == 0 &&
+                            audio->lang.type != 3 && // Directors 1
+                            audio->lang.type != 4)   // Directors 2
+                        {
+                            /*
+                             * Matched an audio to our native language - use it.
+                             * Replace any existing audio tracks that a preset may
+                             * have put here.
+                             */
+                            if( hb_list_count(audios) == 0) {
+                                audio = calloc(1, sizeof(*audio));
+                                hb_audio_config_init(audio);
+                                audio->in.track = track;
+                                audio->out.track = num_audio_tracks++;
+                                /* Add it to our audios */
+                                hb_list_add(audios, audio);
+                            } else {
+                                /*
+                                 * Update the track numbers on what is already in
+                                 * there.
+                                 */
+                                for( i=0; i < hb_list_count( audios ); i++ )
+                                {
+                                    audio = hb_list_item( audios, i );
+
+                                    audio->in.track = track;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    fprintf( stderr, "Warning: Native language (dubbing) selection ignored since an audio track has already been selected\n");
+                }
+            }
+
+            if( hb_list_count(audios) == 0 &&
+                hb_list_count(job->title->list_audio) > 0 )
+            {        
                 /* Create a new audio track with default settings */
                 audio = calloc(1, sizeof(*audio));
                 hb_audio_config_init(audio);
@@ -1607,14 +1692,223 @@ static int HandleEvents( hb_handle_t * h )
                          job->vbitrate );
             }
 
-            if( sub )
+            if( subtracks )
             {
-                job->subtitle = sub - 1;
+                char * token;
+                int    i, pos;
+
+                pos = 0;
+                for ( i = 0; subtracks[i] != NULL; i++ )
+                {
+                    pos++;
+                    token = subtracks[i];
+                    if( strcasecmp(token, "scan" ) == 0 )
+                    {
+                        int burn = 0, force = 0, def = 0;
+
+                        if ( subburn != NULL )
+                        {
+                            burn = ( pos == 1 && subburn[0] == 0 ) ||
+                                   ( strcmp( "scan", subburn ) == 0 );
+                        }
+                        if ( subdefault != NULL )
+                        {
+                            def =  ( pos == 1 && subdefault[0] == 0 ) ||
+                                   ( strcmp( "scan", subdefault ) == 0 );
+                        }
+                        force = test_sub_list( subforce, "scan", pos );
+
+                        if ( !burn && mux == HB_MUX_MKV )
+                        {
+                            job->select_subtitle_config.dest = PASSTHRUSUB;
+                        }
+                        else if ( burn )
+                        {
+                            if ( sub_burned )
+                            {
+                                continue;
+                            }
+                            sub_burned = 1;
+                        }
+                        if ( !( !burn && mux == HB_MUX_MP4 ) )
+                        {
+                            job->select_subtitle_config.force = force;
+                            job->select_subtitle_config.default_track = def;
+                            subtitle_scan = 1;
+                        } else {
+                            fprintf( stderr, "Warning: Subtitle Scan for MP4 requires the '--subtitle-burn' option to be selected\n");
+                        }
+                    }
+                    else
+                    {
+                        hb_subtitle_t        * subtitle;
+                        hb_subtitle_config_t   sub_config;
+                        int                    track;
+                        int                    burn = 0, force = 0, def = 0;
+
+                        track = atoi(token) - 1;
+                        subtitle = hb_list_item(title->list_subtitle, track);
+                        if( subtitle == NULL ) 
+                        {
+                            fprintf( stderr, "Warning: Could not find subtitle track %d, skipped\n", track+1 );
+                            continue;
+                        }
+                        sub_config = subtitle->config;
+
+                        if ( subburn != NULL )
+                        {
+                            burn = ( pos == 1 && subburn[0] == 0 ) ||
+                                   ( strcmp( token, subburn ) == 0 );
+                        }
+                        if ( subdefault != NULL )
+                        {
+                            def =  ( pos == 1 && subdefault[0] == 0 ) ||
+                                   ( strcmp( token, subdefault ) == 0 );
+                        }
+
+                        force = test_sub_list(subforce, token, pos);
+
+                        if ( !burn && mux == HB_MUX_MKV && 
+                             subtitle->format == PICTURESUB)
+                        {
+                            sub_config.dest = PASSTHRUSUB;
+                        }
+                        else if (!burn && mux == HB_MUX_MP4 &&
+                             subtitle->format == PICTURESUB)
+                        {
+                            // Skip any non-burned vobsubs when output is mp4
+                            fprintf( stderr, "Warning: Skipping subtitle track %d, can't pass-through VOBSUBs in an MP4 container,\nadd '--subtitle-burn %d' to the command line\n", track+1, track+1 );
+                            continue;
+                        }
+                        else if ( burn && subtitle->format == PICTURESUB )
+                        {
+                            // Only allow one subtitle to be burned into video
+                            if ( sub_burned )
+                            {
+                                fprintf( stderr, "Warning: Skipping subtitle track %d, can't have more than one track burnt in\n", track+1 );
+                                continue;
+                            }
+                            sub_burned = 1;
+                        }
+                        sub_config.force = force;
+                        sub_config.default_track = def;
+                        hb_subtitle_add( job, &sub_config, track );
+                    }
+                }
+            }
+
+            if( srtfile )
+            {
+                char * token;
+                int i, pos;
+                hb_subtitle_config_t sub_config;
+
+                pos = 0;
+                for( i=0; srtfile[i] != NULL; i++ )
+                {
+                    char *codeset = "L1";
+                    int64_t offset = 0;
+                    char *lang = "und";
+
+                    pos++;
+                    token = srtfile[i];
+                    if( srtcodeset && srtcodeset[i] )
+                    {
+                        codeset = srtcodeset[i];
+                    }
+                    if( srtoffset && srtoffset[i] )
+                    {
+                        offset = strtoll( srtoffset[i], &srtoffset[i], 0 );
+                    }
+                    if ( srtlang && srtlang[i] )
+                    {
+                        lang = srtlang[i];
+                    }
+                    sub_config.default_track = 
+                           ( srtdefault != -1 ) && ( srtdefault == i + 1 );
+                    sub_config.force = 0;
+                    strncpy( sub_config.src_filename, srtfile[i], 128);
+                    strncpy( sub_config.src_codeset, codeset, 40);
+                    sub_config.offset = offset;
+
+                    hb_srt_add( job, &sub_config, lang);
+                }
             }
 
             if( native_language )
             {
-                job->native_language = strdup( native_language );
+                char audio_lang[4];
+                
+                audio = hb_list_audio_config_item(job->list_audio, 0);
+                
+                if( audio ) 
+                {
+                    strncpy( audio_lang, audio->lang.iso639_2, sizeof( audio_lang ) );
+                    
+                    if( strncasecmp( native_language, audio_lang, 
+                                     sizeof( audio_lang ) ) != 0 )
+                    {
+                        /*
+                         * Audio language is not the same as our native language. 
+                         * If we have any subtitles in our native language they
+                         * should be selected here if they haven't already been.
+                         */
+                        hb_subtitle_t *subtitle, *subtitle2 = NULL;
+                        int matched_track = 0;
+
+                        for( i = 0; i < hb_list_count( title->list_subtitle ); i++ )
+                        {
+                            subtitle = hb_list_item( title->list_subtitle, i );
+                            matched_track = i;
+                            if( strcmp( subtitle->iso639_2, native_language ) == 0 )
+                            {  
+                                /*
+                                 * Found the first matching subtitle in our
+                                 * native language. Is it already selected?
+                                 */
+                                for( i = 0; i < hb_list_count( job->list_subtitle ); i++ )
+                                {
+                                    subtitle2 =  hb_list_item( job->list_subtitle, i );
+                                    
+                                    if( subtitle2->track == subtitle->track) {
+                                        /*
+                                         * Already selected
+                                         */
+                                        break;
+                                    }
+                                    subtitle2 = NULL;
+                                }
+                                
+                                if( subtitle2 == NULL ) 
+                                {
+                                    /*
+                                     * Not already selected, so select it.
+                                     */
+                                    hb_subtitle_config_t sub_config;
+
+                                    if( native_dub )
+                                    {
+                                        fprintf( stderr, "Warning: no matching audio for native language - using subtitles instead.\n");
+                                    }
+                                    sub_config = subtitle->config;
+
+                                    if( mux == HB_MUX_MKV || subtitle->format == TEXTSUB)
+                                    {
+                                        sub_config.dest = PASSTHRUSUB;
+                                    }
+
+                                    sub_config.force = 0;
+                                    sub_config.default_track = 1;
+                                    hb_subtitle_add( job, &sub_config, matched_track);
+                                }
+                                /*
+                                 * Stop searching.
+                                 */
+                                break;
+                            }
+                        }
+                    }
+                }
             }
 
             if( job->mux )
@@ -1637,11 +1931,6 @@ static int HandleEvents( hb_handle_t * h )
 
             job->file = strdup( output );
 
-            if( crf )
-            {
-                job->crf = 1;
-            }
-            
             if( color_matrix )
             {
                 job->color_matrix = color_matrix;
@@ -1660,11 +1949,24 @@ static int HandleEvents( hb_handle_t * h )
             if (maxHeight)
                 job->maxHeight = maxHeight;
 
-            if( subtitle_force )
+            if( start_at_preview )
             {
-                job->subtitle_force = subtitle_force;
+                job->start_at_preview = start_at_preview - 1;
+                job->seek_points = preview_count;
             }
-
+            
+            if( stop_at_pts )
+            {
+                job->pts_to_stop = stop_at_pts;
+                subtitle_scan = 0;
+            }
+            
+            if( stop_at_frame )
+            {
+                job->frame_to_stop = stop_at_frame;
+                subtitle_scan = 0;
+            }
+            
             if( subtitle_scan )
             {
                 char *x264opts_tmp;
@@ -1682,8 +1984,6 @@ static int HandleEvents( hb_handle_t * h )
                 job->indepth_scan = subtitle_scan;
                 fprintf( stderr, "Subtitle Scan Enabled - enabling "
                          "subtitles if found for foreign language segments\n");
-                job->select_subtitle = malloc(sizeof(hb_subtitle_t*));
-                *(job->select_subtitle) = NULL;
 
                 /*
                  * Add the pre-scan job
@@ -1700,10 +2000,6 @@ static int HandleEvents( hb_handle_t * h )
                  * for the first pass and then off again for the
                  * second.
                  */
-                hb_subtitle_t **subtitle_tmp = job->select_subtitle;
-
-                job->select_subtitle = NULL;
-
                 job->pass = 1;
 
                 job->indepth_scan = 0;
@@ -1745,8 +2041,6 @@ static int HandleEvents( hb_handle_t * h )
                 }
                 hb_add( h, job );
 
-                job->select_subtitle = subtitle_tmp;
-
                 job->pass = 2;
                 /*
                  * On the second pass we turn off subtitle scan so that we
@@ -1850,8 +2144,9 @@ void SigHandler( int i_signal )
 static void ShowHelp()
 {
     int i;
+    FILE* const out = stdout;
 
-    fprintf( stderr,
+    fprintf( out,
     "Syntax: HandBrakeCLI [options] -i <device> -o <file>\n"
     "\n"
     "### General Handbrake Options------------------------------------------------\n\n"
@@ -1863,6 +2158,8 @@ static void ShowHelp()
     "                            if the preset name has spaces, surround it with\n"
     "                            double quotation marks\n"
     "    -z, --preset-list       See a list of available built-in presets\n"
+    "        --no-dvdnav         Do not use dvdnav for reading DVDs\n"
+    "                            (experimental, enabled by default for testing)\n"
     "\n"
 
     "### Source Options-----------------------------------------------------------\n\n"
@@ -1873,11 +2170,18 @@ static void ShowHelp()
     "    -c, --chapters <string> Select chapters (e.g. \"1-3\" for chapters\n"
     "                            1 to 3, or \"3\" for chapter 3 only,\n"
     "                            default: all chapters)\n"
+    "        --angle <number>    Select the DVD angle\n"
+    "        --previews <#:B>    Select how many preview images are generated (max 30),\n"
+    "                            and whether or not they're stored to disk (0 or 1).\n"
+    "                            (default: 10:0)\n"
+    "    --start-at-preview <#>  Start encoding at a given preview.\n"
+    "    --stop-at     <unit:#>  Stop encoding at a given frame, duration (in seconds),\n"
+    "                            or pts (on a 90kHz clock)"
     "\n"
 
     "### Destination Options------------------------------------------------------\n\n"
     "    -o, --output <string>   Set output file name\n"
-    "    -f, --format <string>   Set output format (avi/mp4/ogm/mkv, default:\n"
+    "    -f, --format <string>   Set output format (mp4/mkv, default:\n"
     "                            autodetected from file name)\n"
     "    -m, --markers           Add chapter markers (mp4 and mkv output formats only)\n"
     "    -4, --large-file        Use 64-bit mp4 files that can hold more than\n"
@@ -1888,13 +2192,12 @@ static void ShowHelp()
 
 
     "### Video Options------------------------------------------------------------\n\n"
-    "    -e, --encoder <string>  Set video library encoder (ffmpeg,xvid,\n"
-    "                            x264,theora default: ffmpeg)\n"
+    "    -e, --encoder <string>  Set video library encoder (ffmpeg,x264,theora)\n"
+    "                            (default: ffmpeg)\n"
     "    -x, --x264opts <string> Specify advanced x264 options in the\n"
     "                            same style as mencoder:\n"
     "                            option1=value1:option2=value2\n"
     "    -q, --quality <float>   Set video quality (0.0..1.0)\n"
-    "    -Q, --cqp               Use with -q for CQP instead of CRF\n"
     "    -S, --size <MB>         Set target size\n"
     "    -b, --vb <kb/s>         Set video bitrate (default: 1000)\n"
     "    -2, --two-pass          Use two-pass mode\n"
@@ -1905,14 +2208,24 @@ static void ShowHelp()
     "    -r, --rate              Set video framerate (" );
     for( i = 0; i < hb_video_rates_count; i++ )
     {
-        fprintf( stderr, hb_video_rates[i].string );
+        fprintf( out, hb_video_rates[i].string );
         if( i != hb_video_rates_count - 1 )
-            fprintf( stderr, "/" );
+            fprintf( out, "/" );
     }
-    fprintf( stderr, ")\n"
+    fprintf( out, ")\n"
     "                            Be aware that not specifying a framerate lets\n"
     "                            HandBrake preserve a source's time stamps,\n"
     "                            potentially creating variable framerate video\n"
+    "    --vfr, --cfr, --pfr     Select variable, constant or peak-limited\n"
+    "                            frame rate control. VFR preserves the source\n"
+    "                            timing. CFR makes the output constant rate at\n"
+    "                            the rate given by the -r flag (or the source's\n"
+    "                            average rate if no -r is given). PFR doesn't\n"
+    "                            allow the rate to go over the rate specified\n"
+    "                            with the -r flag but won't change the source\n"
+    "                            timing if it's below that rate.\n"
+    "                            If none of these flags are given, the default\n"
+    "                            is --cfr when -r is given and --vfr otherwise\n"
 
     "\n"
     "### Audio Options-----------------------------------------------------------\n\n"
@@ -1920,11 +2233,22 @@ static void ShowHelp()
     "                            More than one output track can be used for one\n"
     "                            input.\n"
     "                            (\"none\" for no audio, \"1,2,3\" for multiple\n"
-    "                             tracks, default: first one)\n"
-    "    -E, --aencoder <string> Audio encoder(s) (faac/lame/vorbis/ac3) \n"
-    "                            ac3 meaning passthrough\n"
+    "                             tracks, default: first one)\n" );
+
+#ifdef __APPLE_CC__
+    fprintf( out,
+    "    -E, --aencoder <string> Audio encoder(s) (ca_aac/faac/lame/vorbis/ac3/dts) \n"
+    "                            ac3 and dts meaning passthrough\n"
+    "                            Separated by commas for more than one audio track.\n"
+    "                            (default: guessed)\n" );
+#else
+    fprintf( out,
+    "    -E, --aencoder <string> Audio encoder(s) (faac/lame/vorbis/ac3/dts) \n"
+    "                            ac3 and dts meaning passthrough\n"
     "                            Separated by commas for more than one audio track.\n"
-    "                            (default: guessed)\n"
+    "                            (default: guessed)\n" );
+#endif
+    fprintf( out,
     "    -B, --ab <kb/s>         Set audio bitrate(s)  (default: 160)\n"
     "                            Separated by commas for more than one audio track.\n"
     "    -6, --mixdown <string>  Format(s) for surround sound downmixing\n"
@@ -1933,11 +2257,11 @@ static void ShowHelp()
     "    -R, --arate             Set audio samplerate(s) (" );
     for( i = 0; i < hb_audio_rates_count; i++ )
     {
-        fprintf( stderr, hb_audio_rates[i].string );
+        fprintf( out, hb_audio_rates[i].string );
         if( i != hb_audio_rates_count - 1 )
-            fprintf( stderr, "/" );
+            fprintf( out, "/" );
     }
-    fprintf( stderr, " kHz)\n"
+    fprintf( out, " kHz)\n"
     "                            Separated by commas for more than one audio track.\n"
     "    -D, --drc <float>       Apply extra dynamic range compression to the audio,\n"
     "                            making soft sounds louder. Range is 1.0 to 4.0\n"
@@ -1953,11 +2277,23 @@ static void ShowHelp()
     "        --crop <T:B:L:R>    Set cropping values (default: autocrop)\n"
     "    -Y, --maxHeight <#>     Set maximum height\n"
     "    -X, --maxWidth <#>      Set maximum width\n"
-    "    -p, --pixelratio        Store pixel aspect ratio in video stream\n"
-    "    -P, --loosePixelratio   Store pixel aspect ratio with specified width\n"
-    "          <MOD:PARX:PARY>   Takes as optional arguments what number you want\n"
-    "                            the dimensions to divide cleanly by (default 16)\n"
-    "                            and the pixel ratio to use (default autodetected)\n"
+    "    --strict-anamorphic     Store pixel aspect ratio in video stream\n"
+    "    --loose-anamorphic      Store pixel aspect ratio with specified width\n"
+    "    --custom-anamorphic     Store pixel aspect ratio in video stream and\n"
+    "                            directly control all parameters.\n"
+    "    --display-width         Set the width to scale the actual pixels to\n"
+    "      <number>              at playback, for custom anamorphic.\n"
+    "    --keep-display-aspect   Preserve the source's display aspect ratio\n"
+    "                            when using custom anamorphic\n"
+    "    --pixel-aspect          Set a custom pixel aspect for custom anamorphic\n"
+    "      <PARX:PARY>\n"
+    "                            (--display-width and --pixel-aspect are mutually\n"
+    "                             exclusive and the former will override the latter)\n"
+    "    --itu-par               Use wider, ITU pixel aspect values for loose and\n"
+    "                            custom anamorphic, useful with underscanned sources\n"
+    "    --modulus               Set the number you want the scaled pixel dimensions\n"
+    "      <number>              to divide cleanly by, for loose and custom\n"
+    "                            anamorphic modes (default: 16)\n"
     "    -M  --color-matrix      Set the color space signaled by the output\n"
     "          <601 or 709>      (Bt.601 is mostly for SD content, Bt.709 for HD,\n"
     "                             default: set by resolution)\n"
@@ -1970,12 +2306,13 @@ static void ShowHelp()
      "           or\n"
      "          <fast/slow/slower>\n"
      "    -5, --decomb            Selectively deinterlaces when it detects combing\n"
-     "          <MO:ME:MT:ST:BT:BX:BY>     (default: 1:2:6:9:80:16:16)\n"
+     "          <MO:ME:MT:ST:BT:BX:BY:MG:VA:LA:DI:ER:NO:MD:PP:FD>\n"
+     "          (default: 7:2:6:9:80:16:16:10:20:20:4:2:50:24:1:-1)\n"
      "    -9, --detelecine        Detelecine (ivtc) video with pullup filter\n"
      "                            Note: this filter drops duplicate frames to\n"
      "                            restore the pre-telecine framerate, unless you\n"
      "                            specify a constant framerate (--rate 29.97)\n"
-     "          <L:R:T:B:SB:MP>   (default 1:1:4:4:0:0)\n"
+     "          <L:R:T:B:SB:MP:FD>   (default 1:1:4:4:0:0:-1)\n"
      "    -8, --denoise           Denoise video with hqdn3d filter\n"
      "          <SL:SC:TL:TC>     (default 4:3:6:4.5)\n"
      "           or\n"
@@ -1986,21 +2323,59 @@ static void ShowHelp()
     "\n"
 
     "### Subtitle Options------------------------------------------------------------\n\n"
-    "    -s, --subtitle <number> Select subtitle (default: none)\n"
-    "    -U, --subtitle-scan     Scan for subtitles in an extra 1st pass, and choose\n"
-    "                            the one that's only used 10 percent of the time\n"
-    "                            or less. This should locate subtitles for short\n"
-    "                            foreign language segments. Best used in conjunction\n"
-    "                            with --subtitle-forced.\n"
+    "    -s, --subtitle <string> Select subtitle track(s), separated by commas\n"
+    "                            More than one output track can be used for one\n"
+    "                            input.\n"
+    "                            (\"1,2,3\" for multiple tracks.\n"
+    "                            A special track name \"scan\" adds an extra 1st pass.\n"
+    "                            This extra pass scans subtitles matching the\n"
+    "                            language of the first audio or the language \n"
+    "                            selected by --native-language.\n"
+    "                            The one that's only used 10 percent of the time\n"
+    "                            or less is selected. This should locate subtitles\n"
+    "                            for short foreign language segments. Best used in\n"
+    "                            conjunction with --subtitle-forced.\n"
     "    -F, --subtitle-forced   Only display subtitles from the selected stream if\n"
-    "                            the subtitle has the forced flag set. May be used in\n"
-    "                            conjunction with --subtitle-scan to auto-select\n"
+    "          <string>          the subtitle has the forced flag set. May be used in\n"
+    "                            conjunction with \"scan\" track to auto-select\n"
     "                            a stream if it contains forced subtitles.\n"
-    "    -N, --native-language   Select subtitles with this language if it does not\n"
-    "          <string>          match the Audio language. Provide the language's\n"
-    "                            iso639-2 code (fre, eng, spa, dut, et cetera)\n"
-
-
+    "                            Separated by commas for more than one audio track.\n"
+    "                            (\"1,2,3\" for multiple tracks.\n"
+    "                            If \"string\" is omitted, the first trac is forced.\n"
+    "        --subtitle-burn     \"Burn\" the selected subtitle into the video track\n"
+    "          <number>          If \"number\" is omitted, the first trac is burned.\n"
+    "        --subtitle-default  Flag the selected subtitle as the default subtitle\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
+    "                            means no subtitle will be automatically displayed\n"
+    "                            If \"number\" is omitted, the first trac is default.\n"
+    "    -N, --native-language   Specifiy the your language preference. When the first\n"
+    "          <string>          audio track does not match your native language then\n"
+    "                            select the first subtitle that does. When used in\n"
+    "                            conjunction with --native-dub the audio track is\n"
+    "                            changed in preference to subtitles. Provide the\n"
+    "                            language's iso639-2 code (fre, eng, spa, dut, et cetera)\n"
+    "        --native-dub        Used in conjunction with --native-language\n"
+    "                            requests that if no audio tracks are selected the\n"
+    "                            default selected audio track will be the first one\n"
+    "                            that matches the --native-language. If there are no\n"
+    "                            matching audio tracks then the first matching\n"
+    "                            subtitle track is used instead.\n"
+    "        --srt-file <string> SubRip SRT filename(s), separated by commas.\n"
+    "        --srt-codeset       Character codeset(s) that the SRT file(s) are\n"
+    "          <string>          encoded in, separted by commas.\n"
+    "                            Use 'iconv -l' for a list of valid\n"
+    "                            codesets. If not specified latin1 is assumed\n"
+    "        --srt-offset        Offset in milli-seconds to apply to the SRT file(s)\n"
+    "          <string>          separted by commas. If not specified zero is assumed.\n"
+    "                            Offsets may be negative.\n"
+    "        --srt-lang <string> Language as an iso639-2 code fra, eng, spa et cetera)\n"
+    "                            for the SRT file(s) separated by commas. If not specified\n"
+    "                            then 'und' is used.\n"
+    "        --srt-default       Flag the selected srt as the default subtitle\n"
+    "          <number>          to be displayed upon playback.  Setting no default\n"
+    "                            means no subtitle will be automatically displayed\n"
+    "                            If \"number\" is omitted, the first srt is default.\n"
+    "                            \"number\" is an 1 based index into the srt-file list\n"
     "\n"
 
 
@@ -2014,58 +2389,83 @@ static void ShowPresets()
 {
     printf("\n< Apple\n");
 
-    printf("\n   + Universal:  -e x264  -q 0.589999973773956 -a 1,1 -E faac,ac3 -B 160,auto -R 48,Auto -6 dpl2,auto -f mp4 -X 720 -P -m -x level=30:cabac=0:ref=3:mixed-refs=1:analyse=all:me=umh:no-fast-pskip=1\n");
-
-    printf("\n   + iPod:  -e x264  -b 700 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
-
-    printf("\n   + iPhone & iPod Touch:  -e x264  -q 0.589999973773956 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -X 480 -m -x level=30:cabac=0:ref=2:mixed-refs:analyse=all:me=umh:no-fast-pskip=1\n");
+    printf("\n   + Universal:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:8x8dct=0:trellis=0:subme=6\n");
 
-    printf("\n   + AppleTV:  -e x264  -q 0.589999973773956 -a 1,1 -E faac,ac3 -B 160,auto -R 48,Auto -6 dpl2,auto -f mp4 -4 -X 960 -P -m -x level=30:cabac=0:ref=3:mixed-refs=1:bframes=6:weightb=1:direct=auto:no-fast-pskip=1:me=umh:subq=7:analyse=all\n");
+    printf("\n   + iPod:  -e x264  -b 700 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=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   + QuickTime:  -e x264  -b 1800 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4 -p -m -2 -T -x ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip=1:psy-rd=1,1\n");
+    printf("\n   + iPhone & iPod Touch:  -e x264  -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:subme=6:8x8dct=0:trellis=0\n");
 
-    printf("\n   << Legacy\n");
-
-    printf("\n      + AppleTV Legacy:  -e x264  -b 2500 -a 1,1 -E faac,ac3 -B 160,auto -R 48,Auto -6 dpl2,auto -f mp4 -4 -p -m -x bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n");
-
-    printf("\n      + iPhone Legacy:  -e x264  -b 960 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1\n");
-
-    printf("\n      + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -I -X 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
-
-    printf("\n   >>\n");
+    printf("\n   + AppleTV:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-adapt=2:weightb=0:trellis=0:weightp=0\n");
 
     printf("\n>\n");
 
-    printf("\n< Basic\n");
+    printf("\n< Regular\n");
 
-    printf("\n   + Normal:  -e x264  -b 1500 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4 -p -m -2 -T -x ref=2:bframes=2:me=umh\n");
+    printf("\n   + Normal:  -e x264  -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n");
 
-    printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4\n");
+    printf("\n   + High Profile:  -e x264  -q 20.0 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
 
     printf("\n>\n");
 
-    printf("\n< High Profile\n");
+    printf("\n< Legacy\n");
 
-    printf("\n   + Animation:  -e x264  -b 1000 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mkv --detelecine --decomb -p -m -2 -T -x ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2:psy-rd=1,1:subme=9\n");
+    printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4\n");
 
-    printf("\n   + Constant Quality Rate:  -e x264  -q 0.600000023841858 -a 1 -E ac3 -B 160 -R Auto -6 auto -f mkv -p -m -x ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh:subme=9:psy-rd=1,1\n");
+    printf("\n   + AppleTV Legacy:  -e x264  -b 2500 -a 1,1 -E faac,ac3 -B 160,160 -6 dpl2,auto -R 48,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
 
-    printf("\n   + Film:  -e x264  -b 1800 -a 1 -E ac3 -B 160 -R Auto -6 auto -f mkv -p -m -2 -T -x ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:no-fast-pskip:psy-rd=1,1\n");
+    printf("\n   + iPhone Legacy:  -e x264  -b 960 -a 1 -E faac -B 128 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:subme=6:8x8dct=0:trellis=0\n");
 
-    printf("\n   + Television:  -e x264  -b 1300 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mkv --detelecine --decomb -p -m -2 -T -x ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip=1:psy-rd=1,1\n");
+    printf("\n   + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=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");
+}
+
+static char * hb_strndup( char * str, int len )
+{
+       char * res;
+       int str_len = strlen( str );
+
+       res = malloc( len > str_len ? str_len + 1 : len + 1 );
+       strncpy( res, str, len );
+       res[len] = '\0';
+       return res;
+}
 
-    printf("\n< Gaming Consoles\n");
+static char** str_split( char *str, char delem )
+{
+    char *  pos;
+    char *  end;
+    char ** ret;
+    int     count, i;
 
-    printf("\n   + PSP:  -b 1024 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -X 368 -Y 208 -m\n");
+    if ( str == NULL || str[0] == 0 )
+    {
+        ret = malloc( sizeof(char*) );
+        *ret = NULL;
+        return ret;
+    }
 
-    printf("\n   + PS3:  -e x264  -b 2500 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 --crop 0:0:0:0 -p -x level=41:me=umh\n");
+    // Find number of elements in the string
+    count = 1;
+    pos = str;
+    while ( ( pos = strchr( pos, delem ) ) != NULL )
+    {
+        count++;
+        pos++;
+    }
 
-    printf("\n   + Xbox 360:  -e x264  -b 2000 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -p -x level=40:ref=2:mixed-refs:bframes=3:weightb:subme=9:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1\n");
+    ret = calloc( ( count + 1 ), sizeof(char*) );
 
-    printf("\n>\n");
+    pos = str;
+    for ( i = 0; i < count - 1; i++ )
+    {
+        end = strchr( pos, delem );
+        ret[i] = hb_strndup(pos, end - pos);
+        pos = end + 1;
+    }
+    ret[i] = strdup(pos);
 
+    return ret;
 }
 
 /****************************************************************************
@@ -2073,6 +2473,25 @@ static void ShowPresets()
  ****************************************************************************/
 static int ParseOptions( int argc, char ** argv )
 {
+    
+    #define PREVIEWS            257
+    #define START_AT_PREVIEW    258
+    #define STOP_AT             259
+    #define ANGLE               260
+    #define DVDNAV              261
+    #define DISPLAY_WIDTH       262
+    #define PIXEL_ASPECT        263
+    #define MODULUS             264
+    #define KEEP_DISPLAY_ASPECT 265
+    #define SUB_BURNED          266
+    #define SUB_DEFAULT         267
+    #define NATIVE_DUB          268
+    #define SRT_FILE            269
+    #define SRT_CODESET         270
+    #define SRT_OFFSET          271
+    #define SRT_LANG            272
+    #define SRT_DEFAULT         273
+    
     for( ;; )
     {
         static struct option long_options[] =
@@ -2081,6 +2500,7 @@ static int ParseOptions( int argc, char ** argv )
             { "update",      no_argument,       NULL,    'u' },
             { "verbose",     optional_argument, NULL,    'v' },
             { "cpu",         required_argument, NULL,    'C' },
+            { "no-dvdnav",      no_argument,       NULL,    DVDNAV },
 
             { "format",      required_argument, NULL,    'f' },
             { "input",       required_argument, NULL,    'i' },
@@ -2092,15 +2512,22 @@ static int ParseOptions( int argc, char ** argv )
             { "title",       required_argument, NULL,    't' },
             { "longest",     no_argument,       NULL,    'L' },
             { "chapters",    required_argument, NULL,    'c' },
+            { "angle",       required_argument, NULL,    ANGLE },
             { "markers",     optional_argument, NULL,    'm' },
             { "audio",       required_argument, NULL,    'a' },
             { "mixdown",     required_argument, NULL,    '6' },
             { "drc",         required_argument, NULL,    'D' },
             { "subtitle",    required_argument, NULL,    's' },
-            { "subtitle-scan", no_argument,     NULL,    'U' },
-            { "subtitle-forced", no_argument,   NULL,    'F' },
+            { "subtitle-forced", optional_argument,   NULL,    'F' },
+            { "subtitle-burned", optional_argument,   NULL,    SUB_BURNED },
+            { "subtitle-default", optional_argument,   NULL,    SUB_DEFAULT },
+            { "srt-file",    required_argument, NULL, SRT_FILE },
+            { "srt-codeset", required_argument, NULL, SRT_CODESET },
+            { "srt-offset",  required_argument, NULL, SRT_OFFSET },
+            { "srt-lang",    required_argument, NULL, SRT_LANG },
+            { "srt-default",    optional_argument, NULL, SRT_DEFAULT },
             { "native-language", required_argument, NULL,'N' },
-
+            { "native-dub",  no_argument,       NULL,    NATIVE_DUB },
             { "encoder",     required_argument, NULL,    'e' },
             { "aencoder",    required_argument, NULL,    'E' },
             { "two-pass",    no_argument,       NULL,    '2' },
@@ -2110,8 +2537,14 @@ static int ParseOptions( int argc, char ** argv )
             { "detelecine",  optional_argument, NULL,    '9' },
             { "decomb",      optional_argument, NULL,    '5' },
             { "grayscale",   no_argument,       NULL,    'g' },
-            { "pixelratio",  no_argument,       NULL,    'p' },
-            { "loosePixelratio", optional_argument,   NULL,    'P' },
+            { "strict-anamorphic",  no_argument, &anamorphic_mode, 1 },
+            { "loose-anamorphic", no_argument, &anamorphic_mode, 2 },
+            { "custom-anamorphic", no_argument, &anamorphic_mode, 3 },
+            { "display-width", required_argument, NULL, DISPLAY_WIDTH },
+            { "keep-display-aspect", no_argument, &keep_display_aspect, 1 },
+            { "pixel-aspect", required_argument, NULL, PIXEL_ASPECT },
+            { "modulus",     required_argument, NULL, MODULUS },
+            { "itu-par",     no_argument,       &itu_par, 1  },
             { "width",       required_argument, NULL,    'w' },
             { "height",      required_argument, NULL,    'l' },
             { "crop",        required_argument, NULL,    'n' },
@@ -2122,7 +2555,6 @@ static int ParseOptions( int argc, char ** argv )
             { "ab",          required_argument, NULL,    'B' },
             { "rate",        required_argument, NULL,    'r' },
             { "arate",       required_argument, NULL,    'R' },
-            { "cqp",         no_argument,       NULL,    'Q' },
             { "x264opts",    required_argument, NULL,    'x' },
             { "turbo",       no_argument,       NULL,    'T' },
             { "maxHeight",   required_argument, NULL,    'Y' },
@@ -2132,7 +2564,12 @@ static int ParseOptions( int argc, char ** argv )
 
             { "aname",       required_argument, NULL,    'A' },
             { "color-matrix",required_argument, NULL,    'M' },
-
+            { "previews",    required_argument, NULL,    PREVIEWS },
+            { "start-at-preview", required_argument, NULL, START_AT_PREVIEW },
+            { "stop-at",    required_argument, NULL,     STOP_AT },
+            { "vfr",         no_argument,       &cfr,    0 },
+            { "cfr",         no_argument,       &cfr,    1 },
+            { "pfr",         no_argument,       &cfr,    2 },
             { 0, 0, 0, 0 }
           };
 
@@ -2140,7 +2577,7 @@ static int ParseOptions( int argc, char ** argv )
         int c;
 
                c = getopt_long( argc, argv,
-                                                "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UFN:e:E:2dD:7895gpOP::w:l:n:b:q:S:B:r:R:Qx:TY:X:Z:z",
+                                                "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UF::N:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:x:TY:X:Z:z",
                          long_options, &option_index );
         if( c < 0 )
         {
@@ -2149,6 +2586,9 @@ static int ParseOptions( int argc, char ** argv )
 
         switch( c )
         {
+            case 0:
+                /* option was handled entirely in getopt_long */
+                break;
             case 'h':
                 ShowHelp();
                 exit( 0 );
@@ -2176,26 +2616,28 @@ static int ParseOptions( int argc, char ** argv )
             case 'z':
                 ShowPresets();
                 exit ( 0 );
+            case DVDNAV:
+                dvdnav = 0;
+                break;
 
             case 'f':
                 format = strdup( optarg );
                 break;
             case 'i':
                 input = strdup( optarg );
-                #ifdef __APPLE_CC__
-                char *devName = bsd_name_for_path( input );
-                if( devName == NULL )
-                {
-                    break;
-                }
-                if( device_is_dvd( devName ) )
+#ifdef __APPLE_CC__
+                char *devName = bsd_name_for_path( input ); // alloc
+                if( devName )
                 {
-                    char *newInput = malloc( strlen("/dev/") + strlen( devName ) + 1);
-                    sprintf( newInput, "/dev/%s", devName );
-                    free(input);
-                    input = newInput;
+                    if( device_is_dvd( devName ))
+                    {
+                        free( input );
+                        input = malloc( strlen( "/dev/" ) + strlen( devName ) + 1 );
+                        sprintf( input, "/dev/%s", devName );
+                    }
+                    free( devName );
                 }
-                #endif
+#endif
                 break;
             case 'o':
                 output = strdup( optarg );
@@ -2237,6 +2679,9 @@ static int ParseOptions( int argc, char ** argv )
                 }
                 break;
             }
+            case ANGLE:
+                angle = atoi( optarg );
+                break;
             case 'm':
                 if( optarg != NULL )
                 {
@@ -2248,6 +2693,7 @@ static int ParseOptions( int argc, char ** argv )
                 if( optarg != NULL )
                 {
                     atracks = strdup( optarg );
+                    audio_explicit = 1;
                 }
                 else
                 {
@@ -2267,17 +2713,59 @@ static int ParseOptions( int argc, char ** argv )
                 }
                 break;
             case 's':
-                sub = atoi( optarg );
-                break;
-            case 'U':
-                subtitle_scan = 1;
+                subtracks = str_split( optarg, ',' );
                 break;
             case 'F':
-                subtitle_force = 1;
+                subforce = str_split( optarg, ',' );
+                break;
+            case SUB_BURNED:
+                if( optarg != NULL )
+                {
+                    subburn = strdup( optarg );
+                }
+                else
+                {
+                    subburn = "" ;
+                }
+                break;
+            case SUB_DEFAULT:
+                if( optarg != NULL )
+                {
+                    subdefault = strdup( optarg );
+                }
+                else
+                {
+                    subdefault = "" ;
+                }
                 break;
             case 'N':
                 native_language = strdup( optarg );
                 break;
+            case NATIVE_DUB:
+                native_dub = 1;
+                break;
+            case SRT_FILE:
+                srtfile = str_split( optarg, ',' );
+                break;
+            case SRT_CODESET:
+                srtcodeset = str_split( optarg, ',' );
+                break;
+            case SRT_OFFSET:
+                srtoffset = str_split( optarg, ',' );
+                break;
+            case SRT_LANG:
+                srtlang = str_split( optarg, ',' );
+                break;
+            case SRT_DEFAULT:
+                if( optarg != NULL )
+                {
+                    srtdefault = atoi( optarg );
+                }
+                else
+                {
+                    srtdefault = 1 ;
+                }
+                break;
             case '2':
                 twoPass = 1;
                 break;
@@ -2349,14 +2837,22 @@ static int ParseOptions( int argc, char ** argv )
             case 'g':
                 grayscale = 1;
                 break;
-            case 'p':
-                pixelratio = 1;
+            case DISPLAY_WIDTH:
+                if( optarg != NULL )
+                {
+                    sscanf( optarg, "%i", &display_width );
+                }
+                break;
+            case PIXEL_ASPECT:
+                if( optarg != NULL )
+                {
+                    sscanf( optarg, "%i:%i", &par_width, &par_height );
+                }
                 break;
-            case 'P':
-                loosePixelratio = 1;
+            case MODULUS:
                 if( optarg != NULL )
                 {
-                    sscanf( optarg, "%i:%i:%i", &modulus, &par_width, &par_height );
+                    sscanf( optarg, "%i", &modulus );
                 }
                 break;
             case 'e':
@@ -2364,10 +2860,6 @@ static int ParseOptions( int argc, char ** argv )
                 {
                     vcodec = HB_VCODEC_FFMPEG;
                 }
-                else if( !strcasecmp( optarg, "xvid" ) )
-                {
-                    vcodec = HB_VCODEC_XVID;
-                }
                 else if( !strcasecmp( optarg, "x264" ) )
                 {
                     vcodec = HB_VCODEC_X264;
@@ -2433,6 +2925,10 @@ static int ParseOptions( int argc, char ** argv )
                 {
                     fprintf( stderr, "invalid framerate %s\n", optarg );
                 }
+                else if ( cfr == 0 )
+                {
+                    cfr = 1;
+                }
                 break;
             }
             case 'R':
@@ -2456,9 +2952,6 @@ static int ParseOptions( int argc, char ** argv )
                     abitrates = strdup( optarg );
                 }
                 break;
-            case 'Q':
-                crf = 0;
-                break;
             case 'x':
                 x264opts = strdup( optarg );
                 break;
@@ -2477,6 +2970,32 @@ static int ParseOptions( int argc, char ** argv )
                     anames = strdup( optarg );
                 }
                 break;
+            case PREVIEWS:
+                sscanf( optarg, "%i:%i", &preview_count, &store_previews );
+                break;
+            case START_AT_PREVIEW:
+                start_at_preview = atoi( optarg );
+                break;
+            case STOP_AT:
+                stop_at_string = strdup( optarg );
+                stop_at_token = strtok( stop_at_string, ":");
+                if( !strcmp( stop_at_token, "frame" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    stop_at_frame = atoi(stop_at_token);
+                }
+                else if( !strcmp( stop_at_token, "pts" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    sscanf( stop_at_token, "%"SCNd64, &stop_at_pts );
+                }
+                else if( !strcmp( stop_at_token, "duration" ) )
+                {
+                    stop_at_token = strtok( NULL, ":");
+                    sscanf( stop_at_token, "%"SCNd64, &stop_at_pts );
+                    stop_at_pts *= 90000LL;
+                }
+                break;
             case 'M':
                 if( atoi( optarg ) == 601 )
                     color_matrix = 1;
@@ -2521,12 +3040,7 @@ static int CheckOptions( int argc, char ** argv )
             char * p = strrchr( output, '.' );
 
             /* autodetect */
-            if( p && !strcasecmp( p, ".avi" ) )
-            {
-                mux = HB_MUX_AVI;
-                default_acodec = HB_ACODEC_LAME;
-            }
-            else if( p && ( !strcasecmp( p, ".mp4" )  ||
+            if( p && ( !strcasecmp( p, ".mp4" )  ||
                             !strcasecmp( p, ".m4v" ) ) )
             {
                 if ( h264_30 == 1 )
@@ -2535,12 +3049,6 @@ static int CheckOptions( int argc, char ** argv )
                     mux = HB_MUX_MP4;
                 default_acodec = HB_ACODEC_FAAC;
             }
-            else if( p && ( !strcasecmp( p, ".ogm" ) ||
-                            !strcasecmp( p, ".ogg" ) ) )
-            {
-                mux = HB_MUX_OGM;
-                default_acodec = HB_ACODEC_VORBIS;
-            }
             else if( p && !strcasecmp(p, ".mkv" ) )
             {
                 mux = HB_MUX_MKV;
@@ -2553,11 +3061,6 @@ static int CheckOptions( int argc, char ** argv )
                 return 0;
             }
         }
-        else if( !strcasecmp( format, "avi" ) )
-        {
-            mux = HB_MUX_AVI;
-            default_acodec = HB_ACODEC_LAME;
-        }
         else if( !strcasecmp( format, "mp4" ) ||
                  !strcasecmp( format, "m4v" ) )
         {
@@ -2567,12 +3070,6 @@ static int CheckOptions( int argc, char ** argv )
                 mux = HB_MUX_MP4;
             default_acodec = HB_ACODEC_FAAC;
         }
-        else if( !strcasecmp( format, "ogm" ) ||
-                 !strcasecmp( format, "ogg" ) )
-        {
-            mux = HB_MUX_OGM;
-            default_acodec = HB_ACODEC_VORBIS;
-        }
         else if( !strcasecmp( format, "mkv" ) )
         {
             mux = HB_MUX_MKV;
@@ -2581,7 +3078,7 @@ static int CheckOptions( int argc, char ** argv )
         else
         {
             fprintf( stderr, "Invalid output format (%s). Possible "
-                     "choices are avi, mp4, m4v, ogm, ogg and mkv\n.", format );
+                     "choices are mp4, m4v and mkv\n.", format );
             return 1;
         }
     }
@@ -2611,6 +3108,12 @@ static int get_acodec_for_string( char *codec )
     {
         return HB_ACODEC_VORBIS;
     }
+#ifdef __APPLE__
+    else if( !strcasecmp( codec, "ca_aac") )
+    {
+        return HB_ACODEC_CA_AAC;
+    }
+#endif
     else
     {
         return -1;
@@ -2663,10 +3166,20 @@ static char* bsd_name_for_path(char *path)
         return NULL;
     }
 
-    // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the
-    // vMDeviceID field. It is actually a char * value. This is mentioned in the
-    // header CoreServices/CarbonCore/Files.h.
-    return volumeParms.vMDeviceID;
+    // A version 4 GetVolParmsInfoBuffer contains the BSD node name in the vMDeviceID field.
+    // It is actually a char * value. This is mentioned in the header CoreServices/CarbonCore/Files.h.
+    if( volumeParms.vMVersion < 4 )
+    {
+        return NULL;
+    }
+
+    // vMDeviceID might be zero as is reported with experimental ZFS (zfs-119) support in Leopard.
+    if( !volumeParms.vMDeviceID )
+    {
+        return NULL;
+    }
+
+    return strdup( volumeParms.vMDeviceID );
 }
 
 /****************************************************************************
@@ -2763,7 +3276,7 @@ static int is_dvd_service( io_service_t service )
  * The whole media object is indicated in the IORegistry by the presence of a
  * property with the key "Whole" and value "Yes".
  ****************************************************************************/
-static is_whole_media_service( io_service_t service )
+static int is_whole_media_service( io_service_t service )
 {
     int result = 0;