Merge the 5.1 branch into the trunk.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 195 insertions, 0 deletions

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
new file mode 100644
index 000000000..83d390fd9
--- /dev/null
+++ b/libhb/encfaac.c
@@ -0,0 +1,195 @@
+/* $Id: encfaac.c,v 1.13 2005/03/03 17:21:57 titer Exp $
+
+   This file is part of the HandBrake source code.
+   Homepage: <http://handbrake.m0k.org/>.
+   It may be used under the terms of the GNU General Public License. */
+
+#include "hb.h"
+
+#include "faac.h"
+
+struct hb_work_private_s
+{
+    hb_job_t   * job;
+
+    faacEncHandle * faac;
+    unsigned long   input_samples;
+    unsigned long   output_bytes;
+    uint8_t       * buf;
+
+    hb_list_t     * list;
+    int64_t         pts;
+	
+	int             channelsused;
+
+};
+
+int  encfaacInit( hb_work_object_t *, hb_job_t * );
+int  encfaacWork( hb_work_object_t *, hb_buffer_t **, hb_buffer_t ** );
+void encfaacClose( hb_work_object_t * );
+
+hb_work_object_t hb_encfaac =
+{
+    WORK_ENCFAAC,
+    "AAC encoder (libfaac)",
+    encfaacInit,
+    encfaacWork,
+    encfaacClose
+};
+
+/***********************************************************************
+ * hb_work_encfaac_init
+ ***********************************************************************
+ *
+ **********************************************************************/
+int encfaacInit( hb_work_object_t * w, hb_job_t * job )
+{
+    hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
+    faacEncConfigurationPtr cfg;
+    uint8_t * bytes;
+    unsigned long length;
+
+    w->private_data = pv;
+
+    pv->job   = job;
+
+	/* pass the number of channels used into the private work data */
+	pv->channelsused = job->channelsused;
+
+    pv->faac = faacEncOpen( job->arate, job->channelsused, &pv->input_samples,
+                           &pv->output_bytes );
+    pv->buf  = malloc( pv->input_samples * sizeof( float ) );
+    
+    cfg                = faacEncGetCurrentConfiguration( pv->faac );
+    cfg->mpegVersion   = MPEG4;
+    cfg->aacObjectType = LOW;
+    cfg->allowMidside  = 1;
+	
+	if (job->channelsused == 6) {
+		/* we are preserving 5.1 audio into 6-channel AAC,
+		so indicate that we have an lfe channel */
+		cfg->useLfe    = 1;
+	} else {
+		cfg->useLfe    = 0;
+	}
+
+    cfg->useTns        = 0;
+    cfg->bitRate       = job->abitrate * 500; /* Per channel */
+    cfg->bandWidth     = 0;
+    cfg->outputFormat  = 0;
+    cfg->inputFormat   =  FAAC_INPUT_FLOAT;
+	
+	if (job->channelsused == 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 */
+		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" );
+    }
+
+    if( faacEncGetDecoderSpecificInfo( pv->faac, &bytes, &length ) < 0 )
+    {
+        hb_log( "faacEncGetDecoderSpecificInfo failed" );
+    }
+    memcpy( w->config->aac.bytes, bytes, length );
+    w->config->aac.length = length;
+    free( bytes );
+
+    pv->list = hb_list_init();
+    pv->pts  = -1;
+
+    return 0;
+}
+
+/***********************************************************************
+ * Close
+ ***********************************************************************
+ *
+ **********************************************************************/
+void encfaacClose( hb_work_object_t * w )
+{
+    hb_work_private_t * pv = w->private_data;
+    faacEncClose( pv->faac );
+    free( pv->buf );
+    hb_list_empty( &pv->list );
+}
+
+/***********************************************************************
+ * Encode
+ ***********************************************************************
+ *
+ **********************************************************************/
+static hb_buffer_t * Encode( hb_work_object_t * w )
+{
+    hb_work_private_t * pv = w->private_data;
+    hb_buffer_t * buf;
+    uint64_t      pts;
+    int           pos;
+
+    if( hb_list_bytes( pv->list ) < pv->input_samples * sizeof( float ) )
+    {
+        /* Need more data */
+        return NULL;
+    }
+
+    hb_list_getbytes( pv->list, pv->buf, pv->input_samples * sizeof( float ),
+                      &pts, &pos );
+
+    buf        = hb_buffer_init( pv->output_bytes );
+    buf->start = pts + 90000 * pos / pv->channelsused / sizeof( float ) / pv->job->arate;
+    buf->stop  = buf->start + 90000 * pv->input_samples / pv->job->arate / pv->channelsused;
+    buf->size  = faacEncEncode( pv->faac, (int32_t *) pv->buf,
+            pv->input_samples, buf->data, pv->output_bytes );
+    buf->key   = 1;
+
+    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( "faacEncEncode failed" );
+        hb_buffer_close( &buf );
+        return NULL;
+    }
+
+    return buf;
+}
+
+/***********************************************************************
+ * Work
+ ***********************************************************************
+ *
+ **********************************************************************/
+int encfaacWork( 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 * buf;
+
+    hb_list_add( pv->list, *buf_in );
+    *buf_in = NULL;
+
+    *buf_out = buf = Encode( w );
+
+    while( buf )
+    {
+        buf->next = Encode( w );
+        buf       = buf->next;
+    }
+    
+    return HB_WORK_OK;
+}
+