[libav-devel] [PATCH 1/8] dcadec: implement request_channel_layout.

Tim Walker tdskywalker at gmail.com
Fri Nov 22 23:49:14 CET 2013


---
 libavcodec/dcadec.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 7af5e5c..d377de8 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1288,7 +1288,8 @@ static int dca_filter_channels(DCAContext *s, int block_index)
     }
 
     /* Down mixing */
-    if (s->avctx->request_channels == 2 && s->prim_channels > 2) {
+    if (s->prim_channels > 2 &&
+        s->avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
         dca_downmix(s->samples_chanptr, s->amode, s->downmix_coef, s->channel_order_tab);
     }
 
@@ -1803,8 +1804,9 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
     if (s->amode < 16) {
         avctx->channel_layout = dca_core_channel_layout[s->amode];
 
-        if (s->xch_present && (!avctx->request_channels ||
-                               avctx->request_channels > num_core_channels + !!s->lfe)) {
+        if (s->xch_present &&
+            (!avctx->request_channel_layout ||
+             avctx->request_channel_layout & AV_CH_BACK_CENTER)) {
             avctx->channel_layout |= AV_CH_BACK_CENTER;
             if (s->lfe) {
                 avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
@@ -1826,7 +1828,8 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
             s->channel_order_tab[channels - 1 - !!s->lfe] < 0)
             return AVERROR_INVALIDDATA;
 
-        if (avctx->request_channels == 2 && s->prim_channels > 2) {
+        if (s->prim_channels > 2 &&
+            avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
             channels = 2;
             s->output = DCA_STEREO;
             avctx->channel_layout = AV_CH_LAYOUT_STEREO;
@@ -1922,9 +1925,26 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo */
-    if (avctx->channels > 2 && avctx->request_channels == 2) {
-        avctx->channels = avctx->request_channels;
+#if FF_API_REQUEST_CHANNELS
+FF_DISABLE_DEPRECATION_WARNINGS
+    switch (avctx->request_channels) {
+    case 2:
+        avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
+        break;
+    case 5:
+        avctx->request_channel_layout = AV_CH_LAYOUT_5POINT0;
+        break;
+    case 6:
+        avctx->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+        break;
+    default:
+        break;
     }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    if (avctx->channels > 2 &&
+        avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
+        avctx->channels = 2;
 
     return 0;
 }
-- 
1.8.3.4 (Apple Git-47)



More information about the libav-devel mailing list