Parameter added for user to set the cutoff frequency when encoding with faac.

Patch by Luca Abeni - lucabe72 at email dot it.

Originally committed as revision 4837 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 033cec225fa85bc51120b3326a05b556e7b2bd98..a7e504fda4cb3b0ddcad757fbe7b84b7ae2134ba 100644 (file)
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1982,6 +1982,13 @@ typedef struct AVCodecContext {
      * - decoding: unused
      */
     int directpred;
+    
+    /**
+     * audio cutoff bandwidth (0 means "automatic") . Currently used only by FAAC
+     * - encoding: set by user.
+     * - decoding: unused
+     */
+    int cutoff;
 } AVCodecContext;
 
 /**

diff --git a/libavcodec/faac.c b/libavcodec/faac.c
index 99331df1d72812718481c5bbdb66f23273531066..d275f3c71e4f82b108041a0f50de3f0a2516f513 100644 (file)
--- a/libavcodec/faac.c
+++ b/libavcodec/faac.c
@@ -57,6 +57,7 @@ static int Faac_encode_init(AVCodecContext *avctx)
     faac_cfg->useTns = 0;
     faac_cfg->allowMidside = 1;
     faac_cfg->bitRate = avctx->bit_rate / avctx->channels;
+    faac_cfg->bandWidth = avctx->cutoff;
     if(avctx->flags & CODEC_FLAG_QSCALE) {
         faac_cfg->bitRate = 0;
         faac_cfg->quantqual = avctx->global_quality / FF_QP2LAMBDA;

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ede6cc761c20037df0256dc71bad2f695d712e89..da74865eb8ea78de0ea63d883049e080cb716dbf 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -494,6 +494,7 @@ static AVOption options[]={
 {"rate_emu", NULL, OFFSET(rate_emu), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"sample_rate", NULL, OFFSET(sample_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"channels", NULL, OFFSET(channels), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
+{"cutoff", "set cutoff bandwidth", OFFSET(cutoff), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E},
 {"frame_size", NULL, OFFSET(frame_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"frame_number", NULL, OFFSET(frame_number), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
 {"real_pict_num", NULL, OFFSET(real_pict_num), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},