RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec' 

* commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec':
  lavr: define ResampleContext in resample.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-25 01:03:28 +02:00
parent 06e664366a cae8df7875
commit 26953ed2e3
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavresample/resample.c
View File

@ -26,35 +26,6 @@
#include "resample.h" #include "resample.h"
#include "audio_data.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 */ /* double template */
#define CONFIG_RESAMPLE_DBL #define CONFIG_RESAMPLE_DBL

29
libavresample/resample.h
View File

@ -25,6 +25,35 @@
#include "internal.h" #include "internal.h"
#include "audio_data.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. * Allocate and initialize a ResampleContext.
* *