RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

audio: untypedef af_stream

This commit is contained in:
Stefano Pigozzi 2012-11-01 13:33:38 +01:00
parent 30f3b537b2
commit 593e433cc8
4 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libaf/af.c
View File

@ -101,7 +101,7 @@ static struct af_info* af_find(char*name)
/* Find filter in the dynamic filter list using it's name This /* Find filter in the dynamic filter list using it's name This
function is used for finding already initialized filters */ function is used for finding already initialized filters */
struct af_instance* af_get(af_stream_t* s, char* name) struct af_instance* af_get(struct af_stream* s, char* name)
{ {
struct af_instance* af=s->first; struct af_instance* af=s->first;
// Find the filter // Find the filter
@ -115,7 +115,7 @@ struct af_instance* af_get(af_stream_t* s, char* name)
/*/ Function for creating a new filter of type name. The name may /*/ Function for creating a new filter of type name. The name may
contain the commandline parameters for the filter */ contain the commandline parameters for the filter */
static struct af_instance* af_create(af_stream_t* s, const char* name_with_cmd) static struct af_instance* af_create(struct af_stream* s, const char* name_with_cmd)
{ {
char* name = strdup(name_with_cmd); char* name = strdup(name_with_cmd);
char* cmdline = name; char* cmdline = name;
@ -169,7 +169,7 @@ err_out:
/* Create and insert a new filter of type name before the filter in the /* Create and insert a new filter of type name before the filter in the
argument. This function can be called during runtime, the return argument. This function can be called during runtime, the return
value is the new filter */ value is the new filter */
static struct af_instance* af_prepend(af_stream_t* s, struct af_instance* af, const char* name) static struct af_instance* af_prepend(struct af_stream* s, struct af_instance* af, const char* name)
{ {
// Create the new filter and make sure it is OK // Create the new filter and make sure it is OK
struct af_instance* new=af_create(s,name); struct af_instance* new=af_create(s,name);
@ -193,7 +193,7 @@ static struct af_instance* af_prepend(af_stream_t* s, struct af_instance* af, co
/* Create and insert a new filter of type name after the filter in the /* Create and insert a new filter of type name after the filter in the
argument. This function can be called during runtime, the return argument. This function can be called during runtime, the return
value is the new filter */ value is the new filter */
static struct af_instance* af_append(af_stream_t* s, struct af_instance* af, const char* name) static struct af_instance* af_append(struct af_stream* s, struct af_instance* af, const char* name)
{ {
// Create the new filter and make sure it is OK // Create the new filter and make sure it is OK
struct af_instance* new=af_create(s,name); struct af_instance* new=af_create(s,name);
@ -215,7 +215,7 @@ static struct af_instance* af_append(af_stream_t* s, struct af_instance* af, con
} }
// Uninit and remove the filter "af" // Uninit and remove the filter "af"
void af_remove(af_stream_t* s, struct af_instance* af) void af_remove(struct af_stream* s, struct af_instance* af)
{ {
if(!af) return; if(!af) return;
@ -250,7 +250,7 @@ static void print_fmt(struct mp_audio *d)
} }
} }
static void af_print_filter_chain(af_stream_t* s) static void af_print_filter_chain(struct af_stream* s)
{ {
mp_msg(MSGT_AFILTER, MSGL_V, "Audio filter chain:\n"); mp_msg(MSGT_AFILTER, MSGL_V, "Audio filter chain:\n");
@ -277,7 +277,7 @@ static void af_print_filter_chain(af_stream_t* s)
// state (for example, format filters that were tentatively inserted stay // state (for example, format filters that were tentatively inserted stay
// inserted). // inserted).
// In that case, you should always rebuild the filter chain, or abort. // In that case, you should always rebuild the filter chain, or abort.
int af_reinit(af_stream_t* s, struct af_instance* af) int af_reinit(struct af_stream* s, struct af_instance* af)
{ {
do{ do{
struct mp_audio in; // Format of the input to current filter struct mp_audio in; // Format of the input to current filter
@ -381,7 +381,7 @@ int af_reinit(af_stream_t* s, struct af_instance* af)
} }
// Uninit and remove all filters // Uninit and remove all filters
void af_uninit(af_stream_t* s) void af_uninit(struct af_stream* s)
{ {
while(s->first) while(s->first)
af_remove(s,s->first); af_remove(s,s->first);
@ -391,7 +391,7 @@ void af_uninit(af_stream_t* s)
* Extend the filter chain so we get the required output format at the end. * Extend the filter chain so we get the required output format at the end.
* \return AF_ERROR on error, AF_OK if successful. * \return AF_ERROR on error, AF_OK if successful.
*/ */
static int fixup_output_format(af_stream_t* s) static int fixup_output_format(struct af_stream* s)
{ {
struct af_instance* af = NULL; struct af_instance* af = NULL;
// Check number of output channels fix if not OK // Check number of output channels fix if not OK
@ -442,7 +442,7 @@ static int fixup_output_format(af_stream_t* s)
/** /**
* Automatic downmix to stereo in case the codec does not implement it. * Automatic downmix to stereo in case the codec does not implement it.
*/ */
static void af_downmix(af_stream_t* s) static void af_downmix(struct af_stream* s)
{ {
static const char * const downmix_strs[AF_NCH + 1] = { static const char * const downmix_strs[AF_NCH + 1] = {
/* FL FR RL RR FC LF AL AR */ /* FL FR RL RR FC LF AL AR */
@ -468,7 +468,7 @@ static void af_downmix(af_stream_t* s)
If one of the prefered output parameters is 0 the one that needs If one of the prefered output parameters is 0 the one that needs
no conversion is used (i.e. the output format in the last filter). no conversion is used (i.e. the output format in the last filter).
The return value is 0 if success and -1 if failure */ The return value is 0 if success and -1 if failure */
int af_init(af_stream_t* s) int af_init(struct af_stream* s)
{ {
struct MPOpts *opts = s->opts; struct MPOpts *opts = s->opts;
int i=0; int i=0;
@ -570,7 +570,7 @@ int af_init(af_stream_t* s)
to the stream s. The filter will be inserted somewhere nice in the to the stream s. The filter will be inserted somewhere nice in the
list of filters. The return value is a pointer to the new filter, list of filters. The return value is a pointer to the new filter,
If the filter couldn't be added the return value is NULL. */ If the filter couldn't be added the return value is NULL. */
struct af_instance* af_add(af_stream_t* s, char* name){ struct af_instance* af_add(struct af_stream* s, char* name){
struct af_instance* new; struct af_instance* new;
// Sanity check // Sanity check
if(!s || !s->first || !name) if(!s || !s->first || !name)
@ -595,7 +595,7 @@ struct af_instance* af_add(af_stream_t* s, char* name){
} }
// Filter data chunk through the filters in the list // Filter data chunk through the filters in the list
struct mp_audio* af_play(af_stream_t* s, struct mp_audio* data) struct mp_audio* af_play(struct af_stream* s, struct mp_audio* data)
{ {
struct af_instance* af=s->first; struct af_instance* af=s->first;
// Iterate through all filters // Iterate through all filters
@ -618,7 +618,7 @@ int af_lencalc(double mul, struct mp_audio* d)
} }
// Calculate average ratio of filter output size to input size // Calculate average ratio of filter output size to input size
double af_calc_filter_multiplier(af_stream_t* s) double af_calc_filter_multiplier(struct af_stream* s)
{ {
struct af_instance* af=s->first; struct af_instance* af=s->first;
double mul = 1; double mul = 1;
@ -632,7 +632,7 @@ double af_calc_filter_multiplier(af_stream_t* s)
} }
/* Calculate the total delay [bytes output] caused by the filters */ /* Calculate the total delay [bytes output] caused by the filters */
double af_calc_delay(af_stream_t* s) double af_calc_delay(struct af_stream* s)
{ {
struct af_instance* af=s->first; struct af_instance* af=s->first;
register double delay = 0.0; register double delay = 0.0;
@ -666,7 +666,7 @@ int af_resize_local_buffer(struct af_instance* af, struct mp_audio* data)
} }
// documentation in af.h // documentation in af.h
struct af_instance *af_control_any_rev (af_stream_t* s, int cmd, void* arg) { struct af_instance *af_control_any_rev (struct af_stream* s, int cmd, void* arg) {
int res = AF_UNKNOWN; int res = AF_UNKNOWN;
struct af_instance* filt = s->last; struct af_instance* filt = s->last;
while (filt) { while (filt) {

25
libaf/af.h
View File

@ -104,8 +104,7 @@ struct af_cfg {
}; };
// Current audio stream // Current audio stream
typedef struct af_stream struct af_stream {
{
// The first and last filter in the list // The first and last filter in the list
struct af_instance* first; struct af_instance* first;
struct af_instance* last; struct af_instance* last;
@ -115,7 +114,7 @@ typedef struct af_stream
// Configuration for this stream // Configuration for this stream
struct af_cfg cfg; struct af_cfg cfg;
struct MPOpts *opts; struct MPOpts *opts;
}af_stream_t; };
/********************************************* /*********************************************
// Return values // Return values
@ -154,19 +153,19 @@ typedef struct af_stream
* The function is reentrant i.e. if called with an already initialized * The function is reentrant i.e. if called with an already initialized
* stream the stream will be reinitialized. * stream the stream will be reinitialized.
*/ */
int af_init(af_stream_t* s); int af_init(struct af_stream* s);
/** /**
* \brief Uninit and remove all filters from audio filter chain * \brief Uninit and remove all filters from audio filter chain
*/ */
void af_uninit(af_stream_t* s); void af_uninit(struct af_stream* s);
/** /**
* \brief Reinit the filter list from the given filter on downwards * \brief Reinit the filter list from the given filter on downwards
* \param Filter instance to begin the reinit from * \param Filter instance to begin the reinit from
* \return AF_OK on success or AF_ERROR on failure * \return AF_OK on success or AF_ERROR on failure
*/ */
int af_reinit(af_stream_t* s, struct af_instance* af); int af_reinit(struct af_stream* s, struct af_instance* af);
/** /**
* \brief This function adds the filter "name" to the stream s. * \brief This function adds the filter "name" to the stream s.
@ -177,13 +176,13 @@ int af_reinit(af_stream_t* s, struct af_instance* af);
* list of filters (i.e. at the beginning unless the * list of filters (i.e. at the beginning unless the
* first filter is the format filter (why??). * first filter is the format filter (why??).
*/ */
struct af_instance* af_add(af_stream_t* s, char* name); struct af_instance* af_add(struct af_stream* s, char* name);
/** /**
* \brief Uninit and remove the filter "af" * \brief Uninit and remove the filter "af"
* \param af filter to remove * \param af filter to remove
*/ */
void af_remove(af_stream_t* s, struct af_instance* af); void af_remove(struct af_stream* s, struct af_instance* af);
/** /**
* \brief find filter in chain by name * \brief find filter in chain by name
@ -192,7 +191,7 @@ void af_remove(af_stream_t* s, struct af_instance* af);
* *
* This function is used for finding already initialized filters * This function is used for finding already initialized filters
*/ */
struct af_instance* af_get(af_stream_t* s, char* name); struct af_instance* af_get(struct af_stream* s, char* name);
/** /**
* \brief filter data chunk through the filters in the list * \brief filter data chunk through the filters in the list
@ -200,7 +199,7 @@ struct af_instance* af_get(af_stream_t* s, char* name);
* \return resulting data * \return resulting data
* \ingroup af_chain * \ingroup af_chain
*/ */
struct mp_audio* af_play(af_stream_t* s, struct mp_audio* data); struct mp_audio* af_play(struct af_stream* s, struct mp_audio* data);
/** /**
* \brief send control to all filters, starting with the last until * \brief send control to all filters, starting with the last until
@ -209,19 +208,19 @@ struct mp_audio* af_play(af_stream_t* s, struct mp_audio* data);
* \param arg argument for filter command * \param arg argument for filter command
* \return the accepting filter or NULL if none was found * \return the accepting filter or NULL if none was found
*/ */
struct af_instance *af_control_any_rev (af_stream_t* s, int cmd, void* arg); struct af_instance *af_control_any_rev (struct af_stream* s, int cmd, void* arg);
/** /**
* \brief calculate average ratio of filter output lenth to input length * \brief calculate average ratio of filter output lenth to input length
* \return the ratio * \return the ratio
*/ */
double af_calc_filter_multiplier(af_stream_t* s); double af_calc_filter_multiplier(struct af_stream* s);
/** /**
* \brief Calculate the total delay caused by the filters * \brief Calculate the total delay caused by the filters
* \return delay in bytes of "missing" output * \return delay in bytes of "missing" output
*/ */
double af_calc_delay(af_stream_t* s); double af_calc_delay(struct af_stream* s);
/** \} */ // end of af_chain group /** \} */ // end of af_chain group

2
libmpcodecs/dec_audio.c
View File

@ -273,7 +273,7 @@ void uninit_audio(sh_audio_t *sh_audio)
int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
int *out_samplerate, int *out_channels, int *out_format) int *out_samplerate, int *out_channels, int *out_format)
{ {
af_stream_t *afs = sh_audio->afilter; struct af_stream *afs = sh_audio->afilter;
if (!afs) { if (!afs) {
afs = calloc(1, sizeof(struct af_stream)); afs = calloc(1, sizeof(struct af_stream));
afs->opts = sh_audio->opts; afs->opts = sh_audio->opts;

2
mixer.h
View File

@ -32,7 +32,7 @@ enum {
typedef struct mixer { typedef struct mixer {
struct ao *ao; struct ao *ao;
af_stream_t *afilter; struct af_stream *afilter;
int volstep; int volstep;
int softvol; int softvol;
float softvol_max; float softvol_max;