OSDN Git Service

CLI: Add support for naming audio tracks to the HandBrakeCLI, thanks to LePetomane...
[handbrake-jp/handbrake-jp-git.git] / libhb / work.c
index 22e0815..91da97a 100644 (file)
@@ -1,7 +1,7 @@
 /* $Id: work.c,v 1.43 2005/03/17 16:38:49 titer Exp $
 
    This file is part of the HandBrake source code.
-   Homepage: <http://handbrake.m0k.org/>.
+   Homepage: <http://handbrake.fr/>.
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
@@ -70,19 +70,263 @@ static void work_func( void * _work )
     free( work );
 }
 
-static hb_work_object_t * getWork( int id )
+hb_work_object_t * hb_get_work( int id )
 {
     hb_work_object_t * w;
     for( w = hb_objects; w; w = w->next )
     {
         if( w->id == id )
         {
-            return w;
+            hb_work_object_t *wc = malloc( sizeof(*w) );
+            *wc = *w;
+            return wc;
         }
     }
     return NULL;
 }
 
+hb_work_object_t * hb_codec_decoder( int codec )
+{
+    switch( codec )
+    {
+        case HB_ACODEC_AC3:  return hb_get_work( WORK_DECA52 );
+        case HB_ACODEC_DCA:  return hb_get_work( WORK_DECDCA );
+        case HB_ACODEC_MPGA: return hb_get_work( WORK_DECAVCODEC );
+        case HB_ACODEC_LPCM: return hb_get_work( WORK_DECLPCM );
+        case HB_ACODEC_FFMPEG: return hb_get_work( WORK_DECAVCODECAI );
+    }
+    return NULL;
+}
+
+hb_work_object_t * hb_codec_encoder( int codec )
+{
+    switch( codec )
+    {
+        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 );
+    }
+    return NULL;
+}
+
+/**
+ * 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 (%s)", audio->config.out.track,
+                    audio->config.out.name ?  audio->config.out.name : "no-name" );
+
+            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 );
+            }
+
+            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 > 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.
@@ -99,14 +343,9 @@ static void do_job( hb_job_t * job, int cpu_count )
     hb_title_t    * title;
     int             i, j;
     hb_work_object_t * w;
-    
-    /* 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;
-    int done;
     unsigned int subtitle_highest = 0;
     unsigned int subtitle_highest_id = 0;
     unsigned int subtitle_lowest = -1;
@@ -119,9 +358,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 */
@@ -133,102 +370,104 @@ static void do_job( hb_job_t * job, int cpu_count )
 
         /* 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);
-    }
-
-       /* 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] );
-    hb_log( " + grayscale %s", job->grayscale ? "on" : "off" );
-    
-    if( job->filters )
+        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)
     {
-        hb_log(" + filters");
-        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->pixel_aspect_width & ~0xFF) ||
+               (job->pixel_aspect_height & ~0xFF))
         {
-            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->pixel_aspect_width >>= 1;
+            job->pixel_aspect_height >>= 1;
         }
     }
-    
-    if( job->vquality >= 0.0 && job->vquality <= 1.0 )
+
+    /* 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 ) )
     {
-        hb_log( " + %.3f fps, video quality %.2f", (float) job->vrate /
-                (float) job->vrate_base, job->vquality );
+        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 );
     }
-    else
+    if ( job->maxWidth && ( job->width > job->maxWidth ) && ( !job->pixel_ratio ) )
     {
-        hb_log( " + %.3f fps, video bitrate %d kbps, pass %d",
-                (float) job->vrate / (float) job->vrate_base,
-                job->vbitrate, job->pass );
+        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 (" + PixelRatio: %d, width:%d, height: %d",job->pixel_ratio,job->width, job->height);
-    job->fifo_mpeg2  = hb_fifo_init( 2048 );
+
+    if( ( job->mux & HB_MUX_AVI ) || job->cfr )
+    {
+        /* VFR detelecine is not compatible with AVI or constant frame rates. */
+        job->vfr = 0;
+    }
+
+    if ( job->vfr )
+    {
+        /* Ensure we're using "Same as source" FPS,
+           aka VFR, if we're doing VFR detelecine. */
+        job->vrate_base = title->rate_base;
+    }
+
+    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 );
     job->fifo_mpeg4  = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
 
     /* Synchronization */
