X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fwork.c;h=01507e6dedfb21250821a7b60748df2273588be0;hb=7fabb7516fb8c00f9a2f905b89fbe488f6ee8de5;hp=f7d050b6a575cd0b12cb7d4bf3414906e5cc4245;hpb=957bd5e6ce7dd95525c5b805e3d8b32b3eacab52;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/work.c b/libhb/work.c index f7d050b6..01507e6d 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -110,6 +110,220 @@ hb_work_object_t * hb_codec_encoder( int codec ) } /** + * Displays job parameters in the debug log. + * @param job Handle work hb_job_t. + */ +hb_display_job_info( hb_job_t * job ) +{ + hb_title_t * title = job->title; + hb_audio_t * audio; + hb_subtitle_t * subtitle; + int i, j; + + hb_log("job configuration:"); + hb_log( " * source"); + + hb_log( " + %s", title->dvd ); + + hb_log( " + title %d, chapter(s) %d to %d", title->index, + job->chapter_start, job->chapter_end ); + + if( title->container_name != NULL ) + hb_log( " + container: %s", title->container_name); + + if( title->data_rate ) + { + hb_log( " + data rate: %d kbps", title->data_rate / 1000 ); + } + + hb_log( " * destination"); + + hb_log( " + %s", job->file ); + + switch( job->mux ) + { + case HB_MUX_MP4: + hb_log(" + container: MPEG-4 (.mp4 and .m4v)"); + + if( job->ipod_atom ) + hb_log( " + compatibility atom for iPod 5G"); + + if( job->largeFileSize ) + hb_log( " + 64-bit formatting"); + + if( job->mp4_optimize ) + hb_log( " + optimized for progressive web downloads"); + break; + + case HB_MUX_AVI: + hb_log(" + container: AVI"); + break; + + case HB_MUX_MKV: + hb_log(" + container: Matroska (.mkv)"); + break; + + case HB_MUX_OGM: + hb_log(" + conttainer: Ogg Media (.ogm)"); + break; + } + + if( job->chapter_markers ) + { + hb_log( " + chapter markers" ); + } + + hb_log(" * video track"); + + hb_log(" + decoder: %s", title->video_codec_name ); + + if( title->video_bitrate ) + { + hb_log( " + bitrate %d kbps", title->video_bitrate / 1000 ); + } + + if( job->vfr) + { + hb_log( " + frame rate: %.3f fps -> variable fps", + (float) title->rate / (float) title->rate_base ); + } + else if( !job->cfr ) + { + hb_log( " + frame rate: same as source (around %.3f fps)", + (float) title->rate / (float) title->rate_base ); + } + else + { + hb_log( " + frame rate: %.3f fps -> constant %.3f fps", + (float) title->rate / (float) title->rate_base, (float) job->vrate / (float) job->vrate_base ); + } + + if( job->pixel_ratio ) + { + hb_log( " + %s anamorphic", job->pixel_ratio == 1 ? "strict" : "loose" ); + hb_log( " + storage dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d", + title->width, title->height, job->width, job->height, + job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); + hb_log( " + pixel aspect ratio: %i / %i", job->pixel_aspect_width, job->pixel_aspect_height ); + hb_log( " + display dimensions: %.0f * %i", + (float)( job->width * job->pixel_aspect_width / job->pixel_aspect_height ), job->height ); + } + else + { + hb_log( " + dimensions: %d * %d -> %d * %d, crop %d/%d/%d/%d", + title->width, title->height, job->width, job->height, + job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); + } + + if ( job->grayscale ) + hb_log( " + grayscale mode" ); + + if( hb_list_count( job->filters ) ) + { + hb_log(" + %s", hb_list_count( job->filters) > 1 ? "filters" : "filter" ); + for( i = 0; i < hb_list_count( job->filters ); i++ ) + { + hb_filter_object_t * filter = hb_list_item( job->filters, i ); + if (filter->settings) + hb_log(" + %s (%s)", filter->name, filter->settings); + else + hb_log(" + %s (default settings)", filter->name); + } + } + + if( !job->indepth_scan ) + { + /* Video encoder */ + switch( job->vcodec ) + { + case HB_VCODEC_FFMPEG: + hb_log( " + encoder: FFmpeg" ); + break; + + case HB_VCODEC_XVID: + hb_log( " + encoder: XviD" ); + break; + + case HB_VCODEC_X264: + hb_log( " + encoder: x264" ); + if( job->x264opts != NULL && *job->x264opts != '\0' ) + hb_log( " + options: %s", job->x264opts); + break; + + case HB_VCODEC_THEORA: + hb_log( " + encoder: Theora" ); + break; + } + + if( job->vquality >= 0.0 && job->vquality <= 1.0 ) + { + hb_log( " + quality: %.2f", job->vquality ); + } + else if( job->vquality > 1 ) + { + hb_log( " + quality: %.0f %s", job->vquality, job->crf && job->vcodec == HB_VCODEC_X264 ? "(RF)" : "(QP)" ); + } + else + { + hb_log( " + bitrate: %d kbps, pass: %d", job->vbitrate, job->pass ); + } + } + + for( i=0; i < hb_list_count(title->list_subtitle); i++ ) + { + subtitle = hb_list_item( title->list_subtitle, i ); + + if( subtitle ) + { + hb_log( " * subtitle track %i, %s (id %x)", job->subtitle+1, subtitle->lang, subtitle->id); + } + } + + if( !job->indepth_scan ) + { + for( i = 0; i < hb_list_count( title->list_audio ); i++ ) + { + audio = hb_list_item( title->list_audio, i ); + + hb_log( " * audio track %d", audio->config.out.track ); + + hb_log( " + decoder: %s (track %d, id %x)", audio->config.lang.description, audio->config.in.track, audio->id ); + + if( ( audio->config.in.codec == HB_ACODEC_AC3 ) || ( audio->config.in.codec == HB_ACODEC_DCA) ) + { + hb_log( " + bitrate: %d kbps, samplerate: %d Hz", audio->config.in.bitrate / 1000, audio->config.in.samplerate ); + } + + for (j = 0; j < hb_audio_mixdowns_count; j++) + { + if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) { + hb_log( " + mixdown: %s", hb_audio_mixdowns[j].human_readable_name ); + break; + } + } + + if ( audio->config.out.dynamic_range_compression > 1 && (audio->config.out.codec != HB_ACODEC_AC3) && (audio->config.out.codec != HB_ACODEC_DCA)) + { + hb_log(" + dynamic range compression: %f", audio->config.out.dynamic_range_compression); + } + + if( (audio->config.out.codec == HB_ACODEC_AC3) || (audio->config.out.codec == HB_ACODEC_DCA) ) + { + hb_log( " + %s passthrough", (audio->config.out.codec == HB_ACODEC_AC3) ? + "AC3" : "DCA" ); + } + else + { + hb_log( " + encoder: %s", ( audio->config.out.codec == HB_ACODEC_FAAC ) ? + "faac" : ( ( audio->config.out.codec == HB_ACODEC_LAME ) ? "lame" : + "vorbis" ) ); + hb_log( " + bitrate: %d kbps, samplerate: %d Hz", audio->config.out.bitrate, audio->config.out.samplerate ); + } + } + } +} + +/** * Job initialization rountine. * Initializes fifos. * Creates work objects for synchronizer, video decoder, video renderer, video decoder, audio decoder, audio encoder, reader, muxer. @@ -125,11 +339,9 @@ 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 * final_w = NULL; hb_audio_t * audio; hb_subtitle_t * subtitle; - int done; unsigned int subtitle_highest = 0; unsigned int subtitle_highest_id = 0; unsigned int subtitle_lowest = -1; @@ -142,9 +354,7 @@ static void do_job( hb_job_t * job, int cpu_count ) job->list_work = hb_list_init(); hb_log( "starting job" ); - hb_log( " + device %s", title->dvd ); - hb_log( " + title %d, chapter(s) %d to %d", title->index, - job->chapter_start, job->chapter_end ); + if ( job->pixel_ratio == 1 ) { /* Correct the geometry of the output movie when using PixelRatio */ @@ -173,31 +383,23 @@ static void do_job( hb_job_t * job, int cpu_count ) } } - /* Keep width and height within these boundaries, - but ignore for "loose" anamorphic encodes, for - which this stuff is covered in the pixel_ratio - section right above.*/ - if (job->maxHeight && (job->height > job->maxHeight) && (job->pixel_ratio != 2)) - { - job->height = job->maxHeight; - hb_fix_aspect( job, HB_KEEP_HEIGHT ); - hb_log("Height out of bounds, scaling down to %i", job->maxHeight); - hb_log("New dimensions %i * %i", job->width, job->height); - } - if (job->maxWidth && (job->width > job->maxWidth) && (job->pixel_ratio != 2)) - { - job->width = job->maxWidth; - hb_fix_aspect( job, HB_KEEP_WIDTH ); - hb_log("Width out of bounds, scaling down to %i", job->maxWidth); - hb_log("New dimensions %i * %i", job->width, job->height); - } - - hb_log( " + %dx%d -> %dx%d, crop %d/%d/%d/%d", - title->width, title->height, job->width, job->height, - job->crop[0], job->crop[1], job->crop[2], job->crop[3] ); - - if ( job->grayscale ) - hb_log( " + grayscale mode" ); + /* Keep width and height within these boundaries, + but ignore for anamorphic. For "loose" anamorphic encodes, + this stuff is covered in the pixel_ratio section above. */ + if ( job->maxHeight && ( job->height > job->maxHeight ) && ( !job->pixel_ratio ) ) + { + job->height = job->maxHeight; + hb_fix_aspect( job, HB_KEEP_HEIGHT ); + hb_log( "Height out of bounds, scaling down to %i", job->maxHeight ); + hb_log( "New dimensions %i * %i", job->width, job->height ); + } + if ( job->maxWidth && ( job->width > job->maxWidth ) && ( !job->pixel_ratio ) ) + { + job->width = job->maxWidth; + hb_fix_aspect( job, HB_KEEP_WIDTH ); + hb_log( "Width out of bounds, scaling down to %i", job->maxWidth ); + hb_log( "New dimensions %i * %i", job->width, job->height ); + } if ( job->vfr ) { @@ -232,40 +434,7 @@ static void do_job( hb_job_t * job, int cpu_count ) } } - if( hb_list_count( job->filters ) ) - { - hb_log(" + filters"); - for( i = 0; i < hb_list_count( job->filters ); i++ ) - { - hb_filter_object_t * filter = hb_list_item( job->filters, i ); - if (filter->settings) - hb_log(" + %s (%s)", filter->name, filter->settings); - else - hb_log(" + %s (default settings)", filter->name); - } - } - - if( job->vfr) - { - hb_log( " + video frame rate: %.3f fps -> variable fps", (float) job->vrate / - (float) job->vrate_base ); - } - else - { - hb_log( " + video frame rate: %.3f fps", (float) job->vrate / (float) job->vrate_base); - } - - if( job->vquality >= 0.0 && job->vquality <= 1.0 ) - { - hb_log( " + video quality %.2f", job->vquality ); - } - else - { - hb_log( " + video bitrate %d kbps, pass %d", job->vbitrate, job->pass ); - } - - hb_log (" + PixelRatio: %d, width:%d, height: %d",job->pixel_ratio,job->width, job->height); - job->fifo_mpeg2 = hb_fifo_init( 128 ); + job->fifo_mpeg2 = hb_fifo_init( 256 ); job->fifo_raw = hb_fifo_init( FIFO_CPU_MULT * cpu_count ); job->fifo_sync = hb_fifo_init( FIFO_CPU_MULT * cpu_count ); job->fifo_render = hb_fifo_init( FIFO_CPU_MULT * cpu_count ); @@ -287,15 +456,6 @@ static void do_job( hb_job_t * job, int cpu_count ) 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 ) - { - /* - * if we're doing a subtitle scan the last thread in the - * processing pipeline is render - remember it so we can - * wait for its completion below. - */ - final_w = w; - } if( !job->indepth_scan ) { @@ -304,21 +464,15 @@ static void do_job( hb_job_t * job, int cpu_count ) switch( job->vcodec ) { case HB_VCODEC_FFMPEG: - hb_log( " + encoder FFmpeg" ); w = hb_get_work( WORK_ENCAVCODEC ); break; case HB_VCODEC_XVID: - hb_log( " + encoder XviD" ); w = hb_get_work( WORK_ENCXVID ); break; case HB_VCODEC_X264: - hb_log( " + encoder x264" ); - if( job->x264opts != NULL && *job->x264opts != '\0' ) - hb_log( " + x264 options: %s", job->x264opts); w = hb_get_work( WORK_ENCX264 ); break; case HB_VCODEC_THEORA: - hb_log( " + encoder Theora" ); w = hb_get_work( WORK_ENCTHEORA ); break; } @@ -327,13 +481,6 @@ static void do_job( hb_job_t * job, int cpu_count ) w->config = &job->config; hb_list_add( job->list_work, w ); - - /* - * if we're not doing a subtitle scan the last thread in the - * processing pipeline is the encoder - remember it so we can - * wait for its completion below. - */ - final_w = w; } if( job->select_subtitle && !job->indepth_scan ) @@ -355,8 +502,6 @@ static void do_job( hb_job_t * job, int cpu_count ) if( subtitle ) { - hb_log( " + subtitle %x, %s", subtitle->id, subtitle->lang ); - subtitle->fifo_in = hb_fifo_init( FIFO_CPU_MULT * cpu_count ); subtitle->fifo_raw = hb_fifo_init( FIFO_CPU_MULT * cpu_count ); @@ -411,27 +556,12 @@ static void do_job( hb_job_t * job, int cpu_count ) audio->config.out.track = i++; } + int requested_mixdown = 0; + int requested_mixdown_index = 0; + for( i = 0; i < hb_list_count( title->list_audio ); i++ ) { audio = hb_list_item( title->list_audio, i ); - hb_log( " + audio track %d", audio->config.out.track ); - hb_log( " + input track %d", audio->config.in.track ); - if( (audio->config.out.codec == HB_ACODEC_AC3) || (audio->config.out.codec == HB_ACODEC_DCA) ) - { - hb_log( " + %s passthrough", (audio->config.out.codec == HB_ACODEC_AC3) ? - "AC3" : "DCA" ); - } - else - { - hb_log( " + audio %d kbps, %d Hz", audio->config.out.bitrate, audio->config.out.samplerate ); - hb_log( " + encoder %s", ( audio->config.out.codec == HB_ACODEC_FAAC ) ? - "faac" : ( ( audio->config.out.codec == HB_ACODEC_LAME ) ? "lame" : - "vorbis" ) ); - if ( audio->config.out.dynamic_range_compression > 1 ) - hb_log(" + dynamic range compression: %f", audio->config.out.dynamic_range_compression); - } - - hb_log( " + %x, %s", audio->id, audio->config.lang.description ); if( audio->config.out.codec != audio->config.in.codec ) { @@ -440,8 +570,8 @@ static void do_job( hb_job_t * job, int cpu_count ) /* log the requested mixdown */ for (j = 0; j < hb_audio_mixdowns_count; j++) { if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) { - hb_log( " + Requested mixdown: %s (%s)", hb_audio_mixdowns[j].human_readable_name, hb_audio_mixdowns[j].internal_name ); - break; + requested_mixdown = audio->config.out.mixdown; + requested_mixdown_index = j; } } @@ -575,7 +705,10 @@ static void do_job( hb_job_t * job, int cpu_count ) /* log the output mixdown */ for (j = 0; j < hb_audio_mixdowns_count; j++) { if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) { - hb_log( " + Actual mixdown: %s (%s)", hb_audio_mixdowns[j].human_readable_name, hb_audio_mixdowns[j].internal_name ); + if ( audio->config.out.mixdown != requested_mixdown ) + { + hb_log("work: sanitizing track %i mixdown %s to %s", i, hb_audio_mixdowns[requested_mixdown_index].human_readable_name, hb_audio_mixdowns[j].human_readable_name); + } break; } } @@ -634,10 +767,12 @@ static void do_job( hb_job_t * job, int cpu_count ) } + /* Display settings */ + hb_display_job_info( job ); + /* Init read & write threads */ job->reader = hb_reader_init( job ); - hb_log( " + output: %s", job->file ); job->done = 0; @@ -661,17 +796,12 @@ static void do_job( hb_job_t * job, int cpu_count ) // init routines so we have to init the muxer last. job->muxer = job->indepth_scan? NULL : hb_muxer_init( job ); - done = 0; w = hb_list_item( job->list_work, 0 ); - w->thread_sleep_interval = 50; + w->thread_sleep_interval = 10; w->init( w, job ); while( !*job->die ) { - if ( !done && ( w->status = w->work( w, NULL, NULL ) ) == HB_WORK_DONE ) - { - done = 1; - } - if( done && final_w->status == HB_WORK_DONE ) + if ( ( w->status = w->work( w, NULL, NULL ) ) == HB_WORK_DONE ) { break; } @@ -680,9 +810,14 @@ static void do_job( hb_job_t * job, int cpu_count ) hb_list_rem( job->list_work, w ); w->close( w ); free( w ); - job->done = 1; cleanup: + /* Stop the write thread (thread_close will block until the muxer finishes) */ + if( job->muxer != NULL ) + hb_thread_close( &job->muxer ); + + job->done = 1; + /* Close work objects */ while( ( w = hb_list_item( job->list_work, 0 ) ) ) { @@ -697,11 +832,9 @@ cleanup: hb_list_close( &job->list_work ); - /* Stop read & write threads */ + /* Stop the read thread */ if( job->reader != NULL ) hb_thread_close( &job->reader ); - if( job->muxer != NULL ) - hb_thread_close( &job->muxer ); /* Close fifos */ hb_fifo_close( &job->fifo_mpeg2 );