#include "hb.h"
#include "a52dec/a52.h"
#include "dca.h"
+#include "libavformat/avformat.h"
typedef struct
{
case HB_ACODEC_FAAC: return hb_get_work( WORK_ENCFAAC );
case HB_ACODEC_LAME: return hb_get_work( WORK_ENCLAME );
case HB_ACODEC_VORBIS: return hb_get_work( WORK_ENCVORBIS );
+ case HB_ACODEC_CA_AAC: return hb_get_work( WORK_ENC_CA_AAC );
}
return NULL;
}
/**
+ * Displays job parameters in the debug log.
+ * @param job Handle work hb_job_t.
+ */
+void 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");
+
+ if( job->color_matrix )
+ hb_log( " + custom color matrix: %s", job->color_matrix == 1 ? "ITU Bt.601 (SD)" : "ITU Bt.709 (HD)");
+ 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->cfr )
+ {
+ hb_log( " + frame rate: same as source (around %.3f fps)",
+ (float) title->rate / (float) title->rate_base );
+ }
+ else
+ {
+ static const char *frtypes[] = {
+ "", "constant", "peak rate limited to"
+ };
+ hb_log( " + frame rate: %.3f fps -> %s %.3f fps",
+ (float) title->rate / (float) title->rate_base, frtypes[job->cfr],
+ (float) job->vrate / (float) job->vrate_base );
+ }
+
+ if( job->anamorphic.mode )
+ {
+ hb_log( " + %s anamorphic", job->anamorphic.mode == 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->anamorphic.par_width, job->anamorphic.par_height );
+ hb_log( " + display dimensions: %.0f * %i",
+ (float)( job->width * job->anamorphic.par_width / job->anamorphic.par_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_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: %.2f %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) %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->dest == RENDERSUB ? "Render/Burn in" : "Pass-Through");
+ }
+ }
+
+ 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 );
+
+ if( audio->config.out.name )
+ hb_log( " + name: %s", audio->config.out.name );
+
+ hb_log( " + decoder: %s (track %d, id %x)", audio->config.lang.description, audio->config.in.track + 1, 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 );
+ }
+
+ if( (audio->config.out.codec != HB_ACODEC_AC3) && (audio->config.out.codec != HB_ACODEC_DCA) )
+ {
+ 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 && (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" : ( ( audio->config.out.codec == HB_ACODEC_CA_AAC ) ?
+ "ca_aac" : "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.
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;
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 */
- job->height=title->height-job->crop[0]-job->crop[1];
- job->width=title->width-job->crop[2]-job->crop[3];
- }
- else if ( job->pixel_ratio == 2 )
- {
-
- /* While keeping the DVD storage aspect, resize the job width and height
- so they fit into the user's specified dimensions. */
- hb_set_anamorphic_size(job, &job->width, &job->height, &job->pixel_aspect_width, &job->pixel_aspect_height);
- }
-
- if( job->pixel_ratio && job->vcodec == HB_VCODEC_FFMPEG)
- {
- /* Just to make working with ffmpeg even more fun,
- lavc's MPEG-4 encoder can't handle PAR values >= 255,
- even though AVRational does. Adjusting downwards
- distorts the display aspect slightly, but such is life. */
- while ((job->pixel_aspect_width & ~0xFF) ||
- (job->pixel_aspect_height & ~0xFF))
- {
- job->pixel_aspect_width >>= 1;
- job->pixel_aspect_height >>= 1;
- }
- }
-
- /* 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" );
-
- if ( job->vfr )
+ if( job->anamorphic.mode )
{
- job->vrate_base = title->rate_base;
+ hb_set_anamorphic_size(job, &job->width, &job->height, &job->anamorphic.par_width, &job->anamorphic.par_height);
- int detelecine_present = 0;
- if ( job->filters )
+ if( job->vcodec == HB_VCODEC_FFMPEG )
{
- for( i = 0; i < hb_list_count( job->filters ); i++ )
+ /* Just to make working with ffmpeg even more fun,
+ lavc's MPEG-4 encoder can't handle PAR values >= 255,
+ even though AVRational does. Adjusting downwards
+ distorts the display aspect slightly, but such is life. */
+ while ((job->anamorphic.par_width & ~0xFF) ||
+ (job->anamorphic.par_height & ~0xFF))
{
- hb_filter_object_t * filter = hb_list_item( job->filters, i );
- if (filter->id == FILTER_DETELECINE)
- detelecine_present = 1;
+ job->anamorphic.par_width >>= 1;
+ job->anamorphic.par_height >>= 1;
}
}
-
- if (!detelecine_present)
- {
- /* Allocate the filter. */
- hb_filter_object_t * filter = malloc( sizeof( hb_filter_object_t ) );
-
- /* Copy in the contents of the detelecine struct. */
- memcpy( filter, &hb_filter_detelecine, sizeof( hb_filter_object_t ) );
-
- /* Set the name to a copy of the template name so render.c has something to free. */
- filter->name = strdup(hb_filter_detelecine.name);
-
- /* Add it to the list. */
- hb_list_add( job->filters, filter );
-
- hb_log("work: VFR mode -- adding detelecine filter");
- }
}
-
- if( hb_list_count( job->filters ) )
+
+ /* 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->anamorphic.mode ) )
{
- 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);
- }
+ 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->vfr)
+ if ( job->maxWidth && ( job->width > job->maxWidth ) && ( !job->anamorphic.mode ) )
{
- 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);
+ 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->vquality >= 0.0 && job->vquality <= 1.0 )
+ if( job->mux & HB_MUX_AVI )
{
- hb_log( " + video quality %.2f", job->vquality );
+ // The concept of variable frame rate video was a bit too advanced
+ // for Microsoft so AVI doesn't support it. Since almost all dvd
+ // video is VFR we have to convert it to constant frame rate to
+ // put it in an AVI container. So duplicate, drop and
+ // otherwise trash video frames to appease the gods of Redmond.
+ job->cfr = 1;
}
- else
+
+ if ( job->cfr == 0 )
{
- hb_log( " + video bitrate %d kbps, pass %d", job->vbitrate, job->pass );
+ /* Ensure we're using "Same as source" FPS */
+ job->vrate_base = title->rate_base;
}
- 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 );
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 )
{
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;
}
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 )
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 );
+ subtitle->fifo_in = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
+ subtitle->fifo_raw = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
+ subtitle->fifo_sync = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
+ subtitle->fifo_out = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
/*
* Disable forced subtitles if we didn't find any in the scan
*
* select_subtitle implies that we did a scan.
*/
- if( !job->indepth_scan && job->subtitle_force &&
+ if( !job->indepth_scan && subtitle->force &&
job->select_subtitle )
{
if( subtitle->forced_hits == 0 )
{
- job->subtitle_force = 0;
+ subtitle->force = 0;
}
}
- if (!job->indepth_scan || job->subtitle_force) {
+ if( (!job->indepth_scan || subtitle->force) &&
+ subtitle->source == VOBSUB ) {
/*
* Don't add threads for subtitles when we are scanning, unless
* looking for forced subtitles.
*/
- w = hb_get_work( WORK_DECSUB );
+ w = hb_get_work( WORK_DECVOBSUB );
+ w->fifo_in = subtitle->fifo_in;
+ w->fifo_out = subtitle->fifo_raw;
+ w->subtitle = subtitle;
+ hb_list_add( job->list_work, w );
+ }
+
+ if( !job->indepth_scan && subtitle->source == CC608SUB )
+ {
+ w = hb_get_work( WORK_DECCC608 );
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
+ && subtitle->dest == PASSTHRUSUB )
+ {
+ /*
+ * Passing through a subtitle picture, this will have to
+ * be rle encoded before muxing.
+ */
+ w = hb_get_work( WORK_ENCVOBSUB );
+ w->fifo_in = subtitle->fifo_sync;
+ w->fifo_out = subtitle->fifo_out;
+ w->subtitle = subtitle;
+ hb_list_add( job->list_work, w );
+ }
}
}
if( !job->indepth_scan )
{
- /* if we are doing passthru, and the input codec is not the same as the output
- * codec, then remove this audio from the job */
- /* otherwise, Bad Things will happen */
+ // if we are doing passthru, and the input codec is not the same as the output
+ // codec, then remove this audio from the job. If we're not doing passthru and
+ // the input codec is the 'internal' ffmpeg codec, make sure that only one
+ // audio references that audio stream since the codec context is specific to
+ // the audio id & multiple copies of the same stream will garble the audio
+ // or cause aborts.
+ uint8_t aud_id_uses[MAX_STREAMS];
+ memset( aud_id_uses, 0, sizeof(aud_id_uses) );
for( i = 0; i < hb_list_count( title->list_audio ); )
{
audio = hb_list_item( title->list_audio, i );
free( audio );
continue;
}
+ if ( audio->config.in.codec == HB_ACODEC_FFMPEG )
+ {
+ if ( aud_id_uses[audio->id] )
+ {
+ hb_log( "Multiple decodes of audio id %d, removing track %d",
+ audio->id, audio->config.out.track );
+ hb_list_rem( title->list_audio, audio );
+ free( audio );
+ continue;
+ }
+ ++aud_id_uses[audio->id];
+ }
/* Adjust output track number, in case we removed one.
* Output tracks sadly still need to be in sequential order.
*/
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 )
{
/* 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;
}
}
/* sense-check the requested mixdown */
if( audio->config.out.mixdown == 0 &&
- audio->config.out.codec != HB_ACODEC_AC3 )
+ audio->config.out.codec != HB_ACODEC_AC3 &&
+ audio->config.out.codec != HB_ACODEC_DCA )
{
/*
* Mixdown wasn't specified and this is not pass-through,
/* 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;
}
}
audio->priv.fifo_in = hb_fifo_init( 32 );
audio->priv.fifo_raw = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
audio->priv.fifo_sync = hb_fifo_init( 32 );
- audio->priv.fifo_out = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
+ audio->priv.fifo_out = hb_fifo_init( 8 * FIFO_CPU_MULT * cpu_count );
/*
/*
* Audio Encoder Thread
*/
- if( audio->config.out.codec != HB_ACODEC_AC3 )
+ if( audio->config.out.codec != HB_ACODEC_AC3 &&
+ audio->config.out.codec != HB_ACODEC_DCA )
{
/*
* Add the encoder thread if not doing AC-3 pass through
}
+ /* 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;
// The muxer requires track information that's set up by the encoder
// init routines so we have to init the muxer last.
- job->muxer = hb_muxer_init( job );
+ 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( ( w->status = w->work( w, NULL, NULL ) ) == HB_WORK_DONE )
- {
- done = 1;
- }
- if( done &&
- final_w->status == HB_WORK_DONE &&
- !hb_fifo_size( job->fifo_mpeg4 ) )
+ if ( ( w->status = w->work( w, NULL, NULL ) ) == HB_WORK_DONE )
{
break;
}
hb_list_rem( job->list_work, w );
w->close( w );
free( w );
- job->done = 1;
+
+ hb_handle_t * h = job->h;
+ hb_state_t state;
+ hb_get_state( h, &state );
+
+ 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) */
+ if( job->muxer != NULL )
+ hb_thread_close( &job->muxer );
+
+ job->done = 1;
+
/* Close work objects */
while( ( w = hb_list_item( job->list_work, 0 ) ) )
{
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 );
{
hb_fifo_close( &subtitle->fifo_in );
hb_fifo_close( &subtitle->fifo_raw );
+ hb_fifo_close( &subtitle->fifo_sync );
+ hb_fifo_close( &subtitle->fifo_out );
}
}
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
OSDN Git Service
