[libav-devel] [PATCH 6/7] ac3: implement request_channel_layout.

Tim Walker tdskywalker at gmail.com
Sun Nov 17 00:14:29 CET 2013


---
 libavcodec/aac_ac3_parser.c | 14 +++++++++++---
 libavcodec/ac3dec.c         | 27 ++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 00d95ad..1f73fed 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "parser.h"
 #include "aac_ac3_parser.h"
@@ -83,9 +84,16 @@ get_next:
         avctx->sample_rate = s->sample_rate;
 
         /* (E-)AC-3: allow downmixing to stereo or mono */
-        if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-            avctx->request_channels < s->channels) {
-            avctx->channels = avctx->request_channels;
+        if (s->channels > 1 &&
+            (avctx->request_channels == 1 ||
+             avctx->request_channel_layout == AV_CH_LAYOUT_MONO)) {
+            avctx->channels       = 1;
+            avctx->channel_layout = AV_CH_LAYOUT_MONO;
+        } else if (s->channels > 2 &&
+                   (avctx->request_channels == 2 ||
+                    avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)) {
+            avctx->channels       = 2;
+            avctx->channel_layout = AV_CH_LAYOUT_STEREO;
         } else {
             avctx->channels = s->channels;
             avctx->channel_layout = s->channel_layout;
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index d459727..15dd022 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <string.h>
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/opt.h"
 #include "internal.h"
@@ -178,9 +179,14 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo or mono */
-    if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-        avctx->request_channels < avctx->channels) {
-        avctx->channels = avctx->request_channels;
+    if (avctx->channels > 1 &&
+        (avctx->request_channels == 1 ||
+         avctx->request_channel_layout == AV_CH_LAYOUT_MONO)) {
+        avctx->channels = 1;
+    } else if (avctx->channels > 2 &&
+               (avctx->request_channels == 2 ||
+                avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)) {
+        avctx->channels = 2;
     }
     s->downmixed = 1;
 
@@ -1348,10 +1354,17 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
         s->output_mode  = s->channel_mode;
         if (s->lfe_on)
             s->output_mode |= AC3_OUTPUT_LFEON;
-        if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-            avctx->request_channels < s->channels) {
-            s->out_channels = avctx->request_channels;
-            s->output_mode  = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
+        if (s->channels > 1 &&
+            (avctx->request_channels == 1 ||
+             avctx->request_channel_layout == AV_CH_LAYOUT_MONO)) {
+            s->out_channels   = 1;
+            s->output_mode    = AC3_CHMODE_MONO;
+            s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode];
+        } else if (s->channels > 2 &&
+                   (avctx->request_channels == 2 ||
+                    avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)) {
+            s->out_channels   = 2;
+            s->output_mode    = AC3_CHMODE_STEREO;
             s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode];
         }
         avctx->channels       = s->out_channels;
-- 
1.8.3.4 (Apple Git-47)



More information about the libav-devel mailing list