Don't discard titles during scan just because of a read failure on one or more of...

[handbrake-jp/handbrake-jp-git.git] / libhb / encfaac.c

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index d46e8ae..2ba9ad4 100644 (file)
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -79,27 +79,33 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
     cfg->outputFormat  = 0;
     cfg->inputFormat   =  FAAC_INPUT_FLOAT;
        
-       if (pv->out_discrete_channels == 6) {
-               /* we are preserving 5.1 audio into 6-channel AAC, and need to
-               re-map the output of deca52 into our own mapping - the mapping
-               below is the default mapping expected by QuickTime */
-               /* This doesn't seem to be correct for VLC on Linux */
-               cfg->channel_map[0] = 2;
-               cfg->channel_map[1] = 1;
-               cfg->channel_map[2] = 3;
-               cfg->channel_map[3] = 4;
-               cfg->channel_map[4] = 5;
-               cfg->channel_map[5] = 0;
+       if (w->amixdown == HB_AMIXDOWN_6CH && w->source_acodec == HB_ACODEC_AC3)
+    {
+        /* we are preserving 5.1 AC-3 audio into 6-channel AAC, and need to
+        re-map the output of deca52 into our own mapping - the mapping
+        below is the default mapping expected by QuickTime */
+        /* DTS output from libdca is already in the right mapping for QuickTime */
+        /* This doesn't seem to be correct for VLC on Linux */
+        cfg->channel_map[0] = 2;
+        cfg->channel_map[1] = 1;
+        cfg->channel_map[2] = 3;
+        cfg->channel_map[3] = 4;
+        cfg->channel_map[4] = 5;
+        cfg->channel_map[5] = 0;
        }
        
     if( !faacEncSetConfiguration( pv->faac, cfg ) )
     {
         hb_log( "faacEncSetConfiguration failed" );
+        *job->die = 1;
+        return 0;
     }
 
     if( faacEncGetDecoderSpecificInfo( pv->faac, &bytes, &length ) < 0 )
     {
         hb_log( "faacEncGetDecoderSpecificInfo failed" );
+        *job->die = 1;
+        return 0;
     }
     memcpy( w->config->aac.bytes, bytes, length );
     w->config->aac.length = length;
@@ -151,7 +157,7 @@ static hb_buffer_t * Encode( hb_work_object_t * w )
     buf->stop  = buf->start + 90000 * pv->input_samples / pv->job->arate / pv->out_discrete_channels;
     buf->size  = faacEncEncode( pv->faac, (int32_t *) pv->buf,
             pv->input_samples, buf->data, pv->output_bytes );
-    buf->key   = 1;
+    buf->frametype   = HB_FRAME_AUDIO;
 
     if( !buf->size )
     {