[vlc-devel] commit: faad: NeAACDecFrameInfo.sbr is not a boolean ( Rafaël Carré )

[git version control]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov  2 20:30:12 2009 +0100| [bb769a429e23da26a8a673055f55c684a02dbb11] | committer: Rafaël Carré 

faad: NeAACDecFrameInfo.sbr is not a boolean

from the header:
SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bb769a429e23da26a8a673055f55c684a02dbb11
---

 modules/codec/faad.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index f53265c..c09919f 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -373,10 +373,11 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             = pi_channels_guessed[frame.channels];
 
         /* Adjust stream info when dealing with SBR/PS */
-        if( p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps )
+        bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2);
+        if( p_sys->b_sbr != b_sbr || p_sys->b_ps != frame.ps )
         {
-            const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" :
-                                    frame.sbr ? "SBR" : "PS";
+            const char *psz_ext = (b_sbr && frame.ps) ? "SBR+PS" :
+                                    b_sbr ? "SBR" : "PS";
 
             msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)",
                     psz_ext, frame.channels, frame.samplerate );
@@ -386,7 +387,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
             if( p_dec->p_description )
                 vlc_meta_AddExtra( p_dec->p_description, _("AAC extension"), psz_ext );
 
-            p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps;
+            p_sys->b_sbr = b_sbr;
+            p_sys->b_ps = frame.ps;
         }
 
         /* Convert frame.channel_position to our own channel values */