-    hb_list_add( job->list_work, ( w = getWork( WORK_SYNC ) ) );
+    hb_list_add( job->list_work, ( w = hb_get_work( WORK_SYNC ) ) );
     w->fifo_in  = NULL;
     w->fifo_out = NULL;
 
     /* Video decoder */
-    hb_list_add( job->list_work, ( w = getWork( WORK_DECMPEG2 ) ) );
+    int vcodec = title->video_codec? title->video_codec : WORK_DECMPEG2;
+    hb_list_add( job->list_work, ( w = hb_get_work( vcodec ) ) );
+    w->codec_param = title->video_codec_param;
     w->fifo_in  = job->fifo_mpeg2;
     w->fifo_out = job->fifo_raw;
 
     /* Video renderer */
-    hb_list_add( job->list_work, ( w = getWork( WORK_RENDER ) ) );
+    hb_list_add( job->list_work, ( w = hb_get_work( WORK_RENDER ) ) );
     w->fifo_in  = job->fifo_sync;
     w->fifo_out = job->fifo_render;
 
-    /* Video encoder */
-    switch( job->vcodec )
+    if( !job->indepth_scan )
     {
+
+        /* Video encoder */
+        switch( job->vcodec )
+        {
         case HB_VCODEC_FFMPEG:
-            hb_log( " + encoder FFmpeg" );
-            w = getWork( WORK_ENCAVCODEC );
+            w = hb_get_work( WORK_ENCAVCODEC );
             break;
         case HB_VCODEC_XVID:
-            hb_log( " + encoder XviD" );
-            w = getWork( WORK_ENCXVID );
+            w = hb_get_work( WORK_ENCXVID );
             break;
         case HB_VCODEC_X264:
-            hb_log( " + encoder x264" );
-            w = getWork( WORK_ENCX264 );
+            w = hb_get_work( WORK_ENCX264 );
+            break;
+        case HB_VCODEC_THEORA:
+            w = hb_get_work( WORK_ENCTHEORA );
             break;
+        }
+        w->fifo_in  = job->fifo_render;
+        w->fifo_out = job->fifo_mpeg4;
+        w->config   = &job->config;
+
+        hb_list_add( job->list_work, w );
     }
-    w->fifo_in  = job->fifo_render;
-    w->fifo_out = job->fifo_mpeg4;
-    w->config   = &job->config;
-    
-    hb_list_add( job->list_work, w );
 
-    if( job->select_subtitle && !job->indepth_scan ) 
+    if( job->select_subtitle && !job->indepth_scan )
     {
         /*
          * Must be second pass of a two pass with subtitle scan enabled, so
@@ -241,25 +480,23 @@ static void do_job( hb_job_t * job, int cpu_count )
         }
     }
 
-    for( i=0; i < hb_list_count(title->list_subtitle); i++ ) 
+    for( i=0; i < hb_list_count(title->list_subtitle); i++ )
     {
         subtitle =  hb_list_item( title->list_subtitle, i );
 
         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 );
-            
+
             /*
              * 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->indepth_scan && job->subtitle_force && 
-                job->select_subtitle ) 
+            if( !job->indepth_scan && job->subtitle_force &&
+                job->select_subtitle )
             {
                 if( subtitle->forced_hits == 0 )
                 {
@@ -272,250 +509,254 @@ static void do_job( hb_job_t * job, int cpu_count )
                  * Don't add threads for subtitles when we are scanning, unless
                  * looking for forced subtitles.
                  */
-                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;
+                w = hb_get_work( WORK_DECSUB );
+                w->fifo_in  = subtitle->fifo_in;
+                w->fifo_out = subtitle->fifo_raw;
+                hb_list_add( job->list_work, w );
             }
         }
     }
 
