X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=test%2Ftest.c;h=3273c5716fe08a49a023862c246689b813d0804b;hb=c593146bf3fab6290c71cbbb974e0a756e43f5e0;hp=7411113f8d2685860ea9b425be22ae9f4b705b4e;hpb=5758384b500f5bd0df2717dae0e5f29796b886d2;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/test/test.c b/test/test.c index 7411113f..3273c571 100644 --- a/test/test.c +++ b/test/test.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "hb.h" #include "parsecsv.h" @@ -92,6 +93,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; @@ -146,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); @@ -153,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 ) @@ -196,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; @@ -286,9 +300,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" ); +#ifdef PTW32_STATIC_LIB + pthread_win32_thread_detach_np(); + pthread_win32_process_detach_np(); +#endif + return 0; } @@ -462,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 ); @@ -511,6 +531,74 @@ static int HandleEvents( hb_handle_t * h ) job->chapter_markers = 1; } + if (!strcmp(preset_name, "iPod")) + { + mux = HB_MUX_MP4; + job->ipod_atom = 1; + vcodec = HB_VCODEC_X264; + 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; + } + + if (!strcmp(preset_name, "iPhone & iPod Touch")) + { + mux = HB_MUX_MP4; + vcodec = HB_VCODEC_X264; + 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; + } + if (!strcmp(preset_name, "AppleTV")) { mux = HB_MUX_MP4; @@ -541,18 +629,17 @@ static int HandleEvents( hb_handle_t * h ) 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=9:analyse=all"); + 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, "iPod Classic & iPod Nano")) + if (!strcmp(preset_name, "QuickTime")) { mux = HB_MUX_MP4; - job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 700; + job->vbitrate = 1800; if( !atracks ) { atracks = strdup("1"); @@ -563,7 +650,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("48"); + arates = strdup("Auto"); } if( !acodecs ) { @@ -573,61 +660,63 @@ static int HandleEvents( hb_handle_t * h ) { 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"); + 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, "iPhone & iPod Touch")) + if (!strcmp(preset_name, "AppleTV Legacy")) { mux = HB_MUX_MP4; - job->ipod_atom = 1; + job->largeFileSize = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 960; + job->vbitrate = 2500; if( !atracks ) { - atracks = strdup("1"); + atracks = strdup("1,1"); } if( !abitrates ) { - abitrates = strdup("128"); + abitrates = strdup("160,auto"); } if( !arates ) { - arates = strdup("48"); + arates = strdup("48,Auto"); } if( !acodecs ) { - acodecs = strdup("faac"); + acodecs = strdup("faac,ac3"); } if( !mixdowns ) { - mixdowns = strdup("dpl2"); + mixdowns = strdup("dpl2,auto"); } - maxWidth = 480; if( !x264opts ) { - x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1"); + 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, "iPod Legacy")) + if (!strcmp(preset_name, "iPhone Legacy")) { mux = HB_MUX_MP4; job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 1500; + job->vbitrate = 960; if( !atracks ) { atracks = strdup("1"); } if( !abitrates ) { - abitrates = strdup("160"); + abitrates = strdup("128"); } if( !arates ) { @@ -641,19 +730,20 @@ static int HandleEvents( hb_handle_t * h ) { mixdowns = strdup("dpl2"); } - maxWidth = 640; + maxWidth = 480; 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("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1"); } job->chapter_markers = 1; } - if (!strcmp(preset_name, "QuickTime")) + if (!strcmp(preset_name, "iPod Legacy")) { mux = HB_MUX_MP4; + job->ipod_atom = 1; vcodec = HB_VCODEC_X264; - job->vbitrate = 1800; + job->vbitrate = 1500; if( !atracks ) { atracks = strdup("1"); @@ -664,7 +754,7 @@ static int HandleEvents( hb_handle_t * h ) } if( !arates ) { - arates = strdup("Auto"); + arates = strdup("48"); } if( !acodecs ) { @@ -674,14 +764,12 @@ static int HandleEvents( hb_handle_t * h ) { mixdowns = strdup("dpl2"); } + maxWidth = 640; 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"); + x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1"); } - pixelratio = 1; job->chapter_markers = 1; - twoPass = 1; - turbo_opts_enabled = 1; } if (!strcmp(preset_name, "Normal")) @@ -983,7 +1071,7 @@ static int HandleEvents( hb_handle_t * h ) 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 ) @@ -1063,21 +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; + job->anamorphic.mode = pixelratio; } /* Add selected filters */ @@ -1597,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; @@ -1786,7 +1892,7 @@ 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 (optional argument: logging level)\n" @@ -1797,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 ); @@ -1857,52 +1957,22 @@ static void ShowHelp() " Be aware that not specifying a framerate lets\n" " HandBrake preserve a source's time stamps,\n" " potentially creating variable framerate video\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 5:2)\n" - " -8, --denoise Denoise video with hqdn3d filter\n" - " (default 4:3:6:4.5)\n" - " or\n" - " \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" - " -5, --decomb Selectively deinterlaces when it detects combing\n" - " (default: 1:2:6:9:80:16:16)\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" - " -M --color-matrix Set the color space signalled 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" - - - "### 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++ ) @@ -1912,26 +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" - " -A, --aname Audio channel name(s),\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" + + "### 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" + + "\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" ); } @@ -1944,20 +2060,24 @@ static void ShowPresets() 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 + 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=9:analyse=all\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 << iPod & iPhone\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 + iPod Classic & iPod Nano: -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 + 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 + iPhone & iPod Touch: -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 << 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 + 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>\n"); printf("\n< Basic\n"); @@ -1989,6 +2109,7 @@ static void ShowPresets() 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"); + } /**************************************************************************** @@ -1996,6 +2117,11 @@ 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[] = @@ -2055,6 +2181,9 @@ 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 }, { 0, 0, 0, 0 } }; @@ -2105,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 ) - { - 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 ); @@ -2400,6 +2528,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; @@ -2586,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 ); } /****************************************************************************