[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec avcodec.h, 1.441, 1.442 faac.c, 1.5, 1.6 utils.c, 1.169, 1.170

[Benjamin Larsson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv16752/libavcodec

Modified Files:
	avcodec.h faac.c utils.c 
Log Message:
Parameter added for user to set the cutoff frequency when encoding with faac.
Patch by Luca Abeni - lucabe72 at email dot it.


Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -d -r1.441 -r1.442
--- avcodec.h	9 Jan 2006 15:41:39 -0000	1.441
+++ avcodec.h	10 Jan 2006 20:07:29 -0000	1.442
@@ -1982,6 +1982,13 @@
      * - decoding: unused
      */
     int directpred;
+    
+    /**
+     * audio cutoff bandwidth (0 means "automatic") . Currently used only by FAAC
+     * - encoding: set by user.
+     * - decoding: unused
+     */
+    int cutoff;
 } AVCodecContext;
 
 /**

Index: faac.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/faac.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- faac.c	22 Dec 2005 01:10:07 -0000	1.5
+++ faac.c	10 Jan 2006 20:07:29 -0000	1.6
@@ -57,6 +57,7 @@
     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;

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- utils.c	29 Dec 2005 07:24:23 -0000	1.169
+++ utils.c	10 Jan 2006 20:07:29 -0000	1.170
@@ -494,6 +494,7 @@
 {"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},