decdca: attempt to fix Dolby Surround and Pro Logic II mixdown. We were doing it wrong in some cases.

This means Dolby Pro Logic II is now only available for sources with at least L, R, C, Ls, Rs channels (as well as any additional channels), due to some libdca limitations. This will eventually go away when we use our own downmixing for all sources.

Further cleanup to follow.

Also cleans up usage of audio->config.in.flags (was audio->config.flags.*).



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

1 files changed, 1 insertions, 6 deletions

diff --git a/libhb/deca52.c b/libhb/deca52.c
index 09eb88101..f0befdd01 100644
--- a/libhb/deca52.c
+++ b/libhb/deca52.c
@@ -418,11 +418,6 @@ static int deca52BSInfo( hb_work_object_t *w, const hb_buffer_t *b,
     info->mode = raw & 0x7;      /* bsmod is the following 3 bits */
     info->samples_per_frame = 1536;
 
-    if ( (flags & A52_CHANNEL_MASK) == A52_DOLBY )
-    {
-        info->flags |= AUDIO_F_DOLBY;
-    }
-
     switch( flags & A52_CHANNEL_MASK )
     {
         /* mono sources */
@@ -436,7 +431,7 @@ static int deca52BSInfo( hb_work_object_t *w, const hb_buffer_t *b,
         case A52_STEREO:
             info->channel_layout = HB_INPUT_CH_LAYOUT_STEREO;
             break;
-        /* dolby (DPL1 aka Dolby Surround = 4.0 matrix-encoded) input */
+        /* Dolby Pro Logic (a.k.a. Dolby Surround), 4.0 channels (matrix-encoded) */
         case A52_DOLBY:
             info->channel_layout = HB_INPUT_CH_LAYOUT_DOLBY;
             break;