changeset 2308:de38526a1f3f libavcodec

user selectble cutoff frequency
author michael
date Thu, 21 Oct 2004 21:07:40 +0000
parents df3e4a8e6aac
children 550ae8914fd3
files avcodec.h resample.c resample2.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/avcodec.h	Thu Oct 21 20:01:32 2004 +0000
+++ b/avcodec.h	Thu Oct 21 21:07:40 2004 +0000
@@ -17,7 +17,7 @@
 
 #define FFMPEG_VERSION_INT     0x000409
 #define FFMPEG_VERSION         "0.4.9-pre1"
-#define LIBAVCODEC_BUILD       4726
+#define LIBAVCODEC_BUILD       4727
 
 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
 #define LIBAVCODEC_VERSION     FFMPEG_VERSION
@@ -1942,7 +1942,7 @@
 int audio_resample(ReSampleContext *s, short *output, short *input, int nb_samples);
 void audio_resample_close(ReSampleContext *s);
 
-struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear);
+struct AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_length, int log2_phase_count, int linear, double cutoff);
 int av_resample(struct AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx);
 void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int compensation_distance);
 void av_resample_close(struct AVResampleContext *c);
--- a/resample.c	Thu Oct 21 20:01:32 2004 +0000
+++ b/resample.c	Thu Oct 21 21:07:40 2004 +0000
@@ -160,7 +160,7 @@
     if(s->filter_channels>2)
       s->filter_channels = 2;
 
-    s->resample_context= av_resample_init(output_rate, input_rate, 16, 10, 0);
+    s->resample_context= av_resample_init(output_rate, input_rate, 16, 10, 0, 1.0);
     
     return s;
 }
--- a/resample2.c	Thu Oct 21 20:01:32 2004 +0000
+++ b/resample2.c	Thu Oct 21 21:07:40 2004 +0000
@@ -130,9 +130,9 @@
  * initalizes a audio resampler.
  * note, if either rate is not a integer then simply scale both rates up so they are
  */
-AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear){
+AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
     AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));
-    double factor= FFMIN(out_rate / (double)in_rate, 1.0);
+    double factor= FFMIN(out_rate * cutoff / in_rate, 1.0);
     int phase_count= 1<<phase_shift;
     
     memset(c, 0, sizeof(AVResampleContext));