vquality: output quality (0.0..1.0)
if < 0.0 or > 1.0, bitrate is used instead
vbitrate: output bitrate (kbps)
- pass: 0, 1 or 2
+ pass: 0, 1 or 2 (or -1 for scan)
vrate, vrate_base: output framerate is vrate / vrate_base
h264_level: boolean for whether or not we're encoding for iPod
crf: boolean for whether to use constant rate factor with x264
char iso639_2[4];
int hits; /* How many hits/occurrences of this subtitle */
+ int forced_hits; /* How many forced hits in this subtitle */
#ifdef __LIBHB__
/* Internal data */
int y;
int width;
int height;
+ int stream_id;
int offsets[2];
uint8_t lum[4];
int size_sub, size_rle;
+ pv->stream_id = in->id;
+
size_sub = ( in->data[0] << 8 ) | in->data[1];
size_rle = ( in->data[2] << 8 ) | in->data[3];
hb_work_private_t * pv = w->private_data;
hb_job_t * job = pv->job;
hb_title_t * title = job->title;
+ hb_subtitle_t * subtitle;
- int i;
+ int i, n;
int command;
int date, next;
case 0x00: // 0x00 - FSTA_DSP - Forced Start Display, no arguments
pv->pts_start = pv->pts + date * 900;
pv->pts_forced = 1;
+
+ /*
+ * If we are doing a subtitle scan then note down
+ */
+ if( job->subtitle_scan )
+ {
+ for( n=0; n < hb_list_count(title->list_subtitle); n++ )
+ {
+ subtitle = hb_list_item( title->list_subtitle, n);
+ if( pv->stream_id == subtitle->id ) {
+ /*
+ * A hit, count it.
+ */
+ subtitle->forced_hits++;
+ }
+ }
+ }
break;
case 0x01: // 0x01 - STA_DSP - Start Display, no arguments
pv->chromaU[3-j],
pv->chromaV[3-j]);
*/
- }
+ }
i += 2;
break;
}
/* Get infos about the subtitle */
ParseControls( w );
- if( job->subtitle_force && pv->pts_forced == 0 )
+ if( job->subtitle_scan || ( job->subtitle_force && pv->pts_forced == 0 ) )
{
/*
+ * Don't encode subtitles when doing a scan.
+ *
* When forcing subtitles, ignore all those that don't
* have the forced flag set.
*/
return NULL;
- }
+ }
/* Do the actual decoding now */
- buf_raw = malloc( pv->width * pv->height * 4 );
+ buf_raw = malloc( ( pv->width * pv->height ) * 4 );
#define GET_NEXT_NIBBLE code = ( code << 4 ) | ( ( ( *offset & 1 ) ? \
( pv->buf[((*offset)>>1)] & 0xF ) : ( pv->buf[((*offset)>>1)] >> 4 ) ) ); \
for( ;; )
{
- int block, pack_len, next_vobu;
+ int block, pack_len, next_vobu, read_retry;
- if( DVDReadBlocks( d->file, d->next_vobu, 1, b->data ) != 1 )
+ for( read_retry = 0; read_retry < 3; read_retry++ )
+ {
+ if( DVDReadBlocks( d->file, d->next_vobu, 1, b->data ) == 1 )
+ {
+ /*
+ * Successful read.
+ */
+ break;
+ } else {
+ hb_log( "dvd: Read Error on blk %d, attempt %d",
+ d->next_vobu, read_retry );
+ }
+ }
+
+ if( read_retry == 3 )
{
hb_log( "dvd: Unrecoverable Read Error from DVD, potential HD or DVD Failure (blk: %d)", d->next_vobu );
return 0;
context->flags |= CODEC_FLAG_GRAY;
}
- if( job->pass )
+ if( job->pass != 0 && job->pass != -1 )
{
char filename[1024]; memset( filename, 0, 1024 );
hb_get_tempory_filename( job->h, filename, "ffmpeg.log" );
/* The thread which processes the jobs. Others threads are launched
from this one (see work.c) */
hb_list_t * jobs;
+ hb_job_t * current_job;
int job_count;
int job_count_permanent;
volatile int work_die;
h->list_title = hb_list_init();
h->jobs = hb_list_init();
+ h->current_job = NULL;
h->state_lock = hb_lock_init();
h->state.state = HB_STATE_IDLE;
return hb_list_item( h->jobs, i );
}
+hb_job_t * hb_current_job( hb_handle_t * h )
+{
+ return( h->current_job );
+}
+
/**
* Adds a job to the job list.
* @param h Handle to hb_handle_t.
title_copy->list_audio = hb_list_init();
/* Do nothing about audio during first pass */
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2 )
{
for( i = 0; i < 8; i++ )
{
title_copy->list_subtitle = hb_list_init();
/*
- * The following code is confusing, there are three ways in which we select subtitles
- * and it depends on whether this is single or two pass mode.
+ * The following code is confusing, there are three ways in which
+ * we select subtitles and it depends on whether this is single or
+ * two pass mode.
*
- * subtitle_scan may be enabled, in which case the first pass scans all subtitles
- * of that language. The second pass does not select any because they are set at the
- * end of the first pass.
+ * subtitle_scan may be enabled, in which case the first pass
+ * scans all subtitles of that language. The second pass does not
+ * select any because they are set at the end of the first pass.
*
- * native_language may have a preferred language, in which case we may be switching
- * the language we want for the subtitles in the first pass of a single pass, or the
- * second pass of a two pass.
+ * native_language may have a preferred language, in which case we
+ * may be switching the language we want for the subtitles in the
+ * first pass of a single pass, or the second pass of a two pass.
*
- * We may have manually selected a subtitle, in which case that is selected in the
- * first pass of a single pass, or the second of a two pass.
+ * We may have manually selected a subtitle, in which case that is
+ * selected in the first pass of a single pass, or the second of a
+ * two pass.
*/
memset( audio_lang, 0, sizeof( audio_lang ) );
{
/*
* Don't add subtitles here, we'll add them via select_subtitle
- * at the end of pass 1
+ * at the end of the subtitle_scan.
*/
} else {
/*
h->work_die = 0;
h->work_thread = hb_work_init( h->jobs, h->cpu_count,
- &h->work_die, &h->work_error );
+ &h->work_die, &h->work_error, &h->current_job );
}
/**
hb_thread_t * hb_scan_init( hb_handle_t *, const char * path,
int title_index, hb_list_t * list_title );
hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
- volatile int * die, int * error );
+ volatile int * die, int * error, hb_job_t ** job );
hb_thread_t * hb_reader_init( hb_job_t * );
hb_thread_t * hb_muxer_init( hb_job_t * );
hb_mux_object_t * m = NULL;
/* Get a real muxer */
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2)
{
switch( job->mux )
{
}
/* Create file, write headers */
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2 )
{
m->init( m );
}
// thread_sleep_interval = MAX(1, (thread_sleep_interval - 1));
buf = hb_fifo_get( track->fifo );
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2 )
{
m->mux( m, track->mux_data, buf );
track->frames += 1;
hb_buffer_close( &buf );
}
- if( job->pass != 1 )
+ if( job->pass == 0 || job->pass == 2 )
{
struct stat sb;
uint64_t bytes_total, frames_total;
if( id == 0xE0 )
{
- return job->fifo_mpeg2;
+ if( !job->subtitle_scan )
+ {
+ return job->fifo_mpeg2;
+ } else {
+ /*
+ * Ditch the mpeg2 video when doing a subtitle scan.
+ */
+ return NULL;
+ }
}
if (job->subtitle_scan) {
/*
- * Count the occurances of the subtitles, don't actually return any to encode.
+ * Count the occurances of the subtitles, don't actually
+ * return any to encode unless we are looking fro forced
+ * subtitles in which case we need to look in the sub picture
+ * to see if it has the forced flag enabled.
*/
for (i=0; i < hb_list_count(title->list_subtitle); i++) {
subtitle = hb_list_item( title->list_subtitle, i);
* A hit, count it.
*/
subtitle->hits++;
+ if( job->subtitle_force )
+ {
+ return subtitle->fifo_in;
+ }
+ break;
}
}
} else {
* Merge the luminance and alpha with the picture
*/
out[j] = ( (uint16_t) out[j] * ( 16 - (uint16_t) alpha[j] ) +
- (uint16_t) lum[j] * (uint16_t) alpha[j] ) >> 4;
+ (uint16_t) lum[j] * (uint16_t) alpha[j] ) >> 4;
/*
* Set the chroma (colour) based on whether there is
* any alpha at all. Don't try to blend with the picture.
typedef struct
{
hb_list_t * jobs;
+ hb_job_t ** current_job;
int cpu_count;
int * error;
volatile int * die;
* @param error Handle to error indicator.
*/
hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
- volatile int * die, int * error )
+ volatile int * die, int * error, hb_job_t ** job )
{
hb_work_t * work = calloc( sizeof( hb_work_t ), 1 );
work->jobs = jobs;
+ work->current_job = job;
work->cpu_count = cpu_count;
work->die = die;
work->error = error;
{
hb_list_rem( work->jobs, job );
job->die = work->die;
+ *(work->current_job) = job;
do_job( job, work->cpu_count );
+ *(work->current_job) = NULL;
}
*(work->error) = HB_ERROR_NONE;
/* FIXME: This feels really hackish, anything better? */
hb_work_object_t * audio_w = NULL;
+ hb_work_object_t * sub_w = NULL;
hb_audio_t * audio;
hb_subtitle_t * subtitle;
unsigned int subtitle_highest_id = 0;
unsigned int subtitle_lowest = -1;
unsigned int subtitle_lowest_id = 0;
+ unsigned int subtitle_forced_id = 0;
unsigned int subtitle_hit = 0;
title = job->title;
* add the subtitle that we found on the first pass for use in this
* pass.
*/
- hb_list_add( title->list_subtitle, *( job->select_subtitle ) );
+ if (*(job->select_subtitle))
+ {
+ hb_list_add( title->list_subtitle, *( job->select_subtitle ) );
+ }
}
for( i=0; i < hb_list_count(title->list_subtitle); i++ )
subtitle->fifo_in = hb_fifo_init( 8 );
subtitle->fifo_raw = hb_fifo_init( 8 );
- if (!job->subtitle_scan) {
+ /*
+ * Disable forced subtitles if we didn't find any in the scan
+ * so that we display normal subtitles instead.
+ *
+ * select_subtitle implies that we did a scan.
+ */
+ if( !job->subtitle_scan && job->subtitle_force &&
+ job->select_subtitle )
+ {
+ if( subtitle->forced_hits == 0 )
+ {
+ job->subtitle_force = 0;
+ }
+ }
+
+ if (!job->subtitle_scan || job->subtitle_force) {
/*
- * Don't add threads for subtitles when we are scanning
+ * Don't add threads for subtitles when we are scanning, unless
+ * looking for forced subtitles.
*/
- hb_list_add( job->list_work, ( w = getWork( WORK_DECSUB ) ) );
- w->fifo_in = subtitle->fifo_in;
- w->fifo_out = subtitle->fifo_raw;
+ if( sub_w != NULL )
+ {
+ /*
+ * Need to copy the prior subtitle structure so that we
+ * don't overwrite the fifos.
+ */
+ sub_w = calloc( sizeof( hb_work_object_t ), 1 );
+ sub_w = memcpy( sub_w, w, sizeof( hb_work_object_t ));
+ } else {
+ w = sub_w = getWork( WORK_DECSUB );
+ }
+ hb_list_add( job->list_work, sub_w );
+ sub_w->fifo_in = subtitle->fifo_in;
+ sub_w->fifo_out = subtitle->fifo_raw;
}
}
}
for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
{
subtitle = hb_list_item( title->list_subtitle, i );
- hb_log( "Subtitle stream 0x%x '%s': %d hits",
- subtitle->id, subtitle->lang, subtitle->hits );
+ hb_log( "Subtitle stream 0x%x '%s': %d hits (%d forced)",
+ subtitle->id, subtitle->lang, subtitle->hits,
+ subtitle->forced_hits );
if( subtitle->hits > subtitle_highest )
{
subtitle_highest = subtitle->hits;
subtitle_lowest = subtitle->hits;
subtitle_lowest_id = subtitle->id;
}
+
+ if ( subtitle->forced_hits > 0 )
+ {
+ subtitle_forced_id = subtitle->id;
+ }
}
if( job->native_language ) {
subtitle_hit = subtitle_highest_id;
hb_log( "Found a native-language subtitle id 0x%x", subtitle_hit);
} else {
- if( subtitle_lowest < subtitle_highest )
+ if( subtitle_forced_id )
+ {
+ /*
+ * If there are any subtitle streams with forced subtitles
+ * then select it in preference to the lowest.
+ */
+ subtitle_hit = subtitle_forced_id;
+ hb_log("Found a subtitle candidate id 0x%x (contains forced subs)",
+ subtitle_hit);
+ } else if( subtitle_lowest < subtitle_highest )
{
/*
- * OK we have more than one, and the lowest is lower, but how much
- * lower to qualify for turning it on by default?
+ * OK we have more than one, and the lowest is lower,
+ * but how much lower to qualify for turning it on by
+ * default?
*
* Let's say 10% as a default.
*/
for( i=0; i < hb_list_count( title->list_subtitle ); i++ )
{
subtitle = hb_list_item( title->list_subtitle, i );
- if( subtitle->id = subtitle_hit )
+ if( subtitle->id == subtitle_hit )
{
hb_list_rem( title->list_subtitle, subtitle );
*( job->select_subtitle ) = subtitle;
}
} else {
/*
- * Must be the second pass - we don't need this anymore.
+ * Must be the end of pass 0 or 2 - we don't need this anymore.
+ *
+ * Have to put the subtitle list back together in the title though
+ * or the GUI will have a hissy fit.
*/
free( job->select_subtitle );
job->select_subtitle = NULL;
/* Subtitle settings */
- job->subtitle = [fSubPopUp indexOfSelectedItem] - 1;
+ job->subtitle = [fSubPopUp indexOfSelectedItem] - 3;
/* Audio tracks and mixdowns */
/* check for the condition where track 2 has an audio selected, but track 1 does not */
/* Destination file */
job->file = [[fDstFile2Field stringValue] UTF8String];
-
+
+ if( job->subtitle == -1 )
+ {
+ job->subtitle_force = 1;
+ } else {
+ job->subtitle_force = 0;
+ }
+
+ /*
+ * subtitle of -1 and -2 is a scan
+ */
+ if( job->subtitle == -1 ||
+ job->subtitle == -2 )
+ {
+ char *x264opts_tmp;
+
+ /*
+ * When subtitle scan is enabled do a fast pre-scan job
+ * which will determine which subtitles to enable, if any.
+ */
+ job->pass = -1;
+ x264opts_tmp = job->x264opts;
+ job->subtitle = -1;
+
+ job->x264opts = NULL;
+
+ job->subtitle_scan = 1;
+
+ job->select_subtitle = (hb_subtitle_t**)malloc(sizeof(hb_subtitle_t*));
+ *(job->select_subtitle) = NULL;
+
+ /*
+ * Add the pre-scan job
+ */
+ hb_add( fHandle, job );
+
+ job->x264opts = x264opts_tmp;
+ } else {
+ job->select_subtitle = NULL;
+ }
+
+ /* No subtitle were selected, so reset the subtitle to -1 (which before
+ * this point meant we were scanning
+ */
+ if( job->subtitle == -3 )
+ {
+ job->subtitle = -1;
+ }
+
if( [fVidTwoPassCheck state] == NSOnState )
{
+ hb_subtitle_t **subtitle_tmp = job->select_subtitle;
+
+ job->select_subtitle = NULL;
+
+ job->subtitle_scan = 0;
+
job->pass = 1;
hb_add( fHandle, job );
job->pass = 2;
job->x264opts = (char *)calloc(1024, 1); /* Fixme, this just leaks */
strcpy(job->x264opts, [[fDisplayX264Options stringValue] UTF8String]);
-
+
+ job->select_subtitle = subtitle_tmp;
+
hb_add( fHandle, job );
}
else
{
+ job->subtitle_scan = 0;
job->pass = 0;
hb_add( fHandle, job );
}
hb_subtitle_t * subtitle;
[fSubPopUp removeAllItems];
[fSubPopUp addItemWithTitle: @"None"];
+ [fSubPopUp addItemWithTitle: @"Autoselect"];
+ [fSubPopUp addItemWithTitle: @"Autoselect (forced only)"];
for( int i = 0; i < hb_list_count( title->list_subtitle ); i++ )
{
subtitle = (hb_subtitle_t *) hb_list_item( title->list_subtitle, i );
job->maxWidth = maxWidth;
if (maxHeight)
job->maxHeight = maxHeight;
-
+
if( subtitle_force )
{
job->subtitle_force = subtitle_force;
- }
-
+ }
+
+ if( subtitle_scan )
+ {
+ char *x264opts_tmp;
+
+ /*
+ * When subtitle scan is enabled do a fast pre-scan job
+ * which will determine which subtitles to enable, if any.
+ */
+ job->pass = -1;
+
+ x264opts_tmp = job->x264opts;
+
+ job->x264opts = NULL;
+
+ job->subtitle_scan = subtitle_scan;
+ fprintf( stderr, "Subtitle Scan Enabled - enabling "
+ "subtitles if found for foreign language segments\n");
+ job->select_subtitle = malloc(sizeof(hb_subtitle_t*));
+ *(job->select_subtitle) = NULL;
+
+ /*
+ * Add the pre-scan job
+ */
+ hb_add( h, job );
+
+ job->x264opts = x264opts_tmp;
+ }
+
if( twoPass )
{
/*
* for the first pass and then off again for the
* second.
*/
+ hb_subtitle_t **subtitle_tmp = job->select_subtitle;
+
+ job->select_subtitle = NULL;
+
job->pass = 1;
- job->subtitle_scan = subtitle_scan;
- if( subtitle_scan )
- {
- fprintf( stderr, "Subtitle Scan Enabled - enabling "
- "subtitles if found for foreign language segments\n");
- job->select_subtitle = malloc(sizeof(hb_subtitle_t*));
- *(job->select_subtitle) = NULL;
- }
+
+ job->subtitle_scan = 0;
/*
* If turbo options have been selected then append them
job->x264opts = x264opts;
}
hb_add( h, job );
+
+ job->select_subtitle = subtitle_tmp;
+
job->pass = 2;
/*
* On the second pass we turn off subtitle scan so that we
/*
* Turn on subtitle scan if requested, note that this option
* precludes encoding of any actual subtitles.
- */
- if ( subtitle_scan )
- {
- fprintf( stderr, "Warning: Subtitle Scan only works in two-pass, disabling\n");
- }
+ */
+
+ job->subtitle_scan = 0;
job->pass = 0;
hb_add( h, job );
}
" the one that's only used 10 percent of the time\n"
" or less. This should locate subtitles for short\n"
" foreign language segments. Only works with 2-pass.\n"
- " -F, --subtitle-force Only display subtitles from the selected stream if\n"
- " the subtitles have the forced flag set.\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"
" <string> match the Audio language. Provide the language's\n"
" iso639-2 code (fre, eng, spa, dut, et cetera)\n"
projects / handbrake / commitdiff