From b24a4449a5ae84fc73e12c47e35d19c06a8bfdf3 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Sun, 7 Oct 2012 21:17:45 -0400 Subject: [PATCH] amrnbdec: set channels, channel_layout, and sample_rate Only mono 8kHz is supported. --- libavcodec/amrnbdec.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index 2cb06a6ead..21966456a0 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -43,6 +43,7 @@ #include #include +#include "libavutil/audioconvert.h" #include "avcodec.h" #include "dsputil.h" #include "libavutil/common.h" @@ -154,7 +155,15 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx) AMRContext *p = avctx->priv_data; int i; - avctx->sample_fmt = AV_SAMPLE_FMT_FLT; + if (avctx->channels > 1) { + av_log_missing_feature(avctx, "multi-channel AMR", 0); + return AVERROR_PATCHWELCOME; + } + + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; + avctx->sample_rate = 8000; + avctx->sample_fmt = AV_SAMPLE_FMT_FLT; // p->excitation always points to the same position in p->excitation_buf p->excitation = &p->excitation_buf[PITCH_DELAY_MAX + LP_FILTER_ORDER + 1];