Merge pull request #22 from jstebbins/lame

lame: Use libav wrapper to encode mp3lame

5 files changed, 6 insertions, 232 deletions

diff --git a/libhb/common.h b/libhb/common.h
index bac165a4f..6811e1eca 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -1163,7 +1163,6 @@ extern hb_work_object_t hb_encx265;
 extern hb_work_object_t hb_decavcodeca;
 extern hb_work_object_t hb_decavcodecv;
 extern hb_work_object_t hb_declpcm;
-extern hb_work_object_t hb_enclame;
 extern hb_work_object_t hb_encvorbis;
 extern hb_work_object_t hb_muxer;
 extern hb_work_object_t hb_encca_aac;
diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index ed4997e1e..c39c05a7f 100644
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -121,6 +121,10 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job)
             }
             break;
 
+        case HB_ACODEC_LAME:
+            codec_name = "libmp3lame";
+            break;
+
         default:
             hb_error("encavcodecaInit: unsupported codec (0x%x)",
                      audio->config.out.codec);
diff --git a/libhb/enclame.c b/libhb/enclame.c
deleted file mode 100644
index 9ba7c5d87..000000000
--- a/libhb/enclame.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* enclame.c
-
-   Copyright (c) 2003-2015 HandBrake Team
-   This file is part of the HandBrake source code
-   Homepage: <http://handbrake.fr/>.
-   It may be used under the terms of the GNU General Public License v2.
-   For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-#include "hb.h"
-
-#include "lame/lame.h"
-
-int  enclameInit( hb_work_object_t *, hb_job_t * );
-int  enclameWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
-void enclameClose( hb_work_object_t * );
-
-hb_work_object_t hb_enclame =
-{
-    WORK_ENCLAME,
-    "MP3 encoder (libmp3lame)",
-    enclameInit,
-    enclameWork,
-    enclameClose
-};
-
-struct hb_work_private_s
-{
-    hb_job_t   * job;
-
-    /* LAME handle */
-    lame_global_flags * lame;
-
-    int             out_discrete_channels;
-    unsigned long   input_samples;
-    unsigned long   output_bytes;
-    uint8_t       * buf;
-
-    hb_list_t     * list;
-    int64_t         pts;
-};
-
-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;
-
-    hb_log( "enclame: opening libmp3lame" );
-
-    pv->lame = lame_init();
-    // use ABR
-    lame_set_scale( pv->lame, 32768.0 );
-    if( audio->config.out.compression_level >= 0 )
-    {
-        lame_set_quality( pv->lame, audio->config.out.compression_level );
-    }
-    if( audio->config.out.bitrate > 0 )
-    {
-        lame_set_VBR( pv->lame, vbr_abr );
-        lame_set_VBR_mean_bitrate_kbps( pv->lame, audio->config.out.bitrate );
-    }
-    else if( audio->config.out.quality >= 0 )
-    {
-        lame_set_brate( pv->lame, 0 );
-        lame_set_VBR( pv->lame, vbr_default );
-        lame_set_VBR_quality( pv->lame, audio->config.out.quality );
-    }
-    lame_set_in_samplerate( pv->lame, audio->config.out.samplerate );
-    lame_set_out_samplerate( pv->lame, audio->config.out.samplerate );
-
-    pv->out_discrete_channels = hb_mixdown_get_discrete_channel_count( audio->config.out.mixdown );
-    // 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 ( pv->out_discrete_channels == 1 )
-    {
-        lame_set_mode( pv->lame, MONO );
-        lame_set_num_channels( pv->lame, 1 );
-    }
-    else if ( audio->config.out.bitrate >= 128 )
-    {
-        lame_set_mode( pv->lame, STEREO );
-    }
-    lame_init_params( pv->lame );
-
-    pv->input_samples = 1152 * pv->out_discrete_channels;
-    pv->output_bytes = LAME_MAXMP3BUFFER;
-    pv->buf  = malloc( pv->input_samples * sizeof( float ) );
-    audio->config.out.samples_per_frame = 1152;
-
-    pv->list = hb_list_init();
-    pv->pts  = AV_NOPTS_VALUE;
-
-    return 0;
-}
-
-/***********************************************************************
- * Close
- ***********************************************************************
- *
- **********************************************************************/
-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;
-}
-
-/***********************************************************************
- * Encode
- ***********************************************************************
- *
- **********************************************************************/
-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;
-    float samples[2][1152];
-    uint64_t pts, pos;
-    int      i, j;
-
-    if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
-    {
-        return NULL;
-    }
-
-    hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
-                      &pts, &pos);
-
-    for( i = 0; i < 1152; i++ )
-    {
-        for( j = 0; j < pv->out_discrete_channels; j++ )
-        {
-            samples[j][i] = ((float *) pv->buf)[(pv->out_discrete_channels * i + j)];
-        }
-    }
-
-    buf             = hb_buffer_init( pv->output_bytes );
-    buf->s.start    = pts + 90000 * pos / pv->out_discrete_channels / sizeof( float ) / audio->config.out.samplerate;
-    buf->s.duration = (double)90000 * 1152 / audio->config.out.samplerate;
-    buf->s.stop     = buf->s.start + buf->s.duration;
-    pv->pts = buf->s.stop;
-    buf->size  = lame_encode_buffer_float( 
-            pv->lame, samples[0], samples[1],
-            1152, buf->data, LAME_MAXMP3BUFFER );
-
-    buf->s.type = AUDIO_BUF;
-    buf->s.frametype = HB_FRAME_AUDIO;
-
-    if( !buf->size )
-    {
-        /* Encoding was successful but we got no data. Try to encode
-           more */
-        hb_buffer_close( &buf );
-        return Encode( w );
-    }
-    else if( buf->size < 0 )
-    {
-        hb_log( "enclame: lame_encode_buffer failed" );
-        hb_buffer_close( &buf );
-        return NULL;
-    }
-    return buf;
-}
-
-/***********************************************************************
- * Work
- ***********************************************************************
- *
- **********************************************************************/
-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_audio_t * audio = w->audio;
-    hb_buffer_t * in = *buf_in;
-    hb_buffer_t * buf;
-    hb_buffer_list_t list;
-
-    *buf_in = NULL;
-    hb_buffer_list_clear(&list);
-    if (in->s.flags & HB_BUF_FLAG_EOF)
-    {
-        /* EOF on input - send it downstream & say we're done */
-
-        buf = hb_buffer_init( pv->output_bytes );
-        buf->size = lame_encode_flush( pv->lame, buf->data, LAME_MAXMP3BUFFER );
-        buf->s.start = pv->pts;
-        buf->s.stop  = buf->s.start + 90000 * 1152 / audio->config.out.samplerate;
-
-        buf->s.type = AUDIO_BUF;
-        buf->s.frametype = HB_FRAME_AUDIO;
-
-        if( buf->size <= 0 )
-        {
-            hb_buffer_close( &buf );
-        }
-        hb_buffer_list_append(&list, buf);
-        // Add the eof
-        hb_buffer_list_append(&list, in);
-
-        *buf_out = hb_buffer_list_clear(&list);
-        return HB_WORK_DONE;
-    }
-
-    hb_list_add(pv->list, in);
-
-    buf = Encode( w );
-    while (buf)
-    {
-        hb_buffer_list_append(&list, buf);
-        buf = Encode( w );
-    }
-
-    *buf_out = hb_buffer_list_clear(&list);
-    return HB_WORK_OK;
-}
-
diff --git a/libhb/hb.c b/libhb/hb.c
index 55800c832..5f688c012 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1677,7 +1677,6 @@ int hb_global_init()
     hb_register(&hb_encca_aac);
     hb_register(&hb_encca_haac);
 #endif
-    hb_register(&hb_enclame);
     hb_register(&hb_enctheora);
     hb_register(&hb_encvorbis);
     hb_register(&hb_encx264);
diff --git a/libhb/work.c b/libhb/work.c
index 825654524..52bb900d4 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -191,8 +191,8 @@ hb_work_object_t* hb_codec_encoder(hb_handle_t *h, int codec)
     }
     switch (codec)
     {
-        case HB_ACODEC_AC3:     return hb_get_work(h, WORK_ENCAVCODEC_AUDIO);
-        case HB_ACODEC_LAME:    return hb_get_work(h, WORK_ENCLAME);
+        case HB_ACODEC_AC3:
+        case HB_ACODEC_LAME:    return hb_get_work(h, WORK_ENCAVCODEC_AUDIO);
         case HB_ACODEC_VORBIS:  return hb_get_work(h, WORK_ENCVORBIS);
         case HB_ACODEC_CA_AAC:  return hb_get_work(h, WORK_ENC_CA_AAC);
         case HB_ACODEC_CA_HAAC: return hb_get_work(h, WORK_ENC_CA_HAAC);