aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-04-21 16:12:21 +0200
committerJanne Grunau <janne-libav@jannau.net>2014-04-24 18:28:26 +0200
commitcae8df78759c2e69257f7fe58842f34c0d98a7ec (patch)
tree2300334cf8f1c9a3ab854743d16f06b16c91e998
parenta88e1d1c598e641eecd5d43730211d91c82787c6 (diff)
downloadffmpeg-cae8df78759c2e69257f7fe58842f34c0d98a7ec.tar.gz
lavr: define ResampleContext in resample.h
Required for arch optimized resampling.
-rw-r--r--libavresample/resample.c29
-rw-r--r--libavresample/resample.h29
2 files changed, 29 insertions, 29 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c
index 5fd6b90052..d0585ff16d 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 4544dab92f..7e02cb1285 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.
*