Module: libav Branch: master Commit: 79c8e29a7e404dbcf670df599fad6894f98ccab2
Author: Alex Converse <[email protected]> Committer: Alex Converse <[email protected]> Date: Tue May 22 14:43:28 2012 -0700 aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. --- libavcodec/aacdec.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 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) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
