#include <unistd.h>
#include <inttypes.h>
-#ifdef PTW32_STATIC_LIB
+#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;
+#if defined( __APPLE_CC__ )
+#define EXTRA_VLC_DYLD_PATH "/Applications/VLC.app/Contents/MacOS/lib"
+#define DEFAULT_DYLD_PATH "/usr/local/lib:/usr/lib"
+
+static int no_vlc_dylib = 0;
+#endif
+static int debug = HB_DEBUG_ALL;
static int update = 0;
-static int dvdnav = 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 titlescan = 0;
+static int main_feature = 0;
static char * native_language = NULL;
+static int native_dub = 0;
static int twoPass = 0;
static int deinterlace = 0;
static char * deinterlace_opt = 0;
static char * detelecine_opt = 0;
static int decomb = 0;
static char * decomb_opt = 0;
+static int rotate = 0;
+static char * rotate_opt = 0;
static int grayscale = 0;
static int vcodec = HB_VCODEC_FFMPEG;
-static int h264_13 = 0;
-static int h264_30 = 0;
static hb_list_t * audios = NULL;
static hb_audio_config_t * audio = NULL;
static int num_audio_tracks = 0;
static char * abitrates = NULL;
static char * acodecs = NULL;
static char * anames = NULL;
+#ifdef __APPLE_CC__
+static int default_acodec = HB_ACODEC_CA_AAC;
+#else
static int default_acodec = HB_ACODEC_FAAC;
-static int default_abitrate = 160;
+#endif
+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 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;
static int preview_count = 10;
static int store_previews = 0;
static int start_at_preview = 0;
+static int64_t start_at_pts = 0;
+static int start_at_frame = 0;
+static char * start_at_string = NULL;
+static char * start_at_token = NULL;
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;
+static uint64_t min_title_duration = 900000LL;
/* Exit cleanly on Ctrl-C */
static volatile int die = 0;
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 */
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);
"date.\n" );
}
hb_close( &h );
+ hb_global_close();
return 0;
}
/* Feed libhb with a DVD to scan */
fprintf( stderr, "Opening %s...\n", input );
- if (longest_title) {
+ if (main_feature) {
/*
- * We need to scan for all the titles in order to find the longest
+ * We need to scan for all the titles in order to find the main feature
*/
titleindex = 0;
}
- hb_scan( h, input, titleindex, preview_count, store_previews );
+ hb_scan( h, input, titleindex, preview_count, store_previews, min_title_duration );
/* Wait... */
while( !die )
{
-#if !defined(SYS_BEOS) && !defined(__MINGW32__)
+#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;
/* Clean up */
hb_close( &h );
+ hb_global_close();
if( input ) free( input );
if( output ) free( output );
if( format ) free( format );
if( x264opts2 ) free (x264opts2 );
if (preset_name) free (preset_name);
if( stop_at_string ) free( stop_at_string );
+ if( start_at_string ) free( start_at_string );
+ // write a carriage return to stdout - avoids overlap / line wrapping when stderr is redirected
+ fprintf( stdout, "\n" );
fprintf( stderr, "HandBrake has exited.\n" );
-#ifdef PTW32_STATIC_LIB
- pthread_win32_thread_detach_np();
- pthread_win32_process_detach_np();
-#endif
-
return 0;
}
static void PrintTitleInfo( hb_title_t * title )
{
hb_chapter_t * chapter;
- hb_audio_config_t * audio;
hb_subtitle_t * subtitle;
int i;
fprintf( stderr, "+ title %d:\n", title->index );
- 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)
+ if ( title->index == title->job->feature )
+ {
+ fprintf( stderr, " + Main Feature\n" );
+ }
+ if ( title->type == HB_STREAM_TYPE )
+ {
+ fprintf( stderr, " + stream: %s\n", title->path );
+ }
+ else if ( title->type == HB_DVD_TYPE )
+ {
+ fprintf( stderr, " + vts %d, ttn %d, cells %d->%d (%"PRIu64" blocks)\n",
+ title->vts, title->ttn, title->cell_start, title->cell_end,
+ title->block_count );
+ }
+ if (title->angle_count > 1)
fprintf( stderr, " + angle(s) %d\n", title->angle_count );
fprintf( stderr, " + duration: %02d:%02d:%02d\n",
title->hours, title->minutes, title->seconds );
for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
{
chapter = hb_list_item( title->list_chapter, i );
- fprintf( stderr, " + %d: cells %d->%d, %d blocks, duration "
+ fprintf( stderr, " + %d: cells %d->%d, %"PRIu64" blocks, duration "
"%02d:%02d:%02d\n", chapter->index,
chapter->cell_start, chapter->cell_end,
chapter->block_count, chapter->hours, chapter->minutes,
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) (%s)\n",
+ fprintf( stderr, " + %d, %s (iso639-2: %s) (%s)(%s)\n",
i + 1, subtitle->lang,
subtitle->iso639_2,
- (subtitle->format == TEXTSUB) ? "Text" : "Bitmap");
+ (subtitle->format == TEXTSUB) ? "Text" : "Bitmap",
+ hb_subsource_name(subtitle->source));
}
if(title->detected_interlacing)
}
-static int test_sub_list( char ** list, char * needle, int pos )
+static int test_sub_list( char ** list, int pos )
{
int i;
- if ( list == NULL || needle == NULL )
+ if ( list == NULL || pos == 0 )
return 0;
if ( list[0] == NULL && pos == 1 )
for ( i = 0; list[i] != NULL; i++ )
{
- if ( strcasecmp( list[i], needle ) == 0 )
- return i + 1;
+ int idx = strtol( list[i], NULL, 0 );
+ if ( idx == pos )
+ return 1;
}
return 0;
}
case HB_STATE_SCANNING:
/* Show what title is currently being scanned */
fprintf( stderr, "Scanning title %d", p.title_cur );
- if( !titleindex )
+ if( !titleindex || titlescan )
fprintf( stderr, " of %d", p.title_count );
fprintf( stderr, "...\n" );
break;
die = 1;
break;
}
- if( longest_title )
+ if( main_feature )
{
int i;
- int longest_title_idx=0;
- int longest_title_pos=-1;
- int longest_title_time=0;
+ int main_feature_idx=0;
+ int main_feature_pos=-1;
+ int main_feature_time=0;
int title_time;
- fprintf( stderr, "Searching for longest title...\n" );
+ fprintf( stderr, "Searching for main feature title...\n" );
for( i = 0; i < hb_list_count( list ); i++ )
{
title_time = (title->hours*60*60 ) + (title->minutes *60) + (title->seconds);
fprintf( stderr, " + Title (%d) index %d has length %dsec\n",
i, title->index, title_time );
- if( longest_title_time < title_time )
+ if( main_feature_time < title_time )
{
- longest_title_time = title_time;
- longest_title_pos = i;
- longest_title_idx = title->index;
+ main_feature_time = title_time;
+ main_feature_pos = i;
+ main_feature_idx = title->index;
+ }
+ if( title->job->feature == title->index )
+ {
+ main_feature_time = title_time;
+ main_feature_pos = i;
+ main_feature_idx = title->index;
+ break;
}
}
- if( longest_title_pos == -1 )
+ if( main_feature_pos == -1 )
{
- fprintf( stderr, "No longest title found.\n" );
+ fprintf( stderr, "No main feature title found.\n" );
die = 1;
break;
}
- titleindex = longest_title_idx;
- fprintf( stderr, "Found longest title, setting title to %d\n",
- longest_title_idx);
+ titleindex = main_feature_idx;
+ fprintf( stderr, "Found main feature title, setting title to %d\n",
+ main_feature_idx);
- title = hb_list_item( list, longest_title_pos);
+ title = hb_list_item( list, main_feature_pos);
} else {
title = hb_list_item( list, 0 );
}
- if( !titleindex )
+ if( !titleindex || titlescan )
{
/* Scan-only mode, print infos and exit */
int i;
PrintTitleInfo( title );
- if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame )
+ if( chapter_start && chapter_end && !stop_at_pts && !start_at_preview && !stop_at_frame && !start_at_pts && !start_at_frame )
{
job->chapter_start = MAX( job->chapter_start,
chapter_start );
if (preset)
{
- fprintf( stderr, "+ Using preset: %s", preset_name);
+ fprintf( stderr, "+ Using preset: %s\n", preset_name);
if (!strcmp(preset_name, "Universal"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- vcodec = HB_VCODEC_X264;
- job->vquality = 20.0;
- job->crf = 1;
- if( !atracks )
- {
- atracks = strdup("1,1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac,ac3");
- }
- if( !abitrates )
- {
- abitrates = strdup("160,160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2,auto");
- }
- if( !arates )
- {
- arates = strdup("48,Auto");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0,0.0");
- }
- maxWidth = 720;
- if( !x264opts )
- {
- x264opts = strdup("cabac=0:ref=2:mixed-refs=1:me=umh");
- }
- anamorphic_mode = 2;
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "iPod"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->ipod_atom = 1;
- vcodec = HB_VCODEC_X264;
- job->vbitrate = 700;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- 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");
- }
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "iPhone & iPod Touch"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- vcodec = HB_VCODEC_X264;
- job->vquality = 20.0;
- job->crf = 1;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("128");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0");
- }
- maxWidth = 480;
- if( !x264opts )
- {
- x264opts = strdup("cabac=0:ref=2:mixed-refs:me=umh");
- }
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "AppleTV"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->largeFileSize = 1;
- vcodec = HB_VCODEC_X264;
- job->vquality = 20.0;
- job->crf = 1;
- if( !atracks )
- {
- atracks = strdup("1,1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac,ac3");
- }
- if( !abitrates )
- {
- abitrates = strdup("160,160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2,auto");
- }
- if( !arates )
- {
- arates = strdup("48,Auto");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0,0.0");
- }
- maxWidth = 960;
- if( !x264opts )
- {
- x264opts = strdup("cabac=0:ref=2:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1");
- }
- anamorphic_mode = 2;
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "Normal"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- vcodec = HB_VCODEC_X264;
- job->vquality = 20.0;
- job->crf = 1;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0");
- }
- if( !x264opts )
- {
- x264opts = strdup("ref=2:bframes=2:me=umh");
- }
- anamorphic_mode = 1;
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "High Profile"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- vcodec = HB_VCODEC_X264;
- job->vquality = 20.0;
- job->crf = 1;
- if( !atracks )
- {
- atracks = strdup("1,1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac,ac3");
- }
- if( !abitrates )
- {
- abitrates = strdup("160,160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2,auto");
- }
- if( !arates )
- {
- arates = strdup("48,Auto");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0,0.0");
- }
- if( !x264opts )
- {
- x264opts = strdup("ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct");
- }
- detelecine = 1;
- decomb = 1;
- anamorphic_mode = 2;
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "Classic"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->vbitrate = 1000;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0");
- }
- }
-
- if (!strcmp(preset_name, "AppleTV Legacy"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->largeFileSize = 1;
- vcodec = HB_VCODEC_X264;
- job->vbitrate = 2500;
- if( !atracks )
- {
- atracks = strdup("1,1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac,ac3");
- }
- if( !abitrates )
- {
- abitrates = strdup("160,160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2,auto");
- }
- if( !arates )
- {
- arates = strdup("48,Auto");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0,0.0");
- }
- if( !x264opts )
- {
- x264opts = strdup("bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0");
- }
- anamorphic_mode = 1;
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "iPhone Legacy"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->ipod_atom = 1;
- vcodec = HB_VCODEC_X264;
- job->vbitrate = 960;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("128");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- dynamic_range_compression = strdup("0.0");
- }
- maxWidth = 480;
- if( !x264opts )
- {
- x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0");
- }
- job->chapter_markers = 1;
- }
-
- if (!strcmp(preset_name, "iPod Legacy"))
- {
- if( !mux )
- {
- mux = HB_MUX_MP4;
- }
- job->ipod_atom = 1;
- vcodec = HB_VCODEC_X264;
- job->vbitrate = 1500;
- if( !atracks )
- {
- atracks = strdup("1");
- }
- if( !acodecs )
- {
- acodecs = strdup("faac");
- }
- if( !abitrates )
- {
- abitrates = strdup("160");
- }
- if( !mixdowns )
- {
- mixdowns = strdup("dpl2");
- }
- if( !arates )
- {
- arates = strdup("48");
- }
- if( !dynamic_range_compression )
- {
- 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:psy-rd=0,0");
- }
- job->chapter_markers = 1;
- }
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ if( !atracks )
+ {
+ atracks = strdup("1,1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac,copy:ac3");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160,160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2,auto");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto,Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0,0.0");
+ }
+ maxWidth = 720;
+ if( !x264opts )
+ {
+ x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6");
+ }
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPod"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->ipod_atom = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vbitrate = 700;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 320;
+ if( !x264opts )
+ {
+ x264opts = strdup("level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0");
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPhone & iPod Touch"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("128");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 480;
+ if( !x264opts )
+ {
+ x264opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPhone 4"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->largeFileSize = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ job->vrate_base = 900900;
+ job->cfr = 2;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 960;
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPad"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->largeFileSize = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ job->vrate_base = 900900;
+ job->cfr = 2;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 1024;
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "AppleTV"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->largeFileSize = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ if( !atracks )
+ {
+ atracks = strdup("1,1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac,copy:ac3");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160,160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2,auto");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto,Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0,0.0");
+ }
+ maxWidth = 960;
+ if( !x264opts )
+ {
+ x264opts = strdup("cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500");
+ }
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "AppleTV 2"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->largeFileSize = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ job->vrate_base = 900900;
+ job->cfr = 2;
+ if( !atracks )
+ {
+ atracks = strdup("1,1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac,copy:ac3");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160,160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2,auto");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto,Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0,0.0");
+ }
+ maxWidth = 1280;
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "Normal"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ if( !x264opts )
+ {
+ x264opts = strdup("ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0");
+ }
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 1;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "High Profile"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ vcodec = HB_VCODEC_X264;
+ job->vquality = 20.0;
+ if( !atracks )
+ {
+ atracks = strdup("1,1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac,copy:ac3");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160,160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2,auto");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto,Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0,0.0");
+ }
+ if( !x264opts )
+ {
+ x264opts = strdup("b-adapt=2:rc-lookahead=50");
+ }
+ detelecine = 1;
+ decomb = 1;
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 2;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "Classic"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->vbitrate = 1000;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+
+ }
+
+ if (!strcmp(preset_name, "AppleTV Legacy"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->largeFileSize = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vbitrate = 2500;
+ if( !atracks )
+ {
+ atracks = strdup("1,1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac,copy:ac3");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160,160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2,auto");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto,Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0,0.0");
+ }
+ if( !x264opts )
+ {
+ x264opts = strdup("ref=1:b-pyramid=none:weightp=0:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0");
+ }
+ if( !anamorphic_mode )
+ {
+ anamorphic_mode = 1;
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPhone Legacy"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->ipod_atom = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vbitrate = 960;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("128");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 480;
+ if( !x264opts )
+ {
+ x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
+ }
+ job->chapter_markers = 1;
+
+ }
+
+ if (!strcmp(preset_name, "iPod Legacy"))
+ {
+ if( !mux )
+ {
+ mux = HB_MUX_MP4;
+ }
+ job->ipod_atom = 1;
+ vcodec = HB_VCODEC_X264;
+ job->vbitrate = 1500;
+ if( !atracks )
+ {
+ atracks = strdup("1");
+ }
+ if( !acodecs )
+ {
+ acodecs = strdup("faac");
+ }
+ if( !abitrates )
+ {
+ abitrates = strdup("160");
+ }
+ if( !mixdowns )
+ {
+ mixdowns = strdup("dpl2");
+ }
+ if( !arates )
+ {
+ arates = strdup("Auto");
+ }
+ if( !dynamic_range_compression )
+ {
+ dynamic_range_compression = strdup("0.0");
+ }
+ maxWidth = 640;
+ if( !x264opts )
+ {
+ x264opts = strdup("level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0");
+ }
+ job->chapter_markers = 1;
+
+ }
+
}
if ( chapter_markers )
/* Add selected filters */
job->filters = hb_list_init();
+
+ if( rotate )
+ {
+ hb_filter_rotate.settings = rotate_opt;
+ hb_list_add( job->filters, &hb_filter_rotate);
+ }
if( detelecine )
{
hb_filter_detelecine.settings = detelecine_opt;
{
case 0: // Non-anamorphic
+ if (modulus)
+ {
+ job->modulus = modulus;
+ }
+
if( width && height )
{
job->width = width;
else if( width )
{
job->width = width;
+ // do not exceed source dimensions by default
+ if( !maxHeight )
+ job->maxHeight = title->height;
hb_fix_aspect( job, HB_KEEP_WIDTH );
}
else if( height )
{
job->height = height;
+ // do not exceed source dimensions by default
+ if( !maxWidth )
+ job->maxWidth = title->width;
hb_fix_aspect( job, HB_KEEP_HEIGHT );
}
else if( !width && !height )
{
+ /* Default to cropped width when one isn't specified
+ * avoids rounding to mod 16 regardless of modulus */
+ job->width = title->width - job->crop[2] - job->crop[3];
+ // do not exceed source dimensions by default
+ if( !maxHeight )
+ job->maxHeight = title->height;
hb_fix_aspect( job, HB_KEEP_WIDTH );
}
if (modulus)
{
- job->anamorphic.modulus = modulus;
+ job->modulus = modulus;
}
if( itu_par )
if (modulus)
{
- job->anamorphic.modulus = modulus;
+ job->modulus = modulus;
}
if( itu_par )
break;
}
- if( vquality >= 0.0 && ( ( vquality <= 1.0 ) || ( vcodec == HB_VCODEC_X264 ) || (vcodec == HB_VCODEC_FFMPEG) ) )
+ if( vquality >= 0.0 )
{
job->vquality = vquality;
job->vbitrate = 0;
{
job->vcodec = vcodec;
}
- if( h264_13 )
- {
- job->h264_level = 13;
- }
- if( h264_30 )
- {
- job->h264_level = 30;
- }
if( vrate )
{
job->cfr = cfr;
}
else
{
- fprintf(stderr, "ERROR: Unable to parse audio input \"%s\", skipping.",
+ fprintf(stderr, "ERROR: Unable to parse audio input \"%s\", skipping.\n",
token);
free(audio);
}
}
/* 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);
if( audio != NULL )
{
- 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 ( !strcasecmp( token, "auto" ) )
+ {
+ 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);
+ }
+ token = strtok(NULL, ",");
+ }
+ }
+ if (i < num_audio_tracks)
+ {
+ /* We have fewer inputs than audio tracks, use default sample rate.
+ * Unless we only have one input, then use that for all tracks.
+ */
+ if (i != 1)
+ arate = audio->in.samplerate;
+ for ( ; i < num_audio_tracks; i++)
+ {
+ audio = hb_list_audio_config_item(job->list_audio, i);
+ audio->out.samplerate = arate;
+ }
+ }
+ /* Sample Rate */
+
+ /* Audio Mixdown */
+ i = 0;
+ if ( mixdowns )
+ {
+ char * token = strtok(mixdowns, ",");
+ if (token == NULL)
+ token = mixdowns;
+ while ( token != NULL )
+ {
+ mixdown = hb_mixdown_get_mixdown_from_short_name(token);
+ audio = hb_list_audio_config_item(job->list_audio, i);
+ if( audio != NULL )
+ {
+ audio->out.mixdown = mixdown;
if( (++i) >= num_audio_tracks )
break; /* We have more inputs than audio tracks, oops */
}
- else
+ else
{
- fprintf(stderr, "Ignoring sample rate %d, no audio tracks\n", arate);
+ fprintf(stderr, "Ignoring mixdown, no audio tracks\n");
}
token = strtok(NULL, ",");
}
}
if (i < num_audio_tracks)
{
- /* We have fewer inputs than audio tracks, use default sample rate.
- * Unless we only have one input, then use that for all tracks.
+ /* We have fewer inputs than audio tracks, use the default mixdown for the rest. Unless
+ * we only have one input, then use that.
*/
+ int use_default = 0;
if (i != 1)
- arate = audio->in.samplerate;
- for ( ; i < num_audio_tracks; i++)
+ use_default = 1;
+
+ for (; i < num_audio_tracks; i++)
{
audio = hb_list_audio_config_item(job->list_audio, i);
- audio->out.samplerate = arate;
+ if (use_default)
+ {
+ // Get default for this tracks codec and layout
+ mixdown = hb_get_default_mixdown( audio->out.codec, audio->in.channel_layout );
+ }
+ audio->out.mixdown = mixdown;
}
}
- /* Sample Rate */
+ /* Audio Mixdown */
/* Audio Bitrate */
i = 0;
* for the remaining tracks. Unless we only have one input, then use
* that for all tracks.
*/
+ int use_default = 0;
if (i != 1)
- abitrate = default_abitrate;
+ use_default = 1;
+
for (; i < num_audio_tracks; i++)
{
audio = hb_list_audio_config_item(job->list_audio, i);
+ if (use_default)
+ {
+ abitrate = hb_get_default_audio_bitrate(
+ audio->out.codec, audio->out.samplerate,
+ audio->out.mixdown );
+ }
audio->out.bitrate = abitrate;
}
}
}
/* Audio DRC */
- /* Audio Mixdown */
- i = 0;
- if ( mixdowns )
- {
- char * token = strtok(mixdowns, ",");
- if (token == NULL)
- token = mixdowns;
- while ( token != NULL )
- {
- mixdown = hb_mixdown_get_mixdown_from_short_name(token);
- audio = hb_list_audio_config_item(job->list_audio, i);
- 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, ",");
- }
- }
- if (i < num_audio_tracks)
- {
- /* We have fewer inputs than audio tracks, use DPLII for the rest. Unless
- * we only have one input, then use that.
- */
- if (i != 1)
- mixdown = HB_AMIXDOWN_DOLBYPLII;
- for (; i < num_audio_tracks; i++)
- {
- audio = hb_list_audio_config_item(job->list_audio, i);
- audio->out.mixdown = mixdown;
- }
- }
- /* Audio Mixdown */
-
/* Audio Track Names */
i = 0;
if ( anames )
}
/* Audio Track Names */
+ /* Fix up passthru that needs to fallback to ac3 encode */
+ for( i = 0; i < hb_list_count( job->list_audio ); )
+ {
+ audio = hb_list_audio_config_item( job->list_audio, i );
+ if ( ( audio->out.codec & HB_ACODEC_AC3 ) &&
+ ( audio->out.codec & HB_ACODEC_PASS_FLAG ) &&
+ !( audio->out.codec & audio->in.codec ) )
+ {
+ // AC3 passthru not possible, fallback to AC3 encoder.
+ fprintf( stderr, "AC3 passthru requested and input codec is not AC3 for track %d, using AC3 encoder\n",
+ audio->out.track );
+ audio->out.codec = HB_ACODEC_AC3;
+ audio->out.mixdown = hb_get_default_mixdown( audio->out.codec, audio->in.channel_layout );
+ audio->out.bitrate = hb_get_default_audio_bitrate( audio->out.codec, audio->out.samplerate,
+ audio->out.mixdown );
+ }
+ // fix 'copy' to select a specific codec
+ if ( audio->out.codec & HB_ACODEC_PASS_FLAG )
+ {
+ audio->out.codec &= (audio->in.codec | HB_ACODEC_PASS_FLAG);
+ if ( !( audio->out.codec & HB_ACODEC_MASK ) )
+ {
+ // Passthru not possible, drop audio.
+ fprintf( stderr, "Passthru requested and input codec is not the same as output codec for track %d, dropping track\n",
+ audio->out.track );
+ hb_audio_t * item = hb_list_item( job->list_audio, i );
+ hb_list_rem( job->list_audio, item );
+ continue;
+ }
+ }
+ i++;
+ }
+
if( size )
{
job->vbitrate = hb_calc_bitrate( job, size );
if( subtracks )
{
char * token;
- int i, pos;
+ int i;
+ int burnpos = 0, defaultpos = 0;
- pos = 0;
+ if ( subburn )
+ burnpos = strtol( subburn, NULL, 0 );
+ if ( subdefault )
+ defaultpos = strtol( subdefault, NULL, 0 );
for ( i = 0; subtracks[i] != NULL; i++ )
{
- pos++;
token = subtracks[i];
if( strcasecmp(token, "scan" ) == 0 )
{
if ( subburn != NULL )
{
- burn = ( pos == 1 && subburn[0] == 0 ) ||
- ( strcmp( "scan", subburn ) == 0 );
+ burn = ( i == 0 && subburn[0] == 0 ) ||
+ ( burnpos == i+1 );
}
if ( subdefault != NULL )
{
- def = ( pos == 1 && subdefault[0] == 0 ) ||
- ( strcmp( "scan", subdefault ) == 0 );
+ def = ( i == 0 && subdefault[0] == 0 ) ||
+ ( defaultpos == i+1 );
}
- force = test_sub_list( subforce, "scan", pos );
+ force = test_sub_list( subforce, i+1 );
- if ( !burn && mux == HB_MUX_MKV )
+ if ( !burn )
{
job->select_subtitle_config.dest = PASSTHRUSUB;
}
- else if ( burn )
+ else
{
if ( sub_burned )
{
}
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;
- }
+ job->select_subtitle_config.force = force;
+ job->select_subtitle_config.default_track = def;
+ subtitle_scan = 1;
}
else
{
subtitle = hb_list_item(title->list_subtitle, track);
if( subtitle == NULL )
{
- fprintf( stderr, "Could not find subtitle track %d, skipped\n", track );
+ 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 );
+ burn = ( i == 0 && subburn[0] == 0 ) ||
+ ( burnpos == i+1 );
}
if ( subdefault != NULL )
{
- def = ( pos == 1 && subdefault[0] == 0 ) ||
- ( strcmp( token, subdefault ) == 0 );
+ def = ( i == 0 && subdefault[0] == 0 ) ||
+ ( defaultpos == i+1 );
}
- 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
- continue;
- }
- else if ( burn && subtitle->format == PICTURESUB )
+ force = test_sub_list(subforce, i+1);
+
+ int supports_burn =
+ ( subtitle->source == VOBSUB ) ||
+ ( subtitle->source == SSASUB );
+
+ if ( burn && supports_burn )
{
// 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;
+
+ // Mark as burn-in
+ sub_config.dest = RENDERSUB;
+ }
+ else
+ {
+ sub_config.dest = PASSTHRUSUB;
}
-
sub_config.force = force;
sub_config.default_track = def;
hb_subtitle_add( job, &sub_config, track );
}
}
- if( native_language )
+ if( srtfile )
{
- job->native_language = strdup( native_language );
- if ( subtracks == NULL )
+ char * token;
+ int i;
+ hb_subtitle_config_t sub_config;
+
+ for( i=0; srtfile[i] != NULL; i++ )
{
- if ( subforce )
- job->select_subtitle_config.force = 1;
+ char *codeset = "L1";
+ int64_t offset = 0;
+ char *lang = "und";
+
+ 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], 255);
+ sub_config.src_filename[255] = 0;
+ strncpy( sub_config.src_codeset, codeset, 39);
+ sub_config.src_codeset[39] = 0;
+ sub_config.offset = offset;
+
+ hb_srt_add( job, &sub_config, lang);
+ }
+ }
- if ( subburn == NULL && mux != HB_MUX_MP4 )
- job->select_subtitle_config.force = 1;
+ if( 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;
- if ( subdefault )
- job->select_subtitle_config.default_track = 1;
+ 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;
+ }
+ }
+ }
}
}
job->file = strdup( output );
- if( crf )
- {
- job->crf = 1;
- }
-
if( color_matrix )
{
job->color_matrix = color_matrix;
subtitle_scan = 0;
}
+ if( start_at_pts )
+ {
+ job->pts_to_start = start_at_pts;
+ subtitle_scan = 0;
+ }
+
+ if( start_at_frame )
+ {
+ job->frame_to_start = start_at_frame;
+ subtitle_scan = 0;
+ }
+
if( subtitle_scan )
{
char *x264opts_tmp;
}
#define p s.param.working
+ case HB_STATE_SEARCHING:
+ fprintf( stdout, "\rEncoding: task %d of %d, Searching for start time, %.2f %%",
+ p.job_cur, p.job_count, 100.0 * p.progress );
+ if( p.seconds > -1 )
+ {
+ fprintf( stdout, " (ETA %02dh%02dm%02ds)",
+ p.hours, p.minutes, p.seconds );
+ }
+ fflush(stdout);
+ break;
+
case HB_STATE_WORKING:
fprintf( stdout, "\rEncoding: task %d of %d, %.2f %%",
p.job_cur, p.job_count, 100.0 * p.progress );
" 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"
- " --dvdnav Use dvdnav (Experimental)\n"
+ " --no-dvdnav Do not use dvdnav for reading DVDs\n"
+ " (experimental, enabled by default for testing)\n"
"\n"
"### Source Options-----------------------------------------------------------\n\n"
" -i, --input <string> Set input device\n"
- " -t, --title <number> Select a title to encode (0 to scan only,\n"
+ " -t, --title <number> Select a title to encode (0 to scan all titles only,\n"
" default: 1)\n"
- " -L, --longest Select the longest title\n"
+ " --scan Scan selected title only.\n"
+ " --main-feature Detect and select the main feature title.\n"
" -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"
" 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"
+ " --start-at <unit:#> Start encoding at a given frame, duration (in seconds),\n"
+ " or pts (on a 90kHz clock)\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"
" -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"
+ " -q, --quality <number> Set video quality\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"
#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"
+ " -E, --aencoder <string> Audio encoder(s)\n"
+ " (ca_aac/faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
+ " copy, copy:ac3 and copy:dts meaning passthrough.\n"
+ " copy will passthrough either ac3 or dts.\n"
" Separated by commas for more than one audio track.\n"
- " (default: guessed)\n" );
+ " (default: ca_aac)\n" );
#else
fprintf( out,
- " -E, --aencoder <string> Audio encoder(s) (faac/lame/vorbis/ac3/dts) \n"
- " ac3 and dts meaning passthrough\n"
+ " -E, --aencoder <string> Audio encoder(s):\n"
+ " (faac/lame/vorbis/ac3/copy/copy:ac3/copy:dts)\n"
+ " copy, copy:ac3 and copy:dts meaning passthrough.\n"
+ " copy will passthrough either ac3 or dts.\n"
" Separated by commas for more than one audio track.\n"
- " (default: guessed)\n" );
+ " (default: faac for mp4, lame for mkv)\n" );
#endif
fprintf( out,
- " -B, --ab <kb/s> Set audio bitrate(s) (default: 160)\n"
+ " -B, --ab <kb/s> Set audio bitrate(s) (default: depends on the\n"
+ " selected codec, mixdown and samplerate)\n"
" Separated by commas for more than one audio track.\n"
" -6, --mixdown <string> 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"
+ " (mono/stereo/dpl1/dpl2/6ch, default: up to 6ch for ac3,\n"
+ " up to dpl2 for other encoders)\n"
" -R, --arate Set audio samplerate(s) (" );
for( i = 0; i < hb_audio_rates_count; i++ )
{
" --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"
+ " <number> to divide cleanly by. Does not affect strict\n"
+ " anamorphic mode, which is always mod 2 (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"
" 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"
" <weak/medium/strong>\n"
" -7, --deblock Deblock video with pp7 filter\n"
" <QP:M> (default 5:2)\n"
+ " --rotate Flips images axes\n"
+ " <M> (default 3)\n"
" -g, --grayscale Grayscale encoding\n"
"\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"
+ " Example: \"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"
" 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"
- " <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"
+ " <string> the subtitle has the forced flag set. The values in\n"
+ " \"string\" are indexes into the subtitle list\n"
+ " specified with '--subtitle'.\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"
+ " Example: \"1,2,3\" for multiple tracks.\n"
+ " If \"string\" is omitted, the first track is forced.\n"
" --subtitle-burn \"Burn\" the selected subtitle into the video track\n"
- " <number> If \"number\" is omitted, the first trac is burned.\n"
+ " <number> If \"number\" is omitted, the first track is burned.\n"
+ " \"number\" is an index into the subtitle list\n"
+ " specified with '--subtitle'.\n"
" --subtitle-default Flag the selected subtitle as the default subtitle\n"
- " <number> to be displayed upon playback. Settings no default\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 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"
- " --native-language may be used in conjunction with\n"
- " a subtitle \"scan\", in which case all tracks\n"
- " matching native language will be scanned.\n"
- " Otherwise --native-language is mutually exclusive\n"
- " with --subtitle\n"
-
-
+ " If \"number\" is omitted, the first track is default.\n"
+ " \"number\" is an index into the subtitle list\n"
+ " specified with '--subtitle'.\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"
****************************************************************************/
static void ShowPresets()
{
- printf("\n< Apple\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:mixed-refs=1:me=umh\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\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:mixed-refs:me=umh\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:mixed-refs=1:bframes=3:me=umh:subme=7:b-adapt=2:8x8dct=1\n");
-
+ fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
+
+ printf("\n< Apple\n");
+
+ printf("\n + Universal: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6\n");
+
+ printf("\n + iPod: -e x264 -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
+
+ printf("\n + iPhone & iPod Touch: -e x264 -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
+
+ printf("\n + iPhone 4: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 960 --loose-anamorphic -m\n");
+
+ printf("\n + iPad: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1024 --loose-anamorphic -m\n");
+
+ printf("\n + AppleTV: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
+
+ printf("\n + AppleTV 2: -e x264 -q 20.0 -r 29.97 --pfr -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
+
printf("\n>\n");
-
+
printf("\n< Regular\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:me=umh\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 ref=3:mixed-refs:bframes=3:weightb:b-pyramid:b-adapt=2:me=umh:subme=9:analyse=all:8x8dct\n");
-
+
+ printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=2:bframes=2:subme=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0\n");
+
+ printf("\n + High Profile: -e x264 -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 --detelecine --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
+
printf("\n>\n");
-
+
printf("\n< Legacy\n");
+
+ printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n");
+
+ printf("\n + AppleTV Legacy: -e x264 -b 2500 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:b-pyramid=none:weightp=0:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
+
+ printf("\n + iPhone Legacy: -e x264 -b 960 -a 1 -E faac -B 128 -6 dpl2 -R Auto -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:weightp=0:subme=6:8x8dct=0:trellis=0\n");
+
+ printf("\n + iPod Legacy: -e x264 -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n");
+
+ printf("\n>\n");
- printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R 48 -D 0.0 -f mp4\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 bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:cabac=0\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\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\n");
+static char * hb_strndup( char * str, int len )
+{
+ char * res;
+ int str_len = strlen( str );
- printf("\n>\n");
+ res = malloc( len > str_len ? str_len + 1 : len + 1 );
+ strncpy( res, str, len );
+ res[len] = '\0';
+ return res;
}
-static char** str_split( char *str, char *delem )
+static char** str_split( char *str, char delem )
{
- char * token;
- char * copy_str;
char * pos;
+ char * end;
char ** ret;
int count, i;
- if ( str == NULL || delem == NULL || str[0] == 0 )
+ if ( str == NULL || str[0] == 0 )
{
ret = malloc( sizeof(char*) );
*ret = NULL;
// Find number of elements in the string
count = 1;
pos = str;
- while ( ( pos = strstr( pos+1, delem ) ) != NULL )
+ while ( ( pos = strchr( pos, delem ) ) != NULL )
{
- if ( *(pos+1) != 0 )
- count++;
+ count++;
+ pos++;
}
- ret = calloc( ( count + 1 ), sizeof(char*) );
- copy_str = strdup( str );
- token = strtok( copy_str, delem );
+ ret = calloc( ( count + 1 ), sizeof(char*) );
- i = 0;
- while( token != NULL && i < count )
+ pos = str;
+ for ( i = 0; i < count - 1; i++ )
{
- ret[i] = strdup( token );
- token = strtok(NULL, ",");
- i++;
+ end = strchr( pos, delem );
+ ret[i] = hb_strndup(pos, end - pos);
+ pos = end + 1;
}
- free( copy_str );
+ ret[i] = strdup(pos);
+
return ret;
}
#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 START_AT 259
+ #define STOP_AT 260
+ #define ANGLE 261
+ #define DVDNAV 262
+ #define DISPLAY_WIDTH 263
+ #define PIXEL_ASPECT 264
+ #define MODULUS 265
+ #define KEEP_DISPLAY_ASPECT 266
+ #define SUB_BURNED 267
+ #define SUB_DEFAULT 268
+ #define NATIVE_DUB 269
+ #define SRT_FILE 270
+ #define SRT_CODESET 271
+ #define SRT_OFFSET 272
+ #define SRT_LANG 273
+ #define SRT_DEFAULT 274
+ #define ROTATE_FILTER 275
+ #define SCAN_ONLY 276
+ #define MAIN_FEATURE 277
+ #define MIN_DURATION 278
for( ;; )
{
{ "update", no_argument, NULL, 'u' },
{ "verbose", optional_argument, NULL, 'v' },
{ "cpu", required_argument, NULL, 'C' },
- { "dvdnav", no_argument, NULL, DVDNAV },
+ { "no-dvdnav", no_argument, NULL, DVDNAV },
{ "format", required_argument, NULL, 'f' },
{ "input", required_argument, NULL, 'i' },
{ "ipod-atom", no_argument, NULL, 'I' },
{ "title", required_argument, NULL, 't' },
- { "longest", no_argument, NULL, 'L' },
+ { "min-duration",required_argument, NULL, MIN_DURATION },
+ { "scan", no_argument, NULL, SCAN_ONLY },
+ { "main-feature",no_argument, NULL, MAIN_FEATURE },
{ "chapters", required_argument, NULL, 'c' },
{ "angle", required_argument, NULL, ANGLE },
{ "markers", optional_argument, NULL, 'm' },
{ "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' },
{ "detelecine", optional_argument, NULL, '9' },
{ "decomb", optional_argument, NULL, '5' },
{ "grayscale", no_argument, NULL, 'g' },
+ { "rotate", optional_argument, NULL, ROTATE_FILTER },
{ "strict-anamorphic", no_argument, &anamorphic_mode, 1 },
{ "loose-anamorphic", no_argument, &anamorphic_mode, 2 },
{ "custom-anamorphic", no_argument, &anamorphic_mode, 3 },
{ "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' },
{ "color-matrix",required_argument, NULL, 'M' },
{ "previews", required_argument, NULL, PREVIEWS },
{ "start-at-preview", required_argument, NULL, START_AT_PREVIEW },
+ { "start-at", required_argument, NULL, START_AT },
{ "stop-at", required_argument, NULL, STOP_AT },
{ "vfr", no_argument, &cfr, 0 },
{ "cfr", no_argument, &cfr, 1 },
{ "pfr", no_argument, &cfr, 2 },
+#if defined( __APPLE_CC__ )
+ { "no-vlc-dylib-path", no_argument, &no_vlc_dylib, 1 },
+#endif
{ 0, 0, 0, 0 }
};
int option_index = 0;
int c;
+ int cur_optind;
- c = getopt_long( argc, argv,
- "hv::uC:f:4i:Io:t:Lc:m::M:a:A:6:s:UFN:e:E:2dD:7895gOw:l:n:b:q:S:B:r:R:Qx:TY:X:Z:z",
+ cur_optind = optind;
+ c = getopt_long( argc, argv,
+ "hv::uC:f:4i:Io:t:c: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 )
{
ShowPresets();
exit ( 0 );
case DVDNAV:
- dvdnav = 1;
+ dvdnav = 0;
break;
case 'f':
case 't':
titleindex = atoi( optarg );
break;
- case 'L':
- longest_title = 1;
+ case SCAN_ONLY:
+ titlescan = 1;
+ break;
+ case MAIN_FEATURE:
+ main_feature = 1;
break;
case 'c':
{
if( optarg != NULL )
{
atracks = strdup( optarg );
+ audio_explicit = 1;
}
else
{
}
break;
case 's':
- subtracks = str_split( optarg, "," );
+ subtracks = str_split( optarg, ',' );
break;
case 'F':
- subtracks = str_split( optarg, "," );
+ subforce = str_split( optarg, ',' );
break;
case SUB_BURNED:
if( optarg != NULL )
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;
case 'g':
grayscale = 1;
break;
+ case ROTATE_FILTER:
+ if( optarg != NULL )
+ {
+ rotate_opt = strdup( optarg );
+ }
+ rotate = 1;
+ break;
case DISPLAY_WIDTH:
if( optarg != NULL )
{
{
vcodec = HB_VCODEC_X264;
}
- else if( !strcasecmp( optarg, "x264b13" ) )
- {
- vcodec = HB_VCODEC_X264;
- h264_13 = 1;
- }
- else if( !strcasecmp( optarg, "x264b30" ) )
- {
- vcodec = HB_VCODEC_X264;
- h264_30 = 1;
- }
else if( !strcasecmp( optarg, "theora" ) )
{
vcodec = HB_VCODEC_THEORA;
abitrates = strdup( optarg );
}
break;
- case 'Q':
- crf = 0;
- break;
case 'x':
x264opts = strdup( optarg );
break;
case START_AT_PREVIEW:
start_at_preview = atoi( optarg );
break;
+ case START_AT:
+ start_at_string = strdup( optarg );
+ start_at_token = strtok( start_at_string, ":");
+ if( !strcmp( start_at_token, "frame" ) )
+ {
+ start_at_token = strtok( NULL, ":");
+ start_at_frame = atoi(start_at_token);
+ }
+ else if( !strcmp( start_at_token, "pts" ) )
+ {
+ start_at_token = strtok( NULL, ":");
+ sscanf( start_at_token, "%"SCNd64, &start_at_pts );
+ }
+ else if( !strcmp( start_at_token, "duration" ) )
+ {
+ start_at_token = strtok( NULL, ":");
+ sscanf( start_at_token, "%"SCNd64, &start_at_pts );
+ start_at_pts *= 90000LL;
+ }
+ break;
case STOP_AT:
stop_at_string = strdup( optarg );
stop_at_token = strtok( stop_at_string, ":");
else if( atoi( optarg ) == 709 )
color_matrix = 2;
break;
+ case MIN_DURATION:
+ min_title_duration = strtol( optarg, NULL, 0 );
+ break;
default:
- fprintf( stderr, "unknown option (%s)\n", argv[optind] );
+ fprintf( stderr, "unknown option (%s)\n", argv[cur_optind] );
return -1;
}
}
return 0;
}
+char * str_printf(const char *fmt, ...)
+{
+ /* Guess we need no more than 100 bytes. */
+ int len;
+ va_list ap;
+ int size = 100;
+ char *tmp, *str = NULL;
+
+ str = (char*)malloc(size);
+ while (1)
+ {
+ /* Try to print in the allocated space. */
+ va_start(ap, fmt);
+ len = vsnprintf(str, size, fmt, ap);
+ va_end(ap);
+
+ /* If that worked, return the string. */
+ if (len > -1 && len < size) {
+ return str;
+ }
+
+ /* Else try again with more space. */
+ if (len > -1) /* glibc 2.1 */
+ size = len+1; /* precisely what is needed */
+ else /* glibc 2.0 */
+ size *= 2; /* twice the old size */
+
+ tmp = (char*)realloc(str, size);
+ if (tmp == NULL) {
+ return str;
+ }
+ str = tmp;
+ }
+}
+
static int CheckOptions( int argc, char ** argv )
{
+#if defined( __APPLE_CC__ )
+ // If OSX, add VLC dylib path and exec to make it stick.
+ char *dylib_path;
+
+ if ( !no_vlc_dylib )
+ {
+ dylib_path = getenv("DYLD_FALLBACK_LIBRARY_PATH");
+ if ( dylib_path == NULL ||
+ strstr( dylib_path, "/Applications/VLC.app/Contents/MacOS/lib" ) == NULL )
+ {
+ char *path = NULL;
+ char *home;
+ int result = -1;
+
+ home = getenv("HOME");
+
+ if ( dylib_path == NULL )
+ {
+ // Set the system default of $HOME/lib:/usr/local/lib:/usr/lib
+ // And add our extra path
+ if ( home != NULL )
+ {
+ path = str_printf("%s/lib:%s:%s:%s%s", home,
+ DEFAULT_DYLD_PATH,
+ EXTRA_VLC_DYLD_PATH,
+ home, EXTRA_VLC_DYLD_PATH);
+ }
+ else
+ {
+ path = str_printf("%s:%s", DEFAULT_DYLD_PATH, EXTRA_VLC_DYLD_PATH);
+ }
+ if ( path != NULL )
+ result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
+ }
+ else
+ {
+ // add our extra path
+ if ( home != NULL )
+ {
+ path = str_printf("%s:%s:%s%s", dylib_path, EXTRA_VLC_DYLD_PATH,
+ home, EXTRA_VLC_DYLD_PATH);
+ }
+ else
+ {
+ path = str_printf("%s:%s", dylib_path, EXTRA_VLC_DYLD_PATH);
+ }
+ if ( path != NULL )
+ result = setenv("DYLD_FALLBACK_LIBRARY_PATH", path, 1);
+ }
+ if ( result == 0 )
+ {
+ const char ** new_argv;
+ int i;
+
+ new_argv = (const char**)malloc( (argc + 2) * sizeof(char*) );
+ new_argv[0] = argv[0];
+ new_argv[1] = "--no-vlc-dylib-path";
+ for (i = 1; i < argc; i++)
+ new_argv[i+1] = argv[i];
+ new_argv[i+1] = NULL;
+ execv(new_argv[0], (char* const*)new_argv);
+ }
+ }
+ }
+#endif
+
if( update )
{
return 0;
}
/* Parse format */
- if( titleindex > 0 )
+ if( titleindex > 0 && !titlescan )
{
if( output == NULL || *output == '\0' )
{
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" ) ||
- !strcasecmp( p, ".m4v" ) ) )
- {
- if ( h264_30 == 1 )
- mux = HB_MUX_IPOD;
- else
- mux = HB_MUX_MP4;
- default_acodec = HB_ACODEC_FAAC;
- }
- else if( p && ( !strcasecmp( p, ".ogm" ) ||
- !strcasecmp( p, ".ogg" ) ) )
+ if( p && ( !strcasecmp( p, ".mp4" ) ||
+ !strcasecmp( p, ".m4v" ) ) )
{
- mux = HB_MUX_OGM;
- default_acodec = HB_ACODEC_VORBIS;
+ mux = HB_MUX_MP4;
}
else if( p && !strcasecmp(p, ".mkv" ) )
{
mux = HB_MUX_MKV;
- default_acodec = HB_ACODEC_AC3;
+#ifndef __APPLE_CC__
+ // default to Lame for MKV (except under OS X where Core Audio is available)
+ default_acodec = HB_ACODEC_LAME;
+#endif
}
else
{
return 0;
}
}
- else if( !strcasecmp( format, "avi" ) )
- {
- mux = HB_MUX_AVI;
- default_acodec = HB_ACODEC_LAME;
- }
else if( !strcasecmp( format, "mp4" ) ||
!strcasecmp( format, "m4v" ) )
{
- if ( h264_30 == 1)
- mux = HB_MUX_IPOD;
- else
- 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;
+ mux = HB_MUX_MP4;
}
else if( !strcasecmp( format, "mkv" ) )
{
mux = HB_MUX_MKV;
- default_acodec = HB_ACODEC_AC3;
+#ifndef __APPLE_CC__
+ // default to Lame for MKV (except under OS X where Core Audio is available)
+ default_acodec = HB_ACODEC_LAME;
+#endif
}
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;
}
}
{
return HB_ACODEC_AC3;
}
- else if( !strcasecmp( codec, "dts" ) || !strcasecmp( codec, "dca" ) )
+ else if( !strcasecmp( codec, "copy" ) )
+ {
+ return HB_ACODEC_AC3_PASS | HB_ACODEC_DCA_PASS;
+ }
+ else if( !strcasecmp( codec, "copy:ac3" ) )
+ {
+ return HB_ACODEC_AC3_PASS;
+ }
+ else if( !strcasecmp( codec, "copy:dts" ) || !strcasecmp( codec, "copy:dca" ) )
{
- return HB_ACODEC_DCA;
+ return HB_ACODEC_DCA_PASS;
}
else if( !strcasecmp( codec, "lame" ) )
{
* 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;
OSDN Git Service
