X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fenclame.c;h=a3f4a388282233ef5ffb06757b3e69369f7386e2;hb=3e441ebb595c36a1f2f029e4ce907bb1bffaea50;hp=f663e62eba77f813796585adca6461b8f7631927;hpb=68e3a3c68e1af09f9547b2deca6bc4716e7ee10d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/enclame.c b/libhb/enclame.c
index f663e62e..a3f4a388 100644
--- a/libhb/enclame.c
+++ b/libhb/enclame.c
@@ -1,7 +1,7 @@
 /* $Id: enclame.c,v 1.9 2005/03/05 14:27:05 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"
@@ -28,6 +28,7 @@ struct hb_work_private_s
     /* LAME handle */
     lame_global_flags * lame;
 
+    int             done;
     unsigned long   input_samples;
     unsigned long   output_bytes;
     uint8_t       * buf;
@@ -39,6 +40,7 @@ struct hb_work_private_s
 int enclameInit( hb_work_object_t * w, hb_job_t * job )
 {
     hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
+    hb_audio_t * audio = w->audio;
     w->private_data = pv;
 
     pv->job   = job;
@@ -46,11 +48,20 @@ int enclameInit( hb_work_object_t * w, hb_job_t * job )
     hb_log( "enclame: opening libmp3lame" );
 
     pv->lame = lame_init();
-    lame_set_brate( pv->lame, job->abitrate );
-    lame_set_in_samplerate( pv->lame, job->arate );
-    lame_set_out_samplerate( pv->lame, job->arate );
+    // use ABR
+    lame_set_VBR( pv->lame, vbr_abr );
+    lame_set_VBR_mean_bitrate_kbps( pv->lame, audio->config.out.bitrate );
+    lame_set_in_samplerate( pv->lame, audio->config.out.samplerate );
+    lame_set_out_samplerate( pv->lame, audio->config.out.samplerate );
     lame_init_params( pv->lame );
-    
+    // Lame's default encoding mode is JOINT_STEREO.  This subtracts signal
+    // that is "common" to left and right (within some threshold) and encodes
+    // it separately.  This improves quality at low bitrates, but hurts 
+    // imaging (channel separation) at higher bitrates.  So if the bitrate
+    // is suffeciently high, use regular STEREO mode.
+    if ( audio->config.out.bitrate >= 128 )
+        lame_set_mode( pv->lame, STEREO );
+
     pv->input_samples = 1152 * 2;
     pv->output_bytes = LAME_MAXMP3BUFFER;
     pv->buf  = malloc( pv->input_samples * sizeof( float ) );
@@ -68,6 +79,13 @@ int enclameInit( hb_work_object_t * w, hb_job_t * job )
  **********************************************************************/
 void enclameClose( hb_work_object_t * w )
 {
+    hb_work_private_t * pv = w->private_data;
+
+    lame_close( pv->lame );
+    hb_list_empty( &pv->list );
+    free( pv->buf );
+    free( pv );
+    w->private_data = NULL;
 }
 
 /***********************************************************************
@@ -78,10 +96,11 @@ void enclameClose( hb_work_object_t * w )
 static hb_buffer_t * Encode( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
+    hb_audio_t * audio = w->audio;
     hb_buffer_t * buf;
     int16_t samples_s16[1152 * 2];
-    uint64_t pts;
-    int      pos, i;
+    uint64_t pts, pos;
+	int      i;
 
     if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
     {
@@ -97,11 +116,11 @@ static hb_buffer_t * Encode( hb_work_object_t * w )
     }
 
     buf        = hb_buffer_init( pv->output_bytes );
-    buf->start = pts + 90000 * pos / 2 / sizeof( float ) / pv->job->arate;
-    buf->stop  = buf->start + 90000 * 1152 / pv->job->arate;
+    buf->start = pts + 90000 * pos / 2 / sizeof( float ) / audio->config.out.samplerate;
+    buf->stop  = buf->start + 90000 * 1152 / audio->config.out.samplerate;
     buf->size  = lame_encode_buffer_interleaved( pv->lame, samples_s16,
             1152, buf->data, LAME_MAXMP3BUFFER );
-    buf->key   = 1;
+    buf->frametype   = HB_FRAME_AUDIO;
 
     if( !buf->size )
     {
@@ -129,8 +148,35 @@ int enclameWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
                  hb_buffer_t ** buf_out )
 {
     hb_work_private_t * pv = w->private_data;
+    hb_buffer_t * in = *buf_in;
     hb_buffer_t * buf;
 
+    if ( (*buf_in)->size <= 0 )
+    {
+        /* EOF on input - send it downstream & say we're done */
+        if ( pv->done )
+        {
+            *buf_out = *buf_in;
+            *buf_in = NULL;
+            return HB_WORK_DONE;
+        }
+        else
+        {
+            pv->done = 1;
+            hb_fifo_push( w->fifo_in, in);
+            *buf_in = NULL;
+
+            buf = hb_buffer_init( pv->output_bytes );
+            buf->size = lame_encode_flush( pv->lame, buf->data, LAME_MAXMP3BUFFER );
+            if( buf->size <= 0 )
+            {
+                hb_buffer_close( &buf );
+            }
+            *buf_out = buf;
+            return HB_WORK_OK;
+        }
+    }
+
     hb_list_add( pv->list, *buf_in );
     *buf_in = NULL;