[FFmpeg-cvslog] lavr: define ResampleContext in resample.h
Janne Grunau
git at videolan.org
Fri Apr 25 01:18:31 CEST 2014
ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Mon Apr 21 16:12:21 2014 +0200| [cae8df78759c2e69257f7fe58842f34c0d98a7ec] | committer: Janne Grunau
lavr: define ResampleContext in resample.h
Required for arch optimized resampling.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cae8df78759c2e69257f7fe58842f34c0d98a7ec
---
libavresample/resample.c | 29 -----------------------------
libavresample/resample.h | 29 +++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/libavresample/resample.c b/libavresample/resample.c
index 5fd6b90..d0585ff 100644
--- a/libavresample/resample.c
+++ b/libavresample/resample.c
@@ -26,35 +26,6 @@
#include "resample.h"
#include "audio_data.h"
-struct ResampleContext {
- AVAudioResampleContext *avr;
- AudioData *buffer;
- uint8_t *filter_bank;
- int filter_length;
- int ideal_dst_incr;
- int dst_incr;
- unsigned int index;
- int frac;
- int src_incr;
- int compensation_distance;
- int phase_shift;
- int phase_mask;
- int linear;
- enum AVResampleFilterType filter_type;
- int kaiser_beta;
- void (*set_filter)(void *filter, double *tab, int phase, int tap_count);
- void (*resample_one)(struct ResampleContext *c, void *dst0,
- int dst_index, const void *src0,
- unsigned int index, int frac);
- void (*resample_nearest)(void *dst0, int dst_index,
- const void *src0, unsigned int index);
- int padding_size;
- int initial_padding_filled;
- int initial_padding_samples;
- int final_padding_filled;
- int final_padding_samples;
-};
-
/* double template */
#define CONFIG_RESAMPLE_DBL
diff --git a/libavresample/resample.h b/libavresample/resample.h
index 4544dab..7e02cb1 100644
--- a/libavresample/resample.h
+++ b/libavresample/resample.h
@@ -25,6 +25,35 @@
#include "internal.h"
#include "audio_data.h"
+struct ResampleContext {
+ AVAudioResampleContext *avr;
+ AudioData *buffer;
+ uint8_t *filter_bank;
+ int filter_length;
+ int ideal_dst_incr;
+ int dst_incr;
+ unsigned int index;
+ int frac;
+ int src_incr;
+ int compensation_distance;
+ int phase_shift;
+ int phase_mask;
+ int linear;
+ enum AVResampleFilterType filter_type;
+ int kaiser_beta;
+ void (*set_filter)(void *filter, double *tab, int phase, int tap_count);
+ void (*resample_one)(struct ResampleContext *c, void *dst0,
+ int dst_index, const void *src0,
+ unsigned int index, int frac);
+ void (*resample_nearest)(void *dst0, int dst_index,
+ const void *src0, unsigned int index);
+ int padding_size;
+ int initial_padding_filled;
+ int initial_padding_samples;
+ int final_padding_filled;
+ int final_padding_samples;
+};
+
/**
* Allocate and initialize a ResampleContext.
*
More information about the ffmpeg-cvslog
mailing list