Added libhb and CLI support for Dolby Pro Logic II 5.0 matrix encoding. *NOT YET ADDED TO THE GUI*. Handbrake now uses a more general "audio mixdown" concept. For each audio track to be converted you specify a mixdown. These are defined in common.h.

This checkin only allows you to specify one mixdown for all tracks in the CLI, although everything is in place internally to specify a different mixdown per track.  In the CLI, the "-6 --surround" option has been repurposed as a "-6 --mixdown" option, with a string parameter of mono/stereo/dpl1/dpl2/6ch.

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

1 files changed, 3 insertions, 11 deletions

diff --git a/libhb/internal.h b/libhb/internal.h
index 577ad3032..bc6f5063c 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -119,6 +119,7 @@ void         hb_dvd_close( hb_dvd_t ** );
 #define HB_CONFIG_MAX_SIZE 8192
 union hb_esconfig_u
 {
+
     struct
     {
         uint8_t bytes[HB_CONFIG_MAX_SIZE];
@@ -137,29 +138,20 @@ union hb_esconfig_u
     {
         uint8_t bytes[HB_CONFIG_MAX_SIZE];
         int     length;
-    	/* Total channels actually used for this audio track */
-    	int channelsused;
-        int lfechannels;
     } aac;
 
     struct
     {
         uint8_t headers[3][HB_CONFIG_MAX_SIZE];
-        int channelsused;
         char *language;
     } vorbis;
     
     struct
     {
-    	/* indicates the number of normal channels the source audio has */
-        int  channels;
-    	/* indicates the number of lfe channels the source audio has */
-    	int  lfechannels;
-    	/* ac3flags:       stores the flags from the AC3 source, as found in scan.c */
+    	/* ac3flags stores the flags from the AC3 source, as found in scan.c */
     	int  ac3flags;
-    	/* Total channels actually used for this audio track */
-    	int channelsused;
     } a52;
+
 };
 
 enum