hb_audio_remap improvements:

- support for additional sample formats

- support for variable channel layouts



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

1 files changed, 4 insertions, 12 deletions

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index c6a3f8a16..c8754f7d7 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -74,18 +74,10 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
     cfg->allowMidside  = 1;
 
     /* channel configuration & remapping */
-    uint64_t layout;
-    int *remap_table;
-    layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
-    remap_table = hb_audio_remap_build_table(layout, &hb_aac_chan_map,
-                                             audio->config.in.channel_map);
-    if (remap_table != NULL)
-    {
-        // faac does its own remapping
-        memcpy(cfg->channel_map, remap_table,
-               pv->out_discrete_channels * sizeof(int));
-        free(remap_table);
-    }
+    uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL);
+    hb_audio_remap_build_table(&hb_aac_chan_map, audio->config.in.channel_map,
+                               layout, cfg->channel_map);
+
     switch (audio->config.out.mixdown)
     {
         case HB_AMIXDOWN_7POINT1: