summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test.c805
1 files changed, 569 insertions, 236 deletions
diff --git a/test/test.c b/test/test.c
index 67b9450a9..3f250bc6c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1,4 +1,4 @@
-/* $Id: test.c,v 1.28 2004/03/22 19:18:57 titer Exp $
+/* $Id: test.c,v 1.81 2005/10/15 18:05:03 titer Exp $
This file is part of the HandBrake source code.
Homepage: <http://handbrake.m0k.org/>.
@@ -7,91 +7,446 @@
#include <signal.h>
#include <getopt.h>
-#include "HandBrake.h"
+#include "hb.h"
/* Options */
-static int verbose = 0;
+static int debug = HB_DEBUG_NONE;
+static int update = 0;
static char * input = NULL;
static char * output = NULL;
static char * format = NULL;
static int titleindex = 1;
static int twoPass = 0;
static int deinterlace = 0;
-static int vcodec = HB_CODEC_FFMPEG;
+static int grayscale = 0;
+static int vcodec = HB_VCODEC_FFMPEG;
static char * audios = NULL;
+static int sub = 0;
static int width = 0;
-static int top = 0;
-static int bottom = 0;
-static int left = 0;
-static int right = 0;
-static int autocrop = 0;
+static int height = 0;
+static int crop[4] = { -1,-1,-1,-1 };
static int cpu = 0;
-static int vbitrate = 1024;
+static int vrate = 0;
+static int arate = 0;
+static float vquality = -1.0;
+static int vbitrate = 0;
static int size = 0;
-static int abitrate = 128;
+static int abitrate = 0;
static int mux = 0;
static int acodec = 0;
+static int chapter_start = 0;
+static int chapter_end = 0;
/* Exit cleanly on Ctrl-C */
static volatile int die = 0;
static void SigHandler( int );
/* Utils */
+static void ShowCommands();
static void ShowHelp();
static int ParseOptions( int argc, char ** argv );
static int CheckOptions( int argc, char ** argv );
-
-/* libhb callbacks */
-static void Scanning( void * data, int title, int titleCount );
-static void ScanDone( void * data, HBList * titleList );
-static void Encoding( void * data, float position, int pass,
- int passCount, float frameRate,
- float avgFrameRate, int remainingTime );
-static void RipDone( void * data, int result );
+static int HandleEvents( hb_handle_t * h );
int main( int argc, char ** argv )
{
- HBHandle * h;
- HBCallbacks callbacks;
-
- fprintf( stderr, "HandBrake " HB_VERSION
- " - http://handbrake.m0k.org/\n" );
+ hb_handle_t * h;
+ int build;
+ char * version;
+ /* Parse command line */
if( ParseOptions( argc, argv ) ||
CheckOptions( argc, argv ) )
{
return 1;
}
- /* Exit ASAP on Ctrl-C */
- signal( SIGINT, SigHandler );
-
/* Init libhb */
- h = HBInit( verbose, cpu );
+ h = hb_init( debug, update );
+
+ /* Show version */
+ fprintf( stderr, "HandBrake %s (%d) - http://handbrake.m0k.org/\n",
+ hb_get_version( h ), hb_get_build( h ) );
+
+ /* Check for update */
+ if( update )
+ {
+ if( ( build = hb_check_update( h, &version ) ) > -1 )
+ {
+ fprintf( stderr, "You are using an old version of "
+ "HandBrake.\nLatest is %s (build %d).\n", version,
+ build );
+ }
+ else
+ {
+ fprintf( stderr, "Your version of HandBrake is up to "
+ "date.\n" );
+ }
+ hb_close( &h );
+ return 0;
+ }
- /* Set libhb callbacks */
- callbacks.data = h;
- callbacks.scanning = Scanning;
- callbacks.scanDone = ScanDone;
- callbacks.encoding = Encoding;
- callbacks.ripDone = RipDone;
- HBSetCallbacks( h, callbacks );
+ /* Geeky */
+ fprintf( stderr, "%d CPU%s detected\n", hb_get_cpu_count(),
+ hb_get_cpu_count( h ) > 1 ? "s" : "" );
+ if( cpu )
+ {
+ fprintf( stderr, "Forcing %d CPU%s\n", cpu,
+ cpu > 1 ? "s" : "" );
+ hb_set_cpu_count( h, cpu );
+ }
+
+ /* Exit ASAP on Ctrl-C */
+ signal( SIGINT, SigHandler );
/* Feed libhb with a DVD to scan */
fprintf( stderr, "Opening %s...\n", input );
- HBScanDVD( h, input, titleindex );
+ hb_scan( h, input, titleindex );
/* Wait... */
while( !die )
{
- HBSnooze( 500000 );
+#if !defined(SYS_BEOS)
+ fd_set fds;
+ struct timeval tv;
+ int ret;
+ char buf[257];
+
+ tv.tv_sec = 0;
+ tv.tv_usec = 100000;
+
+ FD_ZERO( &fds );
+ FD_SET( STDIN_FILENO, &fds );
+ ret = select( STDIN_FILENO + 1, &fds, NULL, NULL, &tv );
+
+ if( ret > 0 )
+ {
+ int size = 0;
+
+ while( size < 256 &&
+ read( STDIN_FILENO, &buf[size], 1 ) > 0 )
+ {
+ if( buf[size] == '\n' )
+ {
+ break;
+ }
+ size++;
+ }
+
+ if( size >= 256 || buf[size] == '\n' )
+ {
+ switch( buf[0] )
+ {
+ case 'q':
+ die = 1;
+ break;
+ case 'p':
+ hb_pause( h );
+ break;
+ case 'r':
+ hb_resume( h );
+ break;
+ case 'h':
+ ShowCommands();
+ break;
+ }
+ }
+ }
+#else
+ hb_snooze( 200 );
+#endif
+
+ HandleEvents( h );
}
/* Clean up */
- HBClose( &h );
+ hb_close( &h );
+ if( input ) free( input );
+ if( output ) free( output );
+ if( format ) free( format );
+ if( audios ) free( audios );
+
+ fprintf( stderr, "HandBrake has exited.\n" );
+
+ return 0;
+}
+
+static void ShowCommands()
+{
+ fprintf( stderr, "Commands:\n" );
+ fprintf( stderr, " [h]elp Show this message\n" );
+ fprintf( stderr, " [q]uit Exit HBTest\n" );
+ fprintf( stderr, " [p]ause Pause encoding\n" );
+ fprintf( stderr, " [r]esume Resume encoding\n" );
+}
+
+static void PrintTitleInfo( hb_title_t * title )
+{
+ hb_chapter_t * chapter;
+ hb_audio_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 );
+ fprintf( stderr, " + duration: %02d:%02d:%02d\n",
+ title->hours, title->minutes, title->seconds );
+ fprintf( stderr, " + size: %dx%d, aspect: %.2f, %.3f fps\n",
+ title->width, title->height,
+ (float) title->aspect / HB_ASPECT_BASE,
+ (float) title->rate / title->rate_base );
+ fprintf( stderr, " + autocrop: %d/%d/%d/%d\n", title->crop[0],
+ title->crop[1], title->crop[2], title->crop[3] );
+ fprintf( stderr, " + chapters:\n" );
+ 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 "
+ "%02d:%02d:%02d\n", chapter->index,
+ chapter->cell_start, chapter->cell_end,
+ chapter->block_count, chapter->hours, chapter->minutes,
+ chapter->seconds );
+ }
+ fprintf( stderr, " + audio tracks:\n" );
+ for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+ {
+ audio = hb_list_item( title->list_audio, i );
+ if( audio->codec & HB_ACODEC_AC3 )
+ {
+ fprintf( stderr, " + %x, %s, %dHz, %dbps\n", audio->id,
+ audio->lang, audio->rate, audio->bitrate );
+ }
+ else
+ {
+ fprintf( stderr, " + %x, %s\n", audio->id, audio->lang );
+ }
+ }
+ 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, " + %x, %s\n", subtitle->id, subtitle->lang );
+ }
+}
+
+static int HandleEvents( hb_handle_t * h )
+{
+ hb_state_t s;
+ hb_get_state( h, &s );
+ switch( s.state )
+ {
+ case HB_STATE_IDLE:
+ /* Nothing to do */
+ break;
+
+#define p s.param.scanning
+ case HB_STATE_SCANNING:
+ /* Show what title is currently being scanned */
+ fprintf( stderr, "Scanning title %d", p.title_cur );
+ if( !titleindex )
+ fprintf( stderr, " of %d", p.title_count );
+ fprintf( stderr, "...\n" );
+ break;
+#undef p
+
+ case HB_STATE_SCANDONE:
+ {
+ hb_list_t * list;
+ hb_title_t * title;
+ hb_job_t * job;
+
+ list = hb_get_titles( h );
+
+ if( !hb_list_count( list ) )
+ {
+ /* No valid title, stop right there */
+ fprintf( stderr, "No title found.\n" );
+ die = 1;
+ break;
+ }
+ if( !titleindex )
+ {
+ /* Scan-only mode, print infos and exit */
+ int i;
+ for( i = 0; i < hb_list_count( list ); i++ )
+ {
+ title = hb_list_item( list, i );
+ PrintTitleInfo( title );
+ }
+ die = 1;
+ break;
+ }
+
+ /* Set job settings */
+ title = hb_list_item( list, 0 );
+ job = title->job;
+
+ PrintTitleInfo( title );
+
+ if( chapter_start && chapter_end )
+ {
+ job->chapter_start = MAX( job->chapter_start,
+ chapter_start );
+ job->chapter_end = MIN( job->chapter_end,
+ chapter_end );
+ job->chapter_end = MAX( job->chapter_start,
+ job->chapter_end );
+ }
+
+ if( crop[0] >= 0 && crop[1] >= 0 &&
+ crop[2] >= 0 && crop[3] >= 0 )
+ {
+ memcpy( job->crop, crop, 4 * sizeof( int ) );
+ }
+
+ job->deinterlace = deinterlace;
+ job->grayscale = grayscale;
+
+ if( width && height )
+ {
+ job->width = width;
+ job->height = height;
+ }
+ else if( width )
+ {
+ job->width = width;
+ hb_fix_aspect( job, HB_KEEP_WIDTH );
+ }
+ else if( height )
+ {
+ job->height = height;
+ hb_fix_aspect( job, HB_KEEP_HEIGHT );
+ }
+ else
+ {
+ hb_fix_aspect( job, HB_KEEP_WIDTH );
+ }
+
+ if( vquality >= 0.0 && vquality <= 1.0 )
+ {
+ job->vquality = vquality;
+ job->vbitrate = 0;
+ }
+ else if( vbitrate )
+ {
+ job->vquality = -1.0;
+ job->vbitrate = vbitrate;
+ }
+ if( vcodec )
+ {
+ job->vcodec = vcodec;
+ }
+ if( vrate )
+ {
+ job->vrate = 27000000;
+ job->vrate_base = vrate;
+ }
+ if( arate )
+ {
+ job->arate = arate;
+ }
+
+ if( audios )
+ {
+ if( strcasecmp( audios, "none" ) )
+ {
+ int audio_count = 0;
+ char * tmp = audios;
+ while( *tmp )
+ {
+ if( *tmp < '0' || *tmp > '9' )
+ {
+ /* Skip non numeric char */
+ tmp++;
+ continue;
+ }
+ job->audios[audio_count++] =
+ strtol( tmp, &tmp, 0 ) - 1;
+ }
+ job->audios[audio_count] = -1;
+ }
+ else
+ {
+ job->audios[0] = -1;
+ }
+ }
+ if( abitrate )
+ {
+ job->abitrate = abitrate;
+ }
+ if( acodec )
+ {
+ job->acodec = acodec;
+ }
+
+ if( size )
+ {
+ job->vbitrate = hb_calc_bitrate( job, size );
+ fprintf( stderr, "Calculated bitrate: %d kbps\n",
+ job->vbitrate );
+ }
+
+ if( sub )
+ {
+ job->subtitle = sub - 1;
+ }
+
+ if( job->mux )
+ {
+ job->mux = mux;
+ }
+ job->file = strdup( output );
+
+ if( twoPass )
+ {
+ job->pass = 1;
+ hb_add( h, job );
+ job->pass = 2;
+ hb_add( h, job );
+ }
+ else
+ {
+ job->pass = 0;
+ hb_add( h, job );
+ }
+ hb_start( h );
+ break;
+ }
- fprintf( stderr, "HandBrake has exited cleanly.\n" );
+#define p s.param.working
+ case HB_STATE_WORKING:
+ fprintf( stderr, "\rEncoding: task %d of %d, %.2f %%",
+ p.job_cur, p.job_count, 100.0 * p.progress );
+ if( p.seconds > -1 )
+ {
+ fprintf( stderr, " (%.2f fps, avg %.2f fps, ETA "
+ "%02dh%02dm%02ds)", p.rate_cur, p.rate_avg,
+ p.hours, p.minutes, p.seconds );
+ }
+ break;
+#undef p
+#define p s.param.workdone
+ case HB_STATE_WORKDONE:
+ /* Print error if any, then exit */
+ switch( p.error )
+ {
+ case HB_ERROR_NONE:
+ fprintf( stderr, "\nRip done!\n" );
+ break;
+ case HB_ERROR_CANCELED:
+ fprintf( stderr, "\nRip canceled.\n" );
+ break;
+ default:
+ fprintf( stderr, "\nRip failed (error %x).\n",
+ p.error );
+ }
+ die = 1;
+ break;
+#undef p
+ }
return 0;
}
@@ -103,16 +458,16 @@ void SigHandler( int i_signal )
{
if( die == 0 )
{
- i_die_date = HBGetDate();
+ die = 1;
+ i_die_date = hb_get_date();
fprintf( stderr, "Signal %d received, terminating - do it "
"again in case it gets stuck\n", i_signal );
}
- else if( i_die_date + 500000 < HBGetDate() )
+ else if( i_die_date + 500 < hb_get_date() )
{
fprintf( stderr, "Dying badly, files might remain in your /tmp\n" );
exit( 1 );
}
- die = 1;
}
/****************************************************************************
@@ -120,39 +475,63 @@ void SigHandler( int i_signal )
****************************************************************************/
static void ShowHelp()
{
+ int i;
+
fprintf( stderr,
"Syntax: HBTest [options] -i <device> -o <file>\n"
"\n"
- " -h, --help Print help\n"
- " -v, --verbose Be verbose\n"
- " -C, --cpu Set CPU count (default: autodetected)\n"
+ " -h, --help Print help\n"
+ " -u, --update Check for updates and exit\n"
+ " -v, --verbose Be verbose\n"
+ " -C, --cpu Set CPU count (default: autodetected)\n"
"\n"
- " -f, --format <string> Set output format (avi/mp4/ogm, default:\n"
- " autodetected)\n"
- " -i, --input <string> Set input device\n"
- " -o, --output <string> Set output file name\n"
+ " -f, --format <string> Set output format (avi/mp4/ogm, default:\n"
+ " autodetected from file name)\n"
+ " -i, --input <string> Set input device\n"
+ " -o, --output <string> Set output file name\n"
"\n"
- " --scan Only scan the device\n"
- " -t, --title <number> Select a title to encode (0 to scan only,\n"
- " default: 1)\n"
- " -a, --audio <string> Select audio channel(s) (none for no audio,\n"
- " default: first one)\n"
- " --noaudio Disable audio\n"
+ " -t, --title <number> Select a title to encode (0 to scan only,\n"
+ " default: 1)\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"
+ " -a, --audio <string> Select audio channel(s) (\"none\" for no \n"
+ " audio, default: first one)\n"
"\n"
- " -c, --codec <string> Set video library encoder (ffmpeg/xvid/x264,\n"
- " default: ffmpeg)\n"
- " -2, --two-pass Use two-pass mode\n"
- " -d, --deinterlace Deinterlace video\n"
+ " -s, --subtitle <number> Select subtitle (default: none)\n"
+ " -e, --encoder <string> Set video library encoder (ffmpeg/xvid/x264,\n"
+ " default: ffmpeg)\n"
+ " -E, --aencoder <string> Set audio encoder (faac/lame/vorbis/ac3, ac3\n"
+ " meaning passthrough, default: guessed)\n"
+ " -2, --two-pass Use two-pass mode\n"
+ " -d, --deinterlace Deinterlace video\n"
+ " -g, --grayscale Grayscale encoding\n"
"\n"
- " -b, --vb <kb/s> Set video bitrate (default: 1024)\n"
- " -s, --size <MB> Set target size instead of bitrate\n"
- " -B, --ab <kb/s> Set audio bitrate (default: 128)\n"
- " -w, --width <number> Set picture width\n"
- " --crop <T:B:L:R> Set cropping values\n"
- " --autocrop Use autodetected cropping values\n" );
+ " -r, --rate Set video framerate (" );
+ for( i = 0; i < hb_video_rates_count; i++ )
+ {
+ fprintf( stderr, hb_video_rates[i].string );
+ if( i != hb_video_rates_count - 1 )
+ fprintf( stderr, "/" );
+ }
+ fprintf( stderr, ")\n"
+ " -R, --arate Set audio samplerate (" );
+ for( i = 0; i < hb_audio_rates_count; i++ )
+ {
+ fprintf( stderr, hb_audio_rates[i].string );
+ if( i != hb_audio_rates_count - 1 )
+ fprintf( stderr, "/" );
+ }
+ fprintf( stderr, ")\n"
+ " -b, --vb <kb/s> Set video bitrate (default: 1000)\n"
+ " -q, --quality <float> Set video quality (0.0..1.0)\n"
+ " -S, --size <MB> Set target size\n"
+ " -B, --ab <kb/s> Set audio bitrate (default: 128)\n"
+ " -w, --width <number> Set picture width\n"
+ " -l, --height <number> Set picture height\n"
+ " --crop <T:B:L:R> Set cropping values (default: autocrop)\n" );
}
-
/****************************************************************************
* ParseOptions:
****************************************************************************/
@@ -163,6 +542,7 @@ static int ParseOptions( int argc, char ** argv )
static struct option long_options[] =
{
{ "help", no_argument, NULL, 'h' },
+ { "update", no_argument, NULL, 'u' },
{ "verbose", no_argument, NULL, 'v' },
{ "cpu", required_argument, NULL, 'C' },
@@ -170,21 +550,26 @@ static int ParseOptions( int argc, char ** argv )
{ "input", required_argument, NULL, 'i' },
{ "output", required_argument, NULL, 'o' },
- { "scan", no_argument, NULL, 'S' },
{ "title", required_argument, NULL, 't' },
+ { "chapters", required_argument, NULL, 'c' },
{ "audio", required_argument, NULL, 'a' },
- { "noaudio", no_argument, NULL, 'a' },
+ { "subtitle", required_argument, NULL, 's' },
- { "codec", required_argument, NULL, 'c' },
+ { "encoder", required_argument, NULL, 'e' },
+ { "aencoder", required_argument, NULL, 'E' },
{ "two-pass", no_argument, NULL, '2' },
{ "deinterlace", no_argument, NULL, 'd' },
+ { "grayscale", no_argument, NULL, 'g' },
{ "width", required_argument, NULL, 'w' },
+ { "height", required_argument, NULL, 'l' },
{ "crop", required_argument, NULL, 'n' },
- { "autocrop", no_argument, NULL, 'z' },
{ "vb", required_argument, NULL, 'b' },
- { "size", required_argument, NULL, 's' },
+ { "quality", required_argument, NULL, 'q' },
+ { "size", required_argument, NULL, 'S' },
{ "ab", required_argument, NULL, 'B' },
+ { "rate", required_argument, NULL, 'r' },
+ { "arate", required_argument, NULL, 'R' },
{ 0, 0, 0, 0 }
};
@@ -192,7 +577,8 @@ static int ParseOptions( int argc, char ** argv )
int option_index = 0;
int c;
- c = getopt_long( argc, argv, "hvC:f:i:o:St:a:c:2dw:n:zb:s:B:",
+ c = getopt_long( argc, argv,
+ "hvuC:f:i:o:t:c:a:s:e:E:2dgw:l:n:b:q:S:B:r:R:",
long_options, &option_index );
if( c < 0 )
{
@@ -204,8 +590,11 @@ static int ParseOptions( int argc, char ** argv )
case 'h':
ShowHelp();
exit( 0 );
+ case 'u':
+ update = 1;
+ break;
case 'v':
- verbose = 1;
+ debug = HB_DEBUG_ALL;
break;
case 'C':
cpu = atoi( optarg );
@@ -221,14 +610,35 @@ static int ParseOptions( int argc, char ** argv )
output = strdup( optarg );
break;
- case 'S':
- titleindex = 0;
- break;
case 't':
titleindex = atoi( optarg );
break;
+ case 'c':
+ {
+ int start, end;
+ if( sscanf( optarg, "%d-%d", &start, &end ) == 2 )
+ {
+ chapter_start = start;
+ chapter_end = end;
+ }
+ else if( sscanf( optarg, "%d", &start ) == 1 )
+ {
+ chapter_start = start;
+ chapter_end = chapter_start;
+ }
+ else
+ {
+ fprintf( stderr, "chapters: invalid syntax (%s)\n",
+ optarg );
+ return -1;
+ }
+ break;
+ }
case 'a':
- audios = strdup( optarg ? optarg : "none" );
+ audios = strdup( optarg );
+ break;
+ case 's':
+ sub = atoi( optarg );
break;
case '2':
@@ -237,18 +647,21 @@ static int ParseOptions( int argc, char ** argv )
case 'd':
deinterlace = 1;
break;
- case 'c':
+ case 'g':
+ grayscale = 1;
+ break;
+ case 'e':
if( !strcasecmp( optarg, "ffmpeg" ) )
{
- vcodec = HB_CODEC_FFMPEG;
+ vcodec = HB_VCODEC_FFMPEG;
}
else if( !strcasecmp( optarg, "xvid" ) )
{
- vcodec = HB_CODEC_XVID;
+ vcodec = HB_VCODEC_XVID;
}
else if( !strcasecmp( optarg, "x264" ) )
{
- vcodec = HB_CODEC_X264;
+ vcodec = HB_VCODEC_X264;
}
else
{
@@ -256,42 +669,78 @@ static int ParseOptions( int argc, char ** argv )
return -1;
}
break;
+ case 'E':
+ if( !strcasecmp( optarg, "ac3" ) )
+ {
+ acodec = HB_ACODEC_AC3;
+ }
+ else if( !strcasecmp( optarg, "lame" ) )
+ {
+ acodec = HB_ACODEC_LAME;
+ }
+ break;
case 'w':
width = atoi( optarg );
break;
+ case 'l':
+ height = atoi( optarg );
+ break;
case 'n':
{
- char * crop = strdup( optarg );
- char * _2be3 = crop;
-
- if( *crop )
+ int i;
+ char * tmp = optarg;
+ for( i = 0; i < 4; i++ )
{
- top = strtol( crop, &crop, 0 ); crop++;
+ if( !*tmp )
+ break;
+ crop[i] = strtol( tmp, &tmp, 0 );
+ tmp++;
}
- if( *crop )
+ break;
+ }
+ case 'r':
+ {
+ int i;
+ vrate = 0;
+ for( i = 0; i < hb_video_rates_count; i++ )
{
- bottom = strtol( crop, &crop, 0 ); crop++;
+ if( !strcmp( optarg, hb_video_rates[i].string ) )
+ {
+ vrate = hb_video_rates[i].rate;
+ break;
+ }
}
- if( *crop )
+ if( !vrate )
{
- left = strtol( crop, &crop, 0 ); crop++;
+ fprintf( stderr, "invalid framerate %s\n", optarg );
}
- if( *crop )
+ break;
+ }
+ case 'R':
+ {
+ int i;
+ arate = 0;
+ for( i = 0; i < hb_audio_rates_count; i++ )
{
- right = strtol( crop, &crop, 0 ); crop++;
+ if( !strcmp( optarg, hb_audio_rates[i].string ) )
+ {
+ arate = hb_audio_rates[i].rate;
+ break;
+ }
+ }
+ if( !arate )
+ {
+ fprintf( stderr, "invalid framerate %s\n", optarg );
}
-
- free( _2be3 );
break;
}
- case 'z':
- autocrop = 1;
- break;
-
case 'b':
vbitrate = atoi( optarg );
break;
- case 's':
+ case 'q':
+ vquality = atof( optarg );
+ break;
+ case 'S':
size = atoi( optarg );
break;
case 'B':
@@ -309,6 +758,11 @@ static int ParseOptions( int argc, char ** argv )
static int CheckOptions( int argc, char ** argv )
{
+ if( update )
+ {
+ return 0;
+ }
+
if( input == NULL || *input == '\0' )
{
fprintf( stderr, "Missing input device. Run %s --help for "
@@ -328,7 +782,8 @@ static int CheckOptions( int argc, char ** argv )
if( !format )
{
- char *p = strrchr( output, '.' );
+ char * p = strrchr( output, '.' );
+
/* autodetect */
if( p && !strcasecmp( p, ".avi" ) )
{
@@ -343,12 +798,11 @@ static int CheckOptions( int argc, char ** argv )
{
mux = HB_MUX_OGM;
}
-
else
{
fprintf( stderr, "Output format couldn't be guessed "
- "from file name, please use --format.\n" );
- return 1;
+ "from file name, using default.\n" );
+ return 0;
}
}
else if( !strcasecmp( format, "avi" ) )
@@ -370,145 +824,24 @@ static int CheckOptions( int argc, char ** argv )
"choices are avi, mp4 and ogm\n.", format );
return 1;
}
- if( mux == HB_MUX_MP4 )
- {
- acodec = HB_CODEC_AAC;
- }
- else if( mux == HB_MUX_AVI )
- {
- acodec = HB_CODEC_MP3;
- }
- else if( mux == HB_MUX_OGM )
- {
- acodec = HB_CODEC_VORBIS;
- }
- }
-
- return 0;
-}
-static void Scanning( void * data, int title, int titleCount )
-{
- if( titleindex )
- {
- fprintf( stderr, "Scanning title %d...\n", title );
- }
- else
- {
- fprintf( stderr, "Scanning title %d/%d...\n", title, titleCount );
- }
-}
-
-static void ScanDone( void * data, HBList * titleList )
-{
- HBHandle * h = (HBHandle*) data;
- HBAudio * audio;
- HBTitle * title;
-
- if( !titleList )
- {
- fprintf( stderr, "No title found. Invalid device?\n" );
- die = 1;
- return;
- }
- if( !titleindex )
- {
- die = 1;
- return;
- }
-
- title = HBListItemAt( titleList, 0 );
- title->file = strdup( output );
- title->twoPass = twoPass;
- title->deinterlace = deinterlace;
- if( width )
- {
- title->outWidth = width;
- }
- if( autocrop )
- {
- title->topCrop = title->autoTopCrop;
- title->bottomCrop = title->autoBottomCrop;
- title->leftCrop = title->autoLeftCrop;
- title->rightCrop = title->autoRightCrop;
- }
- else
- {
- title->topCrop = top;
- title->bottomCrop = bottom;
- title->leftCrop = left;
- title->rightCrop = right;
- }
- fprintf( stderr, "Cropping: T=%d,B=%d,L=%d,R=%d\n",
- title->topCrop, title->bottomCrop,
- title->leftCrop, title->rightCrop );
- title->bitrate = vbitrate;
- title->codec = vcodec;
- title->mux = mux;
-
- if( audios == NULL )
- {
- audio = HBListItemAt( title->audioList, 0 );
- audio->outBitrate = abitrate;
- audio->outCodec = acodec;
- HBListAdd( title->ripAudioList, audio );
- }
- else if( strcasecmp( audios, "none" ) )
- {
- char *tmp = audios;
-
- while( *tmp )
+ if( !acodec )
{
- int i;
-
- if( *tmp < '0' || *tmp > '9' )
+ if( mux == HB_MUX_MP4 )
{
- /* Skip non numeric char */
- tmp++;
- continue;
+ acodec = HB_ACODEC_FAAC;
+ }
+ else if( mux == HB_MUX_AVI )
+ {
+ acodec = HB_ACODEC_LAME;
+ }
+ else if( mux == HB_MUX_OGM )
+ {
+ acodec = HB_ACODEC_VORBIS;
}
-
- i = strtol( tmp, &tmp, 0 );
- audio = HBListItemAt( title->audioList, i - 1 );
- audio->outBitrate = abitrate;
- audio->outCodec = acodec;
- HBListAdd( title->ripAudioList, audio );
}
}
- if( size )
- {
- title->bitrate = HBGetBitrateForSize( title, size, title->mux,
- HBListCount( title->ripAudioList ), abitrate );
- fprintf( stderr, "Calculated bitrate: %d kbps\n", title->bitrate );
- }
- HBStartRip( h, title );
-}
-
-static void Encoding( void * data, float position, int pass,
- int passCount, float frameRate,
- float avgFrameRate, int remainingTime )
-{
- fprintf( stderr, "%6.2f %% (pass: %d/%d, cur/avg speed: "
- "%5.2f/%5.2f fps, %02d:%02d:%02d remaining)\n",
- 100.0 * position, pass, passCount, frameRate, avgFrameRate,
- remainingTime / 3600, ( remainingTime / 60 ) % 60,
- remainingTime % 60 );
-}
-
-static void RipDone( void * data, int result )
-{
- switch( result )
- {
- case HB_SUCCESS:
- fprintf( stderr, "Rip done!\n" );
- break;
- case HB_CANCELED:
- fprintf( stderr, "Rip canceled.\n" );
- break;
- default:
- fprintf( stderr, "Rip failed (error %x).\n", result );
- }
- die = 1;
+ return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 19:47:55 +0000