From: Alex Converse <alex.converse@gmail.com>
Date: Tue, 22 May 2012 21:43:28 +0000 (-0700)
Subject: aacdec: Turn PS off when switching to stereo and turn it to implicit when switching... 
X-Git-Tag: v9_beta1~1525
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79c8e29a7e404dbcf670df599fad6894f98ccab2;p=platform%2Fupstream%2Flibav.git

aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono.
---

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index bd5ba00..ddc7eef 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -461,6 +461,7 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
             return NULL;
 
         ac->oc[1].m4ac.chan_config = 2;
+        ac->oc[1].m4ac.ps = 0;
     }
     // And vice-versa
     if (!ac->tags_mapped && type == TYPE_SCE && ac->oc[1].m4ac.chan_config == 2) {
@@ -476,6 +477,8 @@ static ChannelElement *get_che(AACContext *ac, int type, int elem_id)
             return NULL;
 
         ac->oc[1].m4ac.chan_config = 1;
+        if (ac->oc[1].m4ac.sbr)
+            ac->oc[1].m4ac.ps = -1;
     }
     // For indexed channel configurations map the channels solely based on position.
     switch (ac->oc[1].m4ac.chan_config) {