X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fwork.c;h=c1891a6838b53908a0c93a444209da203215d4c2;hb=55b0015a8c50106e553bc2f48336cc2a1c495459;hp=ba4ea956e4a2c6454a050ee0a2e7e988b70b7100;hpb=a7f8bd6842d316d2a19cf63355b1d343a244b42d;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/work.c b/libhb/work.c index ba4ea956..c1891a68 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -49,6 +49,24 @@ hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count, return hb_thread_init( "work", work_func, work, HB_LOW_PRIORITY ); } +static void InitWorkState( hb_handle_t * h ) +{ + hb_state_t state; + + state.state = HB_STATE_WORKING; +#define p state.param.working + p.progress = 0.0; + p.rate_cur = 0.0; + p.rate_avg = 0.0; + p.hours = -1; + p.minutes = -1; + p.seconds = -1; +#undef p + + hb_set_state( h, &state ); + +} + /** * Iterates through job list and calls do_job for each job. * @param _work Handle work object. @@ -65,6 +83,7 @@ static void work_func( void * _work ) hb_list_rem( work->jobs, job ); job->die = work->die; *(work->current_job) = job; + InitWorkState( job->h ); do_job( job, work->cpu_count ); *(work->current_job) = NULL; } @@ -212,13 +231,9 @@ void hb_display_job_info( hb_job_t * job ) { hb_log( " + keeping source display aspect ratio"); } - if( job->anamorphic.modulus != 16 ) - { - hb_log( " + modulus: %i", job->anamorphic.modulus ); - } - hb_log( " + storage dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d", + hb_log( " + storage dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d, mod %i", title->width, title->height, job->width, job->height, - job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); + job->crop[0], job->crop[1], job->crop[2], job->crop[3], job->modulus ); if( job->anamorphic.itu_par ) { hb_log( " + using ITU pixel aspect ratio values"); @@ -290,12 +305,27 @@ void hb_display_job_info( hb_job_t * job ) if( subtitle ) { - hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s ", subtitle->track, subtitle->lang, subtitle->id, - subtitle->format == PICTURESUB ? "Picture" : "Text", - subtitle->source == VOBSUB ? "VOBSUB" : - ((subtitle->source == CC608SUB || - subtitle->source == CC708SUB) ? "CC" : "SRT"), - subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through"); + if( subtitle->source == SRTSUB ) + { + /* For SRT, print offset and charset too */ + hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s%s, offset: %"PRId64", charset: %s", + subtitle->track, subtitle->lang, subtitle->id, "Text", "SRT", "Pass-Through", + subtitle->config.default_track ? ", Default" : "", + subtitle->config.offset, subtitle->config.src_codeset ); + } + else + { + hb_log( " * subtitle track %i, %s (id %x) %s [%s] -> %s%s%s", subtitle->track, subtitle->lang, subtitle->id, + subtitle->format == PICTURESUB ? "Picture" : "Text", + subtitle->source == VOBSUB ? "VOBSUB" : + subtitle->source == CC608SUB || subtitle->source == CC708SUB ? "CC" : + subtitle->source == UTF8SUB ? "UTF-8" : + subtitle->source == TX3GSUB ? "TX3G" : + subtitle->source == SSASUB ? "SSA" : "Unknown", + subtitle->config.dest == RENDERSUB ? "Render/Burn in" : "Pass-Through", + subtitle->config.force ? ", Forced Only" : "", + subtitle->config.default_track ? ", Default" : "" ); + } } } @@ -385,6 +415,7 @@ static void do_job( hb_job_t * job, int cpu_count ) hb_title_t * title; int i, j; hb_work_object_t * w; + hb_work_object_t * sync; hb_work_object_t * muxer; hb_interjob_t * interjob; @@ -550,17 +581,13 @@ static void do_job( hb_job_t * job, int cpu_count ) // So if the encoder is lame we need the output to be stereo (or multichannel // matrixed into stereo like dpl). If the decoder is not AC3 or DCA the // encoder has to handle the input format since we can't do a mixdown. -#define CAN_MIXDOWN(a) ( a->config.in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA) ) -#define STEREO_ONLY(a) ( a->config.out.codec & HB_ACODEC_LAME ) - switch (audio->config.in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK) { // stereo input or something not handled below default: case HB_INPUT_CH_LAYOUT_STEREO: // mono gets mixed up to stereo & more than stereo gets mixed down - if ( STEREO_ONLY( audio ) || - audio->config.out.mixdown > HB_AMIXDOWN_STEREO) + if ( audio->config.out.mixdown > HB_AMIXDOWN_STEREO ) { audio->config.out.mixdown = HB_AMIXDOWN_STEREO; } @@ -568,33 +595,15 @@ static void do_job( hb_job_t * job, int cpu_count ) // mono input case HB_INPUT_CH_LAYOUT_MONO: - if ( STEREO_ONLY( audio ) ) - { - if ( !CAN_MIXDOWN( audio ) ) - { - // XXX we're hosed - we can't mix up & lame can't handle - // the input format. The user shouldn't be able to make - // this choice. It's too late to do anything about it now - // so complain in the log & let things abort in lame. - hb_log( "ERROR - can't use lame mp3 audio output with " - "mono audio stream %x - output will be messed up", - audio->id ); - } - audio->config.out.mixdown = HB_AMIXDOWN_STEREO; - } - else - { - // everything else passes through - audio->config.out.mixdown = HB_AMIXDOWN_MONO; - } + // everything else passes through + audio->config.out.mixdown = HB_AMIXDOWN_MONO; break; // dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input // the A52 flags don't allow for a way to distinguish between DPL1 and // DPL2 on a DVD so we always assume a DPL1 source for A52_DOLBY. case HB_INPUT_CH_LAYOUT_DOLBY: - if ( STEREO_ONLY( audio ) || !CAN_MIXDOWN( audio ) || - audio->config.out.mixdown > HB_AMIXDOWN_DOLBY ) + if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBY ) { audio->config.out.mixdown = HB_AMIXDOWN_DOLBY; } @@ -603,57 +612,19 @@ static void do_job( hb_job_t * job, int cpu_count ) // 4 channel discrete case HB_INPUT_CH_LAYOUT_2F2R: case HB_INPUT_CH_LAYOUT_3F1R: - if ( CAN_MIXDOWN( audio ) ) - { - if ( STEREO_ONLY( audio ) || - audio->config.out.mixdown > HB_AMIXDOWN_DOLBY ) - { - audio->config.out.mixdown = HB_AMIXDOWN_DOLBY; - } - } - else + if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBY ) { - // XXX we can't mixdown & don't have any way to specify - // 4 channel discrete output so we're hosed. - hb_log( "ERROR - can't handle 4 channel discrete audio stream " - "%x - output will be messed up", audio->id ); + audio->config.out.mixdown = HB_AMIXDOWN_DOLBY; } break; // 5 or 6 channel discrete case HB_INPUT_CH_LAYOUT_3F2R: - if ( CAN_MIXDOWN( audio ) ) - { - if ( STEREO_ONLY( audio ) ) - { - if ( audio->config.out.mixdown < HB_AMIXDOWN_STEREO ) - { - audio->config.out.mixdown = HB_AMIXDOWN_STEREO; - } - else if ( audio->config.out.mixdown > HB_AMIXDOWN_DOLBYPLII ) - { - audio->config.out.mixdown = HB_AMIXDOWN_DOLBYPLII; - } - } - else if ( ! ( audio->config.in.channel_layout & - HB_INPUT_CH_LAYOUT_HAS_LFE ) ) - { - // we don't do 5 channel discrete so mixdown to DPLII - audio->config.out.mixdown = HB_AMIXDOWN_DOLBYPLII; - } - } - else if ( ! ( audio->config.in.channel_layout & - HB_INPUT_CH_LAYOUT_HAS_LFE ) ) + if ( ! ( audio->config.in.channel_layout & + HB_INPUT_CH_LAYOUT_HAS_LFE ) ) { - // XXX we can't mixdown & don't have any way to specify - // 5 channel discrete output so we're hosed. - hb_log( "ERROR - can't handle 5 channel discrete audio stream " - "%x - output will be messed up", audio->id ); - } - else - { - // we can't mixdown so force 6 channel discrete - audio->config.out.mixdown = HB_AMIXDOWN_6CH; + // we don't do 5 channel discrete so mixdown to DPLII + audio->config.out.mixdown = HB_AMIXDOWN_DOLBYPLII; } break; } @@ -682,12 +653,7 @@ static void do_job( hb_job_t * job, int cpu_count ) } /* Synchronization */ - if( hb_sync_init( job ) ) - { - hb_error( "Failure to initialise sync" ); - *job->die = 1; - goto cleanup; - } + sync = hb_sync_init( job ); /* Video decoder */ int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2; @@ -699,7 +665,10 @@ static void do_job( hb_job_t * job, int cpu_count ) /* Video renderer */ hb_list_add( job->list_work, ( w = hb_get_work( WORK_RENDER ) ) ); w->fifo_in = job->fifo_sync; - w->fifo_out = job->fifo_render; + if( !job->indepth_scan ) + w->fifo_out = job->fifo_render; + else + w->fifo_out = NULL; if( !job->indepth_scan ) { @@ -758,6 +727,7 @@ static void do_job( hb_job_t * job, int cpu_count ) *subtitle = *(interjob->select_subtitle); free( interjob->select_subtitle ); interjob->select_subtitle = NULL; + break; } } } @@ -817,6 +787,30 @@ static void do_job( hb_job_t * job, int cpu_count ) w->subtitle = subtitle; hb_list_add( job->list_work, w ); } + + if( !job->indepth_scan && subtitle->source == UTF8SUB ) + { + w = hb_get_work( WORK_DECUTF8SUB ); + w->fifo_in = subtitle->fifo_in; + w->fifo_out = subtitle->fifo_raw; + hb_list_add( job->list_work, w ); + } + + if( !job->indepth_scan && subtitle->source == TX3GSUB ) + { + w = hb_get_work( WORK_DECTX3GSUB ); + w->fifo_in = subtitle->fifo_in; + w->fifo_out = subtitle->fifo_raw; + hb_list_add( job->list_work, w ); + } + + if( !job->indepth_scan && subtitle->source == SSASUB ) + { + w = hb_get_work( WORK_DECSSASUB ); + w->fifo_in = subtitle->fifo_in; + w->fifo_out = subtitle->fifo_raw; + hb_list_add( job->list_work, w ); + } if( !job->indepth_scan && subtitle->format == PICTURESUB @@ -883,6 +877,12 @@ static void do_job( hb_job_t * job, int cpu_count ) } } } + + if( job->chapter_markers && job->chapter_start == job->chapter_end ) + { + job->chapter_markers = 0; + hb_log("work: only 1 chapter, disabling chapter markers"); + } /* Display settings */ hb_display_job_info( job ); @@ -894,7 +894,7 @@ static void do_job( hb_job_t * job, int cpu_count ) job->done = 0; /* Launch processing threads */ - for( i = 1; i < hb_list_count( job->list_work ); i++ ) + for( i = 0; i < hb_list_count( job->list_work ); i++ ) { w = hb_list_item( job->list_work, i ); w->done = &job->done; @@ -909,12 +909,32 @@ static void do_job( hb_job_t * job, int cpu_count ) HB_LOW_PRIORITY ); } - // The muxer requires track information that's set up by the encoder - // init routines so we have to init the muxer last. - muxer = job->indepth_scan? NULL : hb_muxer_init( job ); + if ( job->indepth_scan ) + { + muxer = NULL; + w = sync; + sync->done = &job->done; + } + else + { + sync->done = &job->done; + sync->thread_sleep_interval = 10; + if( sync->init( w, job ) ) + { + hb_error( "Failure to initialise thread '%s'", w->name ); + *job->die = 1; + goto cleanup; + } + sync->thread = hb_thread_init( sync->name, work_loop, sync, + HB_LOW_PRIORITY ); - w = hb_list_item( job->list_work, 0 ); - while( !*job->die && w->status != HB_WORK_DONE ) + // The muxer requires track information that's set up by the encoder + // init routines so we have to init the muxer last. + muxer = hb_muxer_init( job ); + w = muxer; + } + + while ( !*job->die && !*w->done && w->status != HB_WORK_DONE ) { hb_buffer_t * buf_in, * buf_out; @@ -922,22 +942,37 @@ static void do_job( hb_job_t * job, int cpu_count ) if ( buf_in == NULL ) continue; if ( *job->die ) + { + if( buf_in ) + { + hb_buffer_close( &buf_in ); + } break; + } + buf_out = NULL; w->status = w->work( w, &buf_in, &buf_out ); if( buf_in ) { hb_buffer_close( &buf_in ); } + if ( buf_out && w->fifo_out == NULL ) + { + hb_buffer_close( &buf_out ); + } if( buf_out ) { - hb_fifo_push_wait( w->fifo_out, buf_out ); + while ( !*job->die ) + { + if ( hb_fifo_full_wait( w->fifo_out ) ) + { + hb_fifo_push( w->fifo_out, buf_out ); + break; + } + } } } - hb_list_rem( job->list_work, w ); - w->close( w ); - free( w ); hb_handle_t * h = job->h; hb_state_t state; @@ -945,14 +980,22 @@ static void do_job( hb_job_t * job, int cpu_count ) hb_log("work: average encoding speed for job is %f fps", state.param.working.rate_avg); -cleanup: - /* Stop the write thread (thread_close will block until the muxer finishes) */ + job->done = 1; if( muxer != NULL ) { - hb_thread_close( &muxer->thread ); muxer->close( muxer ); + free( muxer ); + + if( sync->thread != NULL ) + { + hb_thread_close( &sync->thread ); + sync->close( sync ); + } + free( sync ); } +cleanup: + /* Stop the write thread (thread_close will block until the muxer finishes) */ job->done = 1; /* Close work objects */ @@ -1120,7 +1163,13 @@ static void work_loop( void * _w ) if ( buf_in == NULL ) continue; if ( *w->done ) + { + if( buf_in ) + { + hb_buffer_close( &buf_in ); + } break; + } w->status = w->work( w, &buf_in, &buf_out ); @@ -1132,7 +1181,7 @@ static void work_loop( void * _w ) if( buf_in && buf_out && buf_in->new_chap && buf_in->start == buf_out->start) { // restore log below to debug chapter mark propagation problems - //hb_log("work %s: Copying Chapter Break @ %lld", w->name, buf_in->start); + //hb_log("work %s: Copying Chapter Break @ %"PRId64, w->name, buf_in->start); buf_out->new_chap = buf_in->new_chap; } @@ -1140,9 +1189,28 @@ static void work_loop( void * _w ) { hb_buffer_close( &buf_in ); } + if ( buf_out && w->fifo_out == NULL ) + { + hb_buffer_close( &buf_out ); + } if( buf_out ) { - hb_fifo_push_wait( w->fifo_out, buf_out ); + while ( !*w->done ) + { + if ( hb_fifo_full_wait( w->fifo_out ) ) + { + hb_fifo_push( w->fifo_out, buf_out ); + break; + } + } } } + // Consume data in incoming fifo till job complete so that + // residual data does not stall the pipeline + while( !*w->done ) + { + buf_in = hb_fifo_get_wait( w->fifo_in ); + if ( buf_in != NULL ) + hb_buffer_close( &buf_in ); + } }