X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest.c;h=3273c5716fe08a49a023862c246689b813d0804b;hb=c593146bf3fab6290c71cbbb974e0a756e43f5e0;hp=8f8d272eb1dd1e96d948ea4159a8da1f757c8a52;hpb=52ff553450e83806c36a007f8dd2ed8a7c8b12ee;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/test.c b/test/test.c index 8f8d272e..3273c571 100644 --- a/test/test.c +++ b/test/test.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "hb.h" #include "parsecsv.h" @@ -55,6 +56,7 @@ static char * atracks = NULL; static char * arates = NULL; 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; @@ -87,10 +89,17 @@ static char * turbo_opts = "ref=1:subme=1:me=dia:analyse=none:trellis=0:no-fast- static int largeFileSize = 0; static int preset = 0; static char * preset_name = 0; -static int vfr = 0; 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; @@ -145,6 +154,11 @@ int main( int argc, char ** argv ) return 1; } +#ifdef 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); @@ -152,8 +166,8 @@ int main( int argc, char ** argv ) h = hb_init( debug, update ); /* 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 ) @@ -195,12 +209,13 @@ 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(SYS_BEOS) && !defined(__MINGW32__) fd_set fds; struct timeval tv; int ret; @@ -266,6 +281,10 @@ int main( int argc, char ** argv ) while( ( audio = hb_list_item( audios, 0 ) ) ) { hb_list_rem( audios, audio ); + if( audio->out.name ) + { + free( audio->out.name ); + } free( audio ); } hb_list_close( &audios ); @@ -276,13 +295,20 @@ int main( int argc, char ** argv ) if( arates ) free( arates ); if( abitrates ) free( abitrates ); if( acodecs ) free( acodecs ); + if( anames ) free( anames ); if (native_language ) free (native_language ); 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" ); +#ifdef PTW32_STATIC_LIB + pthread_win32_thread_detach_np(); + pthread_win32_process_detach_np(); +#endif + return 0; } @@ -310,7 +336,7 @@ static void PrintTitleInfo( hb_title_t * title ) title->hours, title->minutes, title->seconds ); fprintf( stderr, " + size: %dx%d, aspect: %.2f, %.3f fps\n", title->width, title->height, - (float) title->aspect / HB_ASPECT_BASE, + (float) title->aspect, (float) title->rate / title->rate_base ); fprintf( stderr, " + autocrop: %d/%d/%d/%d\n", title->crop[0], title->crop[1], title->crop[2], title->crop[3] ); @@ -357,6 +383,8 @@ static void PrintTitleInfo( hb_title_t * title ) static int HandleEvents( hb_handle_t * h ) { hb_state_t s; + int tmp_num_audio_tracks; + hb_get_state( h, &s ); switch( s.state ) { @@ -454,7 +482,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 ); @@ -468,232 +496,549 @@ static int HandleEvents( hb_handle_t * h ) { fprintf( stderr, "+ Using preset: %s", preset_name); - if (!strcmp(preset_name, "Animation")) + if (!strcmp(preset_name, "Universal")) { - mux = HB_MUX_MKV; + mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; - job->vbitrate = 1000; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2"); - deinterlace = 1; - deinterlace_opt = "0"; - job->chapter_markers = 1; - pixelratio = 1; - twoPass = 1; - turbo_opts_enabled = 1; - } - - if (!strcmp(preset_name, "AppleTV")) - { - if (!acodecs) + job->vquality = 0.589999973773956; + job->crf = 1; + 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 = 720; + if( !x264opts ) + { + x264opts = strdup("level=30:cabac=0:ref=3:mixed-refs=1:analyse=all:me=umh:no-fast-pskip=1"); + } + pixelratio = 2; + job->chapter_markers = 1; + } + if (!strcmp(preset_name, "iPod")) + { mux = HB_MUX_MP4; - job->largeFileSize = 1; + job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 2500; - default_abitrate = 160; - default_arate = 48000; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0"); + job->vbitrate = 700; + if( !atracks ) + { + atracks = strdup("1"); + } + if( !abitrates ) + { + abitrates = strdup("160"); + } + if( !arates ) + { + arates = strdup("48"); + } + if( !acodecs ) + { + acodecs = strdup("faac"); + } + if( !mixdowns ) + { + mixdowns = strdup("dpl2"); + } + 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"); + } job->chapter_markers = 1; - pixelratio = 1; } - if (!strcmp(preset_name, "Bedlam")) + if (!strcmp(preset_name, "iPhone & iPod Touch")) { - mux = HB_MUX_MKV; + mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; - job->vbitrate = 1800; - default_acodec = HB_ACODEC_AC3; - x264opts = strdup("ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1"); + job->vquality = 0.589999973773956; + job->crf = 1; + 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=2:mixed-refs:analyse=all:me=umh:no-fast-pskip=1"); + } job->chapter_markers = 1; - pixelratio = 1; - twoPass = 1; - turbo_opts_enabled = 1; } - if (!strcmp(preset_name, "Blind")) + if (!strcmp(preset_name, "AppleTV")) { mux = HB_MUX_MP4; - job->vbitrate = 512; - default_abitrate = 128; - default_acodec = HB_ACODEC_FAAC; - job->width = 512; + job->largeFileSize = 1; + vcodec = HB_VCODEC_X264; + job->vquality = 0.589999973773956; + job->crf = 1; + 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, "Broke")) + if (!strcmp(preset_name, "QuickTime")) { mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; - size = 695; - default_abitrate = 128; - default_acodec = HB_ACODEC_FAAC; - job->width = 640; - x264opts = strdup("ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip"); + job->vbitrate = 1800; + 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=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, "Classic")) + if (!strcmp(preset_name, "AppleTV Legacy")) { mux = HB_MUX_MP4; - job->vbitrate = 1000; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; + job->largeFileSize = 1; + vcodec = HB_VCODEC_X264; + job->vbitrate = 2500; + 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"); + } + if( !x264opts ) + { + x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0"); + } + pixelratio = 1; + job->chapter_markers = 1; } - if (!strcmp(preset_name, "Constant Quality Rate")) + if (!strcmp(preset_name, "iPhone Legacy")) { - mux = HB_MUX_MKV; + mux = HB_MUX_MP4; + job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vquality = 0.64709997177124023; - job->crf = 1; - default_acodec = HB_ACODEC_AC3; - x264opts = strdup("ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh"); + job->vbitrate = 960; + 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; - pixelratio = 1; } - if (!strcmp(preset_name, "Deux Six Quatre")) + if (!strcmp(preset_name, "iPod Legacy")) { - mux = HB_MUX_MKV; + mux = HB_MUX_MP4; + job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 1600; - default_acodec = HB_ACODEC_AC3; - x264opts = strdup("ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip"); + job->vbitrate = 1500; + if( !atracks ) + { + atracks = strdup("1"); + } + if( !abitrates ) + { + abitrates = strdup("160"); + } + if( !arates ) + { + arates = strdup("48"); + } + if( !acodecs ) + { + acodecs = strdup("faac"); + } + if( !mixdowns ) + { + mixdowns = strdup("dpl2"); + } + 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"); + } job->chapter_markers = 1; - pixelratio = 1; - twoPass = 1; - turbo_opts_enabled = 1; } - if (!strcmp(preset_name, "Film")) + if (!strcmp(preset_name, "Normal")) { - mux = HB_MUX_MKV; + mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; - job->vbitrate = 1800; - default_acodec = HB_ACODEC_AC3; - x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip"); - job->chapter_markers = 1; + job->vbitrate = 1500; + 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=2:bframes=2:me=umh"); + } pixelratio = 1; + job->chapter_markers = 1; twoPass = 1; turbo_opts_enabled = 1; } - if (!strcmp(preset_name, "iPhone / iPod Touch")) + if (!strcmp(preset_name, "Classic")) { mux = HB_MUX_MP4; - job->ipod_atom = 1; - vcodec = HB_VCODEC_X264; - job->vbitrate = 960; - default_abitrate = 128; - default_arate = 48000; - default_acodec = HB_ACODEC_FAAC; - job->width = 480; - x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1"); - job->chapter_markers = 1; + 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, "iPod High-Rez")) + if (!strcmp(preset_name, "Animation")) { - mux = HB_MUX_MP4; - job->ipod_atom = 1; + mux = HB_MUX_MKV; vcodec = HB_VCODEC_X264; - job->vbitrate = 1500; - default_abitrate = 160; - default_arate = 48000; - default_acodec = HB_ACODEC_FAAC; - job->width = 640; - x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1"); + 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, "iPod Low-Rez")) + if (!strcmp(preset_name, "Constant Quality Rate")) { - mux = HB_MUX_MP4; - job->ipod_atom = 1; + mux = HB_MUX_MKV; vcodec = HB_VCODEC_X264; - job->vbitrate = 700; - default_abitrate = 160; - default_arate = 48000; - default_acodec = HB_ACODEC_FAAC; - job->width = 320; - x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1"); + job->vquality = 0.600000023841858; + job->crf = 1; + if( !atracks ) + { + atracks = strdup("1"); + } + if( !abitrates ) + { + abitrates = strdup("auto"); + } + if( !arates ) + { + arates = strdup("Auto"); + } + if( !acodecs ) + { + acodecs = strdup("ac3"); + } + 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, "Normal")) + if (!strcmp(preset_name, "Film")) { - mux = HB_MUX_MP4; + mux = HB_MUX_MKV; vcodec = HB_VCODEC_X264; - job->vbitrate = 1500; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("ref=2:bframes=2:subme=5:me=umh"); - job->chapter_markers = 1; + job->vbitrate = 1800; + if( !atracks ) + { + atracks = strdup("1"); + } + if( !abitrates ) + { + abitrates = strdup("auto"); + } + if( !arates ) + { + arates = strdup("Auto"); + } + if( !acodecs ) + { + acodecs = strdup("ac3"); + } + if( !mixdowns ) + { + mixdowns = strdup("auto"); + } + 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"); + } pixelratio = 1; + job->chapter_markers = 1; twoPass = 1; turbo_opts_enabled = 1; } - if (!strcmp(preset_name, "PS3")) + if (!strcmp(preset_name, "Television")) { - mux = HB_MUX_MP4; + mux = HB_MUX_MKV; vcodec = HB_VCODEC_X264; - job->vbitrate = 2500; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("level=41:subme=5:me=umh"); + job->vbitrate = 1300; + 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; - default_abitrate = 128; - default_arate = 48000; - default_acodec = HB_ACODEC_FAAC; - job->width = 368; - job->height = 208; + 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, "QuickTime")) + if (!strcmp(preset_name, "PS3")) { mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; - job->vbitrate = 2000; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip"); - job->chapter_markers = 1; + 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 ) + { + mixdowns = strdup("dpl2"); + } + job->crop[0] = 0; + job->crop[1] = 0; + job->crop[2] = 0; + job->crop[4] - 0; + if( !x264opts ) + { + x264opts = strdup("level=41:me=umh"); + } pixelratio = 1; - twoPass = 1; - turbo_opts_enabled = 1; - } - - if (!strcmp(preset_name, "Television")) - { - mux = HB_MUX_MKV; - vcodec = HB_VCODEC_X264; - job->vbitrate = 1300; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip"); - deinterlace = 1; - deinterlace_opt = "0"; - denoise = 1; - denoise_opt = "2:1:2:3"; - job->chapter_markers = 1; - twoPass = 1; - turbo_opts_enabled = 1; } if (!strcmp(preset_name, "Xbox 360")) @@ -701,11 +1046,32 @@ static int HandleEvents( hb_handle_t * h ) mux = HB_MUX_MP4; vcodec = HB_VCODEC_X264; job->vbitrate = 2000; - default_abitrate = 160; - default_acodec = HB_ACODEC_FAAC; - x264opts = strdup("level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1"); + if( !atracks ) + { + atracks = strdup("1"); + } + if( !abitrates ) + { + abitrates = strdup("160"); + } + if( !arates ) + { + arates = strdup("48"); + } + if( !acodecs ) + { + acodecs = strdup("faac"); + } + if( !mixdowns ) + { + mixdowns = strdup("dpl2"); + } + 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; - } + } } if ( chapter_markers ) @@ -785,27 +1151,21 @@ static int HandleEvents( hb_handle_t * h ) job->grayscale = grayscale; if (loosePixelratio) { - job->pixel_ratio = 2; + job->anamorphic.mode = 2; if (modulus) { - job->modulus = modulus; + job->anamorphic.modulus = modulus; } if( par_width && par_height ) { - job->pixel_ratio = 3; - job->pixel_aspect_width = par_width; - job->pixel_aspect_height = par_height; + job->anamorphic.mode = 3; + job->anamorphic.par_width = par_width; + job->anamorphic.par_height = par_height; } } else { - job->pixel_ratio = pixelratio; - } - - if (vfr) - { - detelecine = 1; - job->vfr = 1; + job->anamorphic.mode = pixelratio; } /* Add selected filters */ @@ -814,6 +1174,13 @@ static int HandleEvents( hb_handle_t * h ) { 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 ) { @@ -954,8 +1321,8 @@ static int HandleEvents( hb_handle_t * h ) hb_list_add(audios, audio); } - num_audio_tracks = hb_list_count(audios); - for (i = 0; i < num_audio_tracks; i++) + tmp_num_audio_tracks = num_audio_tracks = hb_list_count(audios); + for (i = 0; i < tmp_num_audio_tracks; i++) { audio = hb_list_item(audios, 0); if( (audio == NULL) || (audio->in.track == -1) || @@ -965,13 +1332,22 @@ static int HandleEvents( hb_handle_t * h ) } else { - hb_audio_add( job, audio ); + if( hb_audio_add( job, audio ) == 0 ) + { + fprintf(stderr, "ERROR: Invalid audio input track '%u', exiting.\n", + audio->in.track + 1 ); + num_audio_tracks--; + exit(3); + } } hb_list_rem(audios, audio); if( audio != NULL) + if( audio->out.name ) + { + free( audio->out.name); + } free( audio ); } - /* Audio Tracks */ /* Audio Codecs */ i = 0; @@ -997,13 +1373,20 @@ static int HandleEvents( hb_handle_t * h ) hb_audio_config_t * last_audio = hb_list_audio_config_item( job->list_audio, i - 1 ); hb_audio_config_t audio; - fprintf(stderr, "More audio codecs than audio tracks, copying track %i and using encoder %s\n", - i, token); - hb_audio_config_init(&audio); - audio.in.track = last_audio->in.track; - audio.out.track = num_audio_tracks++; - audio.out.codec = acodec; - hb_audio_add(job, &audio); + if( last_audio ) + { + fprintf(stderr, "More audio codecs than audio tracks, copying track %i and using encoder %s\n", + i, token); + hb_audio_config_init(&audio); + audio.in.track = last_audio->in.track; + audio.out.track = num_audio_tracks++; + audio.out.codec = acodec; + hb_audio_add(job, &audio); + } + else + { + fprintf(stderr, "Audio codecs and no valid audio tracks, skipping codec %s\n", token); + } } token = strtok(NULL, ","); i++; @@ -1047,15 +1430,22 @@ static int HandleEvents( hb_handle_t * h ) } } - if (!is_sample_rate_valid(arate)) + if( audio != NULL ) { - fprintf(stderr, "Invalid sample rate %d, using input rate %d\n", arate, audio->in.samplerate); - arate = audio->in.samplerate; + if (!is_sample_rate_valid(arate)) + { + fprintf(stderr, "Invalid sample rate %d, using input rate %d\n", arate, audio->in.samplerate); + arate = audio->in.samplerate; + } + + audio->out.samplerate = arate; + if( (++i) >= num_audio_tracks ) + break; /* We have more inputs than audio tracks, oops */ + } + else + { + fprintf(stderr, "Ignoring sample rate %d, no audio tracks\n", arate); } - - audio->out.samplerate = arate; - if( (++i) >= num_audio_tracks ) - break; /* We have more inputs than audio tracks, oops */ token = strtok(NULL, ","); } } @@ -1085,9 +1475,17 @@ static int HandleEvents( hb_handle_t * h ) { abitrate = atoi(token); audio = hb_list_audio_config_item(job->list_audio, i); - audio->out.bitrate = abitrate; - if( (++i) >= num_audio_tracks ) - break; /* We have more inputs than audio tracks, oops */ + + if( audio != NULL ) + { + audio->out.bitrate = abitrate; + if( (++i) >= num_audio_tracks ) + break; /* We have more inputs than audio tracks, oops */ + } + else + { + fprintf(stderr, "Ignoring bitrate %d, no audio tracks\n", abitrate); + } token = strtok(NULL, ","); } } @@ -1118,9 +1516,16 @@ static int HandleEvents( hb_handle_t * h ) { d_r_c = atof(token); audio = hb_list_audio_config_item(job->list_audio, i); - audio->out.dynamic_range_compression = d_r_c; - if( (++i) >= num_audio_tracks ) - break; /* We have more inputs than audio tracks, oops */ + if( audio != NULL ) + { + audio->out.dynamic_range_compression = d_r_c; + if( (++i) >= num_audio_tracks ) + break; /* We have more inputs than audio tracks, oops */ + } + else + { + fprintf(stderr, "Ignoring drc, no audio tracks\n"); + } token = strtok(NULL, ","); } } @@ -1151,9 +1556,16 @@ static int HandleEvents( hb_handle_t * h ) { mixdown = hb_mixdown_get_mixdown_from_short_name(token); audio = hb_list_audio_config_item(job->list_audio, i); - audio->out.mixdown = mixdown; - if( (++i) >= num_audio_tracks ) - break; /* We have more inputs than audio tracks, oops */ + if( audio != NULL ) + { + audio->out.mixdown = mixdown; + if( (++i) >= num_audio_tracks ) + break; /* We have more inputs than audio tracks, oops */ + } + else + { + fprintf(stderr, "Ignoring mixdown, no audio tracks\n"); + } token = strtok(NULL, ","); } } @@ -1172,6 +1584,42 @@ static int HandleEvents( hb_handle_t * h ) } /* Audio Mixdown */ + /* Audio Track Names */ + i = 0; + if ( anames ) + { + char * token = strtok(anames, ","); + if (token == NULL) + token = anames; + while ( token != NULL ) + { + audio = hb_list_audio_config_item(job->list_audio, i); + if( audio != NULL ) + { + audio->out.name = strdup(token); + if( (++i) >= num_audio_tracks ) + break; /* We have more names than audio tracks, oops */ + } + else + { + fprintf(stderr, "Ignoring aname '%s', no audio track\n", + token); + } + token = strtok(NULL, ","); + } + } + if( i < num_audio_tracks && i == 1 ) + { + /* We have exactly one name and more than one audio track. Use the same + * name for all tracks. */ + for ( ; i < num_audio_tracks; i++) + { + audio = hb_list_audio_config_item(job->list_audio, i); + audio->out.name = strdup(anames); + } + } + /* Audio Track Names */ + if( size ) { job->vbitrate = hb_calc_bitrate( job, size ); @@ -1213,6 +1661,11 @@ static int HandleEvents( hb_handle_t * h ) { job->crf = 1; } + + if( color_matrix ) + { + job->color_matrix = color_matrix; + } if( x264opts != NULL && *x264opts != '\0' ) { @@ -1232,6 +1685,24 @@ static int HandleEvents( hb_handle_t * h ) job->subtitle_force = subtitle_force; } + if( start_at_preview ) + { + 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; @@ -1421,10 +1892,10 @@ static void ShowHelp() fprintf( stderr, "Syntax: HandBrakeCLI [options] -i -o \n" "\n" - "### General Handbrake Options------------------------------------------------\n\n" + "### General Handbrake Options------------------------------------------------\n\n" " -h, --help Print help\n" " -u, --update Check for updates and exit\n" - " -v, --verbose Be verbose\n" + " -v, --verbose <#> Be verbose (optional argument: logging level)\n" " -C, --cpu Set CPU count (default: autodetected)\n" " -Z. --preset Use a built-in preset. Capitalization matters, and\n" " if the preset name has spaces, surround it with\n" @@ -1432,56 +1903,50 @@ static void ShowHelp() " -z, --preset-list See a list of available built-in presets\n" "\n" - "### Source Options-----------------------------------------------------------\n\n" - " -i, --input Set input device\n" - " -t, --title Select a title to encode (0 to scan only,\n" + "### Source Options-----------------------------------------------------------\n\n" + " -i, --input Set input device\n" + " -t, --title Select a title to encode (0 to scan only,\n" " default: 1)\n" " -L, --longest Select the longest title\n" " -c, --chapters Select chapters (e.g. \"1-3\" for chapters\n" " 1 to 3, or \"3\" for chapter 3 only,\n" " default: all chapters)\n" - "\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 Stop encoding at a given frame, duration (in seconds),\n" + " or pts (on a 90kHz clock)" + "\n" - "### Destination Options------------------------------------------------------\n\n" + "### Destination Options------------------------------------------------------\n\n" " -o, --output Set output file name\n" - " -f, --format Set output format (avi/mp4/ogm/mkv, default:\n" + " -f, --format Set output format (avi/mp4/ogm/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" - " 4 GB. Note: Breaks iPod, @TV, PS3 compatibility.\n""" + " 4 GB. Note: Breaks iPod, PS3 compatibility.\n""" " -O, --optimize Optimize mp4 files for HTTP streaming\n" - " -I, --ipod-atom Mark mp4 files so iPods will accept them\n" + " -I, --ipod-atom Mark mp4 files so 5.5G iPods will accept them\n" "\n" - "### Picture Settings---------------------------------------------------------\n\n" - " -w, --width Set picture width\n" - " -l, --height Set picture height\n" - " --crop Set cropping values (default: autocrop)\n" - " -Y, --maxHeight <#> Set maximum height\n" - " -X, --maxWidth <#> Set maximum width\n" - " -s, --subtitle 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" - " -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" - " a stream if it contains forced subtitles.\n" - " -N, --native-language Select subtitles with this language if it does not\n" - " match the Audio language. Provide the language's\n" - " iso639-2 code (fre, eng, spa, dut, et cetera)\n" - " -m, --markers Add chapter markers (mp4 output format only)\n" - "\n" - "### Video Options------------------------------------------------------------\n\n" - " -e, --encoder Set video library encoder (ffmpeg,xvid,\n" + "### Video Options------------------------------------------------------------\n\n" + " -e, --encoder Set video library encoder (ffmpeg,xvid,\n" " x264,theora default: ffmpeg)\n" - " -q, --quality Set video quality (0.0..1.0)\n" - " -Q, --cqp Use with -q for CQP instead of CRF\n" + " -x, --x264opts Specify advanced x264 options in the\n" + " same style as mencoder:\n" + " option1=value1:option2=value2\n" + " -q, --quality Set video quality (0.0..1.0)\n" + " -Q, --cqp Use with -q for CQP instead of CRF\n" " -S, --size Set target size\n" - " -b, --vb Set video bitrate (default: 1000)\n" - " -r, --rate Set video framerate (" ); + " -b, --vb Set video bitrate (default: 1000)\n" + " -2, --two-pass Use two-pass mode\n" + " -T, --turbo When using 2-pass use the turbo options\n" + " on the first pass to improve speed\n" + " (only works with x264, affects PSNR by about 0.05dB,\n" + " and increases first pass speed two to four times)\n" + " -r, --rate Set video framerate (" ); for( i = 0; i < hb_video_rates_count; i++ ) { fprintf( stderr, hb_video_rates[i].string ); @@ -1489,47 +1954,25 @@ static void ShowHelp() fprintf( stderr, "/" ); } fprintf( stderr, ")\n" - "\n" - " -2, --two-pass Use two-pass mode\n" - " -d, --deinterlace Deinterlace video with yadif/mcdeint filter\n" - " (default 0:-1:-1:1)\n" - " or\n" - " \n" - " -7, --deblock Deblock video with pp7 filter\n" - " (default 0:2)\n" - " -8, --denoise Denoise video with hqdn3d filter\n" - " (default 4:3:6:4.5)\n" - " or\n" - " \n" - " -9, --detelecine Detelecine video with pullup filter\n" - " (default 1:1:4:4:0:0)\n" - " -5, --decomb Selectively deinterlaces when it detects combing\n" - " (default: 4:10:15:9:10:35:9)\n" - " -g, --grayscale Grayscale encoding\n" - " -p, --pixelratio Store pixel aspect ratio in video stream\n" - " -P, --loosePixelratio Store pixel aspect ratio with specified width\n" - " 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)" - - - "\n" + " Be aware that not specifying a framerate lets\n" + " HandBrake preserve a source's time stamps,\n" + " potentially creating variable framerate video\n" - - "### Audio Options-----------------------------------------------------------\n\n" - " -a, --audio Select audio channel(s), separated by commas\n" + "\n" + "### Audio Options-----------------------------------------------------------\n\n" + " -a, --audio Select audio track(s), separated by commas\n" " 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 Audio encoder(s) (faac/lame/vorbis/ac3) \n" - " ac3 meaning passthrough\n" - " Seperated by commas for more than one audio track.\n" - " (default: guessed)\n" - " -B, --ab Set audio bitrate(s) (default: 128)\n" - " Seperated by commas for more than one audio track.\n" - " -6, --mixdown Format(s) for surround sound downmixing\n" - " Seperated by commas for more than one audio track.\n" + " ac3 meaning passthrough\n" + " Separated by commas for more than one audio track.\n" + " (default: guessed)\n" + " -B, --ab Set audio bitrate(s) (default: 160)\n" + " Separated by commas for more than one audio track.\n" + " -6, --mixdown Format(s) for surround sound downmixing\n" + " Separated by commas for more than one audio track.\n" " (mono/stereo/dpl1/dpl2/6ch, default: dpl2)\n" " -R, --arate Set audio samplerate(s) (" ); for( i = 0; i < hb_audio_rates_count; i++ ) @@ -1539,25 +1982,72 @@ static void ShowHelp() fprintf( stderr, "/" ); } fprintf( stderr, " kHz)\n" - " Seperated by commas for more than one audio track.\n" + " Separated by commas for more than one audio track.\n" " -D, --drc Apply extra dynamic range compression to the audio,\n" " making soft sounds louder. Range is 1.0 to 4.0\n" " (too loud), with 1.5 - 2.5 being a useful range.\n" - " Seperated by commas for more than one audio track.\n" + " Separated by commas for more than one audio track.\n" + " -A, --aname Audio track name(s),\n" + " Separated by commas for more than one audio track.\n" + "\n" + "### Picture Settings---------------------------------------------------------\n\n" + " -w, --width Set picture width\n" + " -l, --height Set picture height\n" + " --crop 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" + " 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" + " -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" + "\n" - "\n" + "### Filters---------------------------------------------------------\n\n" + + " -d, --deinterlace Deinterlace video with yadif/mcdeint filter\n" + " (default 0:-1:-1:1)\n" + " or\n" + " \n" + " -5, --decomb Selectively deinterlaces when it detects combing\n" + " (default: 1:2:6:9:80:16:16)\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" + " (default 1:1:4:4:0:0)\n" + " -8, --denoise Denoise video with hqdn3d filter\n" + " (default 4:3:6:4.5)\n" + " or\n" + " \n" + " -7, --deblock Deblock video with pp7 filter\n" + " (default 5:2)\n" + " -g, --grayscale Grayscale encoding\n" + "\n" + + "### Subtitle Options------------------------------------------------------------\n\n" + " -s, --subtitle 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" + " -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" + " a stream if it contains forced subtitles.\n" + " -N, --native-language Select subtitles with this language if it does not\n" + " match the Audio language. Provide the language's\n" + " iso639-2 code (fre, eng, spa, dut, et cetera)\n" + + + "\n" - "### Advanced Options---------------------------------------------------------\n\n" - " -x, --x264opts Specify advanced x264 options in the\n" - " same style as mencoder:\n" - " option1=value1:option2=value2\n" - " -T, --turbo When using 2-pass use the turbo options\n" - " on the first pass to improve speed\n" - " (only works with x264, affects PSNR by about 0.05dB,\n" - " and increases first pass speed two to four times)\n" - " -V, --vfr Perform variable framerate detelecine on NTSC video\n" ); } @@ -1566,41 +2056,60 @@ static void ShowHelp() ****************************************************************************/ static void ShowPresets() { - printf("\n+ Animation: -e x264 -b 1000 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" -m -p -2 -T -x ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2\n"); + 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 + 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 + 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+ AppleTV: -e x264 -b 2500 -B 160 -R 48 -E faac,ac3 -f mp4 -4 -m -p -x bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n"); + printf("\n << Legacy\n"); - printf("\n+ Bedlam: -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1\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+ Blind: -b 512 -B 128 -R 48 -E faac -f mp4 -w 512 -m\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+ Broke: -e x264 -S 695 -B 128 -R 48 -E faac -f mp4 -w 640 -m -2 -T -x ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip\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+ Classic: -b 1000 -B 160 -R 48 -E faac -f mp4\n"); + printf("\n >>\n"); - printf("\n+ Constant Quality Rate: -e x264 -q 0.64709997177124023 -E ac3 -f mkv -m -p -x ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh\n"); + printf("\n>\n"); - printf("\n+ Deux Six Quatre: -e x264 -b 1600 -E ac3 -f mkv -m -p -2 -T -x ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip\n"); + printf("\n< Basic\n"); - printf("\n+ Film: -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\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+ iPhone / iPod Touch: -e x264 -b 960 -B 128 -R 48 -E faac -f mp4 -I -w 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1\n"); + printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4\n"); - printf("\n+ iPod High-Rez: -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -I -w 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n"); + printf("\n>\n"); - printf("\n+ iPod Low-Rez: -e x264 -b 700 -B 160 -R 48 -E faac -f mp4 -I -w 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1\n"); + printf("\n< High Profile\n"); - printf("\n+ Normal: -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=2:bframes=2:subme=5:me=umh\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+ PS3: -e x264 -b 2500 -B 160 -R 48 -E faac -f mp4 -p -x level=41:subme=5:me=umh\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+ PSP: -b 1024 -B 128 -R 48 -E faac -f mp4 -w 368 -l 208 -m\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+ QuickTime: -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip\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+ Television: -e x264 -b 1300 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" --denoise=\"weak\" -m -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip\n"); + printf("\n>\n"); + + printf("\n< Gaming Consoles\n"); + + printf("\n + PSP: -b 1024 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -X 368 -Y 208 -m\n"); + + 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"); + + 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"); + + printf("\n>\n"); - printf("\n+ Xbox 360: -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -p -x level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:no-fast-pskip:filter=-2,-1\n"); } /**************************************************************************** @@ -1608,13 +2117,18 @@ static void ShowPresets() ****************************************************************************/ static int ParseOptions( int argc, char ** argv ) { + + #define PREVIEWS 257 + #define START_AT_PREVIEW 258 + #define STOP_AT 259 + for( ;; ) { static struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "update", no_argument, NULL, 'u' }, - { "verbose", no_argument, NULL, 'v' }, + { "verbose", optional_argument, NULL, 'v' }, { "cpu", required_argument, NULL, 'C' }, { "format", required_argument, NULL, 'f' }, @@ -1664,7 +2178,12 @@ static int ParseOptions( int argc, char ** argv ) { "maxWidth", required_argument, NULL, 'X' }, { "preset", required_argument, NULL, 'Z' }, { "preset-list", no_argument, NULL, 'z' }, - { "vfr", no_argument, NULL, 'V' }, + + { "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 }, { 0, 0, 0, 0 } }; @@ -1673,7 +2192,7 @@ static int ParseOptions( int argc, char ** argv ) int c; c = getopt_long( argc, argv, - "hvuC:f:4i:Io:t:Lc:m::a:6:s:UFN:e:E:2dD:7895gpOP::w:l:n:b:q:S:B:r:R:Qx:TY:X:VZ:z", + "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", long_options, &option_index ); if( c < 0 ) { @@ -1689,7 +2208,14 @@ static int ParseOptions( int argc, char ** argv ) update = 1; break; case 'v': - debug = HB_DEBUG_ALL; + if( optarg != NULL ) + { + debug = atoi( optarg ); + } + else + { + debug = 1; + } break; case 'C': cpu = atoi( optarg ); @@ -1708,20 +2234,19 @@ static int ParseOptions( int argc, char ** argv ) break; case 'i': input = strdup( optarg ); - #ifdef __APPLE_CC__ - char *devName = bsd_name_for_path( input ); - if( devName == NULL ) - { - return 0; - } - 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 ); @@ -1997,10 +2522,44 @@ static int ParseOptions( int argc, char ** argv ) case 'X': maxWidth = atoi (optarg ); break; - case 'V': - vfr = 1; + case 'A': + if( optarg != NULL ) + { + 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; + else if( atoi( optarg ) == 709 ) + color_matrix = 2; break; - default: fprintf( stderr, "unknown option (%s)\n", argv[optind] ); return -1; @@ -2181,10 +2740,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 ); } /****************************************************************************