X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fencvorbis.c;h=ce27ea0211334bb96a9d57124e03b99f8258c4fc;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=a90b285d2537b74abb679de5cd77dc88ba130de4;hpb=f23be73b1333555bd3c7e887e6cda1c57a3be149;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index a90b285d..ce27ea02 100644
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -1,7 +1,7 @@
 /* $Id: encvorbis.c,v 1.6 2005/03/05 15:08:32 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"
@@ -44,13 +44,14 @@ struct hb_work_private_s
 
 int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
 {
+    hb_audio_t * audio = w->audio;
     int i;
     ogg_packet header[3];
     struct ovectl_ratemanage2_arg  ctl_rate_arg;
 
     hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
     w->private_data = pv;
-    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(w->amixdown);
+    pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
 
     pv->job   = job;
 
@@ -58,17 +59,18 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
 
     /* 28kbps/channel seems to be the minimum for 6ch vorbis. */
     int min_bitrate = 28 * pv->out_discrete_channels;
-    if (pv->out_discrete_channels > 2 && job->abitrate < min_bitrate)
+    if (pv->out_discrete_channels > 2 && audio->config.out.bitrate < min_bitrate)
     {
-        hb_log( "encvorbis: Selected bitrate (%d kbps) too low for %d channel audio.", job->abitrate, pv->out_discrete_channels);
+        hb_log( "encvorbis: Selected bitrate (%d kbps) too low for %d channel audio.", audio->config.out.bitrate, pv->out_discrete_channels);
         hb_log( "encvorbis: Resetting bitrate to %d kbps", min_bitrate);
-        job->abitrate = min_bitrate;
+        /* Naughty! We shouldn't modify the audio from here. */
+        audio->config.out.bitrate = min_bitrate;
     }
 
     /* init */
     vorbis_info_init( &pv->vi );
     if( vorbis_encode_setup_managed( &pv->vi, pv->out_discrete_channels,
-          job->arate, -1, 1000 * job->abitrate, -1 ) )
+          audio->config.out.samplerate, -1, 1000 * audio->config.out.bitrate, -1 ) )
     {
         hb_error( "encvorbis: vorbis_encode_setup_managed failed.\n" );
         *job->die = 1;
@@ -80,7 +82,7 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
         hb_log( "encvorbis: vorbis_encode_ctl( ratemanage2_get ) failed" );
     }
 
-    ctl_rate_arg.bitrate_average_kbps = 1000 * job->abitrate;
+    ctl_rate_arg.bitrate_average_kbps = audio->config.out.bitrate;
     ctl_rate_arg.management_active = 1;
 
     if( vorbis_encode_ctl( &pv->vi, OV_ECTL_RATEMANAGE2_SET, &ctl_rate_arg ) ||
@@ -121,12 +123,25 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
             pv->channel_map[0] = 0;
             break;
         case 6:
-            pv->channel_map[0] = 0;
-            pv->channel_map[1] = 2;
-            pv->channel_map[2] = 1;
-            pv->channel_map[3] = 4;
-            pv->channel_map[4] = 5;
-            pv->channel_map[5] = 3;
+            // Vorbis use the following channels map = L C R Ls Rs Lfe
+            if( audio->config.in.codec == HB_ACODEC_AC3 )
+            {
+                pv->channel_map[0] = 1;
+                pv->channel_map[1] = 2;
+                pv->channel_map[2] = 3;
+                pv->channel_map[3] = 4;
+                pv->channel_map[4] = 5;
+                pv->channel_map[5] = 0;
+            }
+            else
+            {
+                pv->channel_map[0] = 1;
+                pv->channel_map[1] = 0;
+                pv->channel_map[2] = 2;
+                pv->channel_map[3] = 3;
+                pv->channel_map[4] = 4;
+                pv->channel_map[5] = 5;
+            }
             break;
         default:
             hb_log("encvorbis.c: Unable to correctly proccess %d channels, assuming stereo.", pv->out_discrete_channels);
@@ -148,7 +163,7 @@ int encvorbisInit( hb_work_object_t * w, hb_job_t * job )
 void encvorbisClose( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
-    
+
     vorbis_block_clear( &pv->vb );
     vorbis_dsp_clear( &pv->vd );
     vorbis_comment_clear( &pv->vc );
@@ -156,7 +171,7 @@ void encvorbisClose( hb_work_object_t * w )
 
     if (pv->list)
         hb_list_empty( &pv->list );
-    
+
     free( pv->buf );
     free( pv );
     w->private_data = NULL;
@@ -250,6 +265,14 @@ int encvorbisWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf;
 
+    if ( (*buf_in)->size <= 0 )
+    {
+        /* EOF on input - send it downstream & say we're done */
+        *buf_out = *buf_in;
+        *buf_in = NULL;
+       return HB_WORK_DONE;
+    }
+
     hb_list_add( pv->list, *buf_in );
     *buf_in = NULL;