[FFmpeg-cvslog] amrwbdec: set channels, channel_layout, and sample_rate

Justin Ruggles git at videolan.org
Fri Nov 2 13:49:11 CET 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Sun Oct  7 21:19:28 2012 -0400| [ee0e9678e761e8a41cfffcb163de42967e5a1758] | committer: Justin Ruggles

amrwbdec: set channels, channel_layout, and sample_rate

Only mono 16kHz is supported.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee0e9678e761e8a41cfffcb163de42967e5a1758
---

 libavcodec/amrwbdec.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index c9c793f..9b0fe25 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -24,6 +24,7 @@
  * AMR wideband decoder
  */
 
+#include "libavutil/audioconvert.h"
 #include "libavutil/common.h"
 #include "libavutil/lfg.h"
 
@@ -90,7 +91,15 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx)
     AMRWBContext *ctx = 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    = 16000;
+    avctx->sample_fmt     = AV_SAMPLE_FMT_FLT;
 
     av_lfg_init(&ctx->prng, 1);
 



More information about the ffmpeg-cvslog mailing list