-    if( job->acodec & HB_ACODEC_AC3 )
-    {
-        hb_log( " + audio AC3 passthrough" );
-    }
-    else
+    if( !job->indepth_scan )
     {
-        hb_log( " + audio %d kbps, %d Hz", job->abitrate, job->arate );
-        hb_log( " + encoder %s", ( job->acodec & HB_ACODEC_FAAC ) ?
-                "faac" : ( ( job->acodec & HB_ACODEC_LAME ) ? "lame" :
-                "vorbis" ) );
-    }
-
-    /* if we are doing AC3 passthru, then remove any non-AC3 audios from the job */
+    /* 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 */
     for( i = 0; i < hb_list_count( title->list_audio ); )
     {
         audio = hb_list_item( title->list_audio, i );
-        if( ( job->acodec & HB_ACODEC_AC3 ) && ( audio->codec != HB_ACODEC_AC3 ) )
+        if( ( ( audio->config.out.codec == HB_ACODEC_AC3 ) && ( audio->config.in.codec != HB_ACODEC_AC3 ) ) ||
+            ( ( audio->config.out.codec == HB_ACODEC_DCA ) && ( audio->config.in.codec != HB_ACODEC_DCA ) ) )
         {
+            hb_log( "Passthru requested and input codec is not the same as output codec for track %d",
+                    audio->config.out.track );
             hb_list_rem( title->list_audio, audio );
             free( audio );
             continue;
         }
-        i++;
+        /* 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( "   + %x, %s", audio->id, audio->lang );
-                       
-               /* sense-check the current mixdown options */
-
-               /* log the requested mixdown */
-               for (j = 0; j < hb_audio_mixdowns_count; j++) {
-                       if (hb_audio_mixdowns[j].amixdown == job->audio_mixdowns[i]) {
-                               hb_log( "     + Requested mixdown: %s (%s)", hb_audio_mixdowns[j].human_readable_name, hb_audio_mixdowns[j].internal_name );
-                               break;
-                       }
-               }
-
-        /* sense-check the requested mixdown */
-
-        /* audioCodecsSupportMono and audioCodecsSupport6Ch are the same for now,
-           but this may change in the future, so they are separated for flexibility */
-        int audioCodecsSupportMono = ((audio->codec == HB_ACODEC_AC3 ||
-            audio->codec == HB_ACODEC_DCA) && (job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS));
-        int audioCodecsSupport6Ch =  ((audio->codec == HB_ACODEC_AC3 ||
-            audio->codec == HB_ACODEC_DCA) && (job->acodec == HB_ACODEC_FAAC || job->acodec == HB_ACODEC_VORBIS));
-
-        /* find out what the format of our source audio is */
-        switch (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK) {
-        
-            /* mono sources */
-            case HB_INPUT_CH_LAYOUT_MONO:
-                /* regardless of what stereo mixdown we've requested, a mono source always get mixed down
-                to mono if we can, and mixed up to stereo if we can't */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 1) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_MONO;
-                } else {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_STEREO;
-                }
-                break;
 
-            /* stereo input */
-            case HB_INPUT_CH_LAYOUT_STEREO:
-                /* if we've requested a mono mixdown, and it is supported, then do the mix */
-                /* use stereo if not supported */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 0) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_STEREO;
-                /* otherwise, preserve stereo regardless of if we requested something higher */
-                } else if (job->audio_mixdowns[i] > HB_AMIXDOWN_STEREO) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_STEREO;
-                }
-                break;
+        if( audio->config.out.codec != audio->config.in.codec )
+        {
+            /* sense-check the current mixdown options */
 
-            /* 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 we've requested a mono mixdown, and it is supported, then do the mix */
-                /* preserve dolby if not supported */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 0) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBY;
-                /* otherwise, preserve dolby even if we requested something higher */
-                /* a stereo mixdown will still be honoured here */
-                } else if (job->audio_mixdowns[i] > HB_AMIXDOWN_DOLBY) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBY;
+            /* log the requested mixdown */
+            for (j = 0; j < hb_audio_mixdowns_count; j++) {
+                if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) {
+                    requested_mixdown = audio->config.out.mixdown;
+                    requested_mixdown_index = j;
                 }
-                break;
+            }
 
-            /* 3F/2R input */
-            case HB_INPUT_CH_LAYOUT_3F2R:
-                /* if we've requested a mono mixdown, and it is supported, then do the mix */
-                /* use dpl2 if not supported */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 0) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBYPLII;
-                } else {
-                    /* check if we have 3F2R input and also have an LFE - i.e. we have a 5.1 source) */
-                    if (audio->input_channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE) {
-                        /* we have a 5.1 source */
-                        /* if we requested 6ch, but our audio format doesn't support it, then mix to DPLII instead */
-                        if (job->audio_mixdowns[i] == HB_AMIXDOWN_6CH && audioCodecsSupport6Ch == 0) {
-                            job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBYPLII;
+            /* sense-check the requested mixdown */
+
+            if( audio->config.out.mixdown == 0 &&
+                audio->config.out.codec != HB_ACODEC_AC3 )
+            {
+                /*
+                 * Mixdown wasn't specified and this is not pass-through,
+                 * set a default mixdown of stereo.
+                 */
+                audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
+            }
+
+            // Here we try to sanitize the audio input to output mapping.
+            // Constraints are:
+            //   1. only the AC3 & DCA decoder libraries currently support mixdown
+            //   2. the lame encoder library only supports stereo.
+            // 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)
+                    {
+                        audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
+                    }
+                    break;
+
+                // 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 );
                         }
-                    } else {
-                        /* we have a 5.0 source, so we can't do 6ch conversion
-                        default to DPL II instead */
-                        if (job->audio_mixdowns[i] > HB_AMIXDOWN_DOLBYPLII) {
-                            job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBYPLII;
+                        audio->config.out.mixdown = HB_AMIXDOWN_STEREO;
+                    }
+                    else
+                    {
+                        // 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 )
+                    {
+                        audio->config.out.mixdown = HB_AMIXDOWN_DOLBY;
+                    }
+                    break;
+
+                // 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;
                         }
                     }
-                }
-                /* all other mixdowns will have been preserved here */
-                break;
-
-            /* 3F/1R input */
-            case HB_INPUT_CH_LAYOUT_3F1R:
-                /* if we've requested a mono mixdown, and it is supported, then do the mix */
-                /* use dpl1 if not supported */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 0) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBY;
-                } else {
-                    /* we have a 4.0 or 4.1 source, so we can't do DPLII or 6ch conversion
-                    default to DPL I instead */
-                    if (job->audio_mixdowns[i] > HB_AMIXDOWN_DOLBY) {
-                        job->audio_mixdowns[i] = HB_AMIXDOWN_DOLBY;
+                    else
+                    {
+                        // 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 );
                     }
-                }
-                /* all other mixdowns will have been preserved here */
-                break;
+                    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 ) )
+                    {
+                        // 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;
+                    }
+                    break;
+            }
 
-            default:
-                /* if we've requested a mono mixdown, and it is supported, then do the mix */
-                if (job->audio_mixdowns[i] == HB_AMIXDOWN_MONO && audioCodecsSupportMono == 1) {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_MONO;
-                /* mix everything else down to stereo */
-                } else {
-                    job->audio_mixdowns[i] = HB_AMIXDOWN_STEREO;
+            /* log the output mixdown */
+            for (j = 0; j < hb_audio_mixdowns_count; j++) {
+                if (hb_audio_mixdowns[j].amixdown == audio->config.out.mixdown) {
+                    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;
                 }
-
+            }
         }
 
-               /* log the output mixdown */
-               for (j = 0; j < hb_audio_mixdowns_count; j++) {
-                       if (hb_audio_mixdowns[j].amixdown == job->audio_mixdowns[i]) {
-                               hb_log( "     + Actual mixdown: %s (%s)", hb_audio_mixdowns[j].human_readable_name, hb_audio_mixdowns[j].internal_name );
-                               break;
-                       }
-               }
+        if (audio->config.out.codec == HB_ACODEC_VORBIS)
+            audio->priv.config.vorbis.language = audio->config.lang.simple;
 
-               /* we now know we have a valid mixdown for the input source and the audio output format */
-               /* remember the mixdown for this track */
-               audio->amixdown = job->audio_mixdowns[i];
+        /* set up the audio work structures */
+        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->config.vorbis.language = audio->lang_simple;
 
-               /* set up the audio work structures */
-        audio->fifo_in   = hb_fifo_init( 2048 );
-        audio->fifo_raw  = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
-        audio->fifo_sync = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
-        audio->fifo_out  = hb_fifo_init( FIFO_CPU_MULT * cpu_count );
-
-        switch( audio->codec )
-        {
-            case HB_ACODEC_AC3:
-                w = getWork( WORK_DECA52 );
-                break;
-            case HB_ACODEC_DCA:
-                w = getWork( WORK_DECDCA );
-                break;
-            case HB_ACODEC_MPGA:
-                w = getWork( WORK_DECAVCODEC );
-                break;
-            case HB_ACODEC_LPCM:
-                w = getWork( WORK_DECLPCM );
-                break;
-        }
-        w->fifo_in       = audio->fifo_in;
-        w->fifo_out      = audio->fifo_raw;
-        w->config        = &audio->config;
-        w->amixdown      = audio->amixdown;
-        w->source_acodec = audio->codec;
-        
-        /* FIXME: This feels really hackish, anything better? */
-        audio_w = calloc( sizeof( hb_work_object_t ), 1 );
-        audio_w = memcpy( audio_w, w, sizeof( hb_work_object_t ));
-        
-        hb_list_add( job->list_work, audio_w );
-
-        switch( job->acodec )
+        /*
+         * Audio Decoder Thread
+         */
+        if ( ( w = hb_codec_decoder( audio->config.in.codec ) ) == NULL )
         {
-            case HB_ACODEC_FAAC:
-                w = getWork( WORK_ENCFAAC );
-                break;
-            case HB_ACODEC_LAME:
-                w = getWork( WORK_ENCLAME );
-                break;
-            case HB_ACODEC_VORBIS:
-                w = getWork( WORK_ENCVORBIS );
-                break;
+            hb_error("Invalid input codec: %d", audio->config.in.codec);
+            *job->die = 1;
+            goto cleanup;
         }
+        w->fifo_in  = audio->priv.fifo_in;
+        w->fifo_out = audio->priv.fifo_raw;
+        w->config   = &audio->priv.config;
+        w->audio    = audio;
+        w->codec_param = audio->config.in.codec_param;
 
-        if( job->acodec != HB_ACODEC_AC3 )
+        hb_list_add( job->list_work, w );
+
+        /*
+         * Audio Encoder Thread
+         */
+        if( audio->config.out.codec != HB_ACODEC_AC3 )
         {
-            w->fifo_in       = audio->fifo_sync;
-            w->fifo_out      = audio->fifo_out;
-            w->config        = &audio->config;
-            w->amixdown      = audio->amixdown;
-            w->source_acodec = audio->codec;
-            
-            /* FIXME: This feels really hackish, anything better? */
-            audio_w = calloc( sizeof( hb_work_object_t ), 1 );
-            audio_w = memcpy( audio_w, w, sizeof( hb_work_object_t ));
-        
-            hb_list_add( job->list_work, audio_w );
-        }
+            /*
+             * Add the encoder thread if not doing AC-3 pass through
+             */
+            if ( ( w = hb_codec_encoder( audio->config.out.codec ) ) == NULL )
+            {
+                hb_error("Invalid audio codec: %#x", audio->config.out.codec);
+                w = NULL;
+                *job->die = 1;
+                goto cleanup;
+            }
+            w->fifo_in  = audio->priv.fifo_sync;
+            w->fifo_out = audio->priv.fifo_out;
+            w->config   = &audio->priv.config;
+            w->audio    = audio;
 
+            hb_list_add( job->list_work, w );
+        }
+    }
 
     }
 
+    /* Display settings */
+    hb_display_job_info( job );
+
     /* Init read & write threads */
     job->reader = hb_reader_init( job );
 
-    hb_log( " + output: %s", job->file );
-    job->muxer = hb_muxer_init( job );
 
     job->done = 0;
 
@@ -525,25 +766,26 @@ static void do_job( hb_job_t * job, int cpu_count )
         w = hb_list_item( job->list_work, i );
         w->done = &job->done;
         w->thread_sleep_interval = 10;
-        w->init( w, job );
+        if( w->init( w, job ) )
+        {
+            hb_error( "Failure to initialise thread '%s'", w->name );
+            *job->die = 1;
+            goto cleanup;
+        }
         w->thread = hb_thread_init( w->name, work_loop, w,
                                     HB_LOW_PRIORITY );
     }
 
-    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 = job->indepth_scan? NULL : hb_muxer_init( job );
+
     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->work( w, NULL, NULL ) == HB_WORK_DONE )
-        {
-            done = 1;
-        }
-        if( done &&
-            !hb_fifo_size( job->fifo_sync ) &&
-            !hb_fifo_size( job->fifo_render ) &&
-            !hb_fifo_size( job->fifo_mpeg4 ) )
+        if ( ( w->status = w->work( w, NULL, NULL ) ) == HB_WORK_DONE )
         {
             break;
         }
@@ -551,33 +793,38 @@ static void do_job( hb_job_t * job, int cpu_count )
     }
     hb_list_rem( job->list_work, w );
     w->close( w );
+    free( w );
+
+    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_rem( job->list_work, w );
-        hb_thread_close( &w->thread );
-        w->close( w );
-        
-        /* FIXME: This feels really hackish, anything better? */
-        if ( w->id == WORK_DECA52 ||
-             w->id == WORK_DECDCA ||
-             w->id == WORK_DECLPCM ||
-             w->id == WORK_ENCFAAC ||
-             w->id == WORK_ENCLAME ||
-             w->id == WORK_ENCVORBIS )
+        if( w->thread != NULL )
         {
-            free( w );
-            w = NULL;
+            hb_thread_close( &w->thread );
+            w->close( w );
         }
+        free( w );
     }
-    
+
     hb_list_close( &job->list_work );
 
-    /* Stop read & write threads */
-    hb_thread_close( &job->reader );
-    hb_thread_close( &job->muxer );
+    /* Stop the read thread */
+    if( job->reader != NULL )
+        hb_thread_close( &job->reader );
 
     /* Close fifos */
     hb_fifo_close( &job->fifo_mpeg2 );
@@ -597,10 +844,14 @@ static void do_job( hb_job_t * job, int cpu_count )
     for( i = 0; i < hb_list_count( title->list_audio ); i++ )
     {
         audio = hb_list_item( title->list_audio, i );
-        hb_fifo_close( &audio->fifo_in );
-        hb_fifo_close( &audio->fifo_raw );
-        hb_fifo_close( &audio->fifo_sync );
-        hb_fifo_close( &audio->fifo_out );
+        if( audio->priv.fifo_in != NULL )
+            hb_fifo_close( &audio->priv.fifo_in );
+        if( audio->priv.fifo_raw != NULL )
+            hb_fifo_close( &audio->priv.fifo_raw );
+        if( audio->priv.fifo_sync != NULL )
+            hb_fifo_close( &audio->priv.fifo_sync );
+        if( audio->priv.fifo_out != NULL )
+            hb_fifo_close( &audio->priv.fifo_out );
     }
 
     if( job->indepth_scan )
@@ -609,19 +860,19 @@ static void do_job( hb_job_t * job, int cpu_count )
          * Before closing the title print out our subtitle stats if we need to
          * Find the highest and lowest.
          */
-        for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) 
+        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 (%d forced)",
                     subtitle->id, subtitle->lang, subtitle->hits,
                     subtitle->forced_hits );
-            if( subtitle->hits > subtitle_highest ) 
+            if( subtitle->hits > subtitle_highest )
             {
                 subtitle_highest = subtitle->hits;
                 subtitle_highest_id = subtitle->id;
-            } 
-            
-            if( subtitle->hits < subtitle_lowest ) 
+            }
+
+            if( subtitle->hits < subtitle_lowest )
             {
                 subtitle_lowest = subtitle->hits;
                 subtitle_lowest_id = subtitle->id;
@@ -635,7 +886,7 @@ static void do_job( hb_job_t * job, int cpu_count )
                 }
             }
         }
-        
+
         if( job->native_language ) {
             /*
              * We still have a native_language, so the audio and subtitles are
@@ -654,7 +905,7 @@ static void do_job( hb_job_t * job, int cpu_count )
                 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 ) 
+            } else if( subtitle_lowest < subtitle_highest )
             {
                 /*
                  * OK we have more than one, and the lowest is lower,
@@ -663,7 +914,7 @@ static void do_job( hb_job_t * job, int cpu_count )
                  *
                  * Let's say 10% as a default.
                  */
-                if( subtitle_lowest < ( subtitle_highest * 0.1 ) ) 
+                if( subtitle_lowest < ( subtitle_highest * 0.1 ) )
                 {
                     subtitle_hit = subtitle_lowest_id;
                     hb_log( "Found a subtitle candidate id 0x%x",
@@ -675,14 +926,14 @@ static void do_job( hb_job_t * job, int cpu_count )
         }
     }
 
-    if( job->select_subtitle ) 
+    if( job->select_subtitle )
     {
-        if( job->indepth_scan ) 
+        if( job->indepth_scan )
         {
-            for( i=0; i < hb_list_count( title->list_subtitle ); i++ ) 
+            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;
@@ -700,6 +951,16 @@ static void do_job( hb_job_t * job, int cpu_count )
         }
     }
 
+    if( job->filters )
+    {
+        for( i = 0; i < hb_list_count( job->filters ); i++ )
+        {
+            hb_filter_object_t * filter = hb_list_item( job->filters, i );
+            hb_filter_close( &filter );
+        }
+        hb_list_close( &job->filters );
+    }
+
     hb_buffer_pool_free();
 
     hb_title_close( &job->title );
@@ -707,7 +968,7 @@ static void do_job( hb_job_t * job, int cpu_count )
 }
 
 /**
- * Performs the work objects specific work function.
+ * Performs the work object's specific work function.
  * Loops calling work function for associated work object. Sleeps when fifo is full.
  * Monitors work done indicator.
  * Exits loop when work indiactor is set.
@@ -734,15 +995,20 @@ static void work_loop( void * _w )
         }
 //             w->thread_sleep_interval = MAX(1, (w->thread_sleep_interval - 1));
 
-        w->work( w, &buf_in, &buf_out );
+        w->status = w->work( w, &buf_in, &buf_out );
 
-        // Propogate any chapter breaks for the worker
-        if( buf_in && buf_out && buf_in->new_chap )
+        // Propagate any chapter breaks for the worker if and only if the
+        // output frame has the same time stamp as the input frame (any
+        // worker that delays frames has to propagate the chapter marks itself
+        // and workers that move chapter marks to a different time should set
+        // 'buf_in' to NULL so that this code won't generate spurious duplicates.)
+        if( buf_in && buf_out && buf_in->new_chap && buf_in->start == buf_out->start)
         {
-            hb_log("WORK: Copying Chapter Break");
-            buf_out->new_chap = 1;
+            // restore log below to debug chapter mark propagation problems
+            //hb_log("work %s: Copying Chapter Break @ %lld", w->name, buf_in->start);
+            buf_out->new_chap = buf_in->new_chap;
         }
-        
+
         if( buf_in )
         {
             hb_buffer_close( &buf_in );