Showing the changes to include (1 of 4 files). Show all
Unified · Split
| @@ -16,7 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | * License along with this library; if not, write to the Free Software |
| 17 | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 | 18 | * |
| 19 | − * $Id: faac.h,v 1.19 2002/08/07 18:18:49 knik Exp $ | |
| 19 | + * $Id: faac.h,v 1.20 2002/08/09 16:28:13 knik Exp $ | |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | #ifndef FAACLIB_H |
| @@ -81,31 +81,18 @@ typedef struct faacEncConfiguration · 58 unmodified lines | ||
| 81 | 81 | */ |
| 82 | 82 | unsigned int outputFormat; |
| 83 | 83 | |
| 84 | + // psychoacoustic model list | |
| 85 | + const struct { | |
| 86 | + void *ptr; | |
| 87 | + char *name; | |
| 88 | + } *psymodellist; | |
| 89 | + // selected index in psymodellist | |
| 90 | + unsigned int psymodelidx; | |
| 91 | + | |
| 84 | 92 | } faacEncConfiguration, *faacEncConfigurationPtr; |
| 85 | 93 | |
| 86 | 94 | typedef void *faacEncHandle; |
| 87 | 95 | |
| 88 | −typedef struct { | |
| 89 | − void (*PsyInit) (void *gpsyInfo, void *psyInfo, | |
| 90 | − unsigned int numChannels, unsigned int sampleRate, | |
| 91 | − int *cb_width_long, int num_cb_long, | |
| 92 | − int *cb_width_short, int num_cb_short); | |
| 93 | − void (*PsyEnd) (void *gpsyInfo, void *psyInfo, | |
| 94 | − unsigned int numChannels); | |
| 95 | − void (*PsyCalculate) (void *channelInfo, void *gpsyInfo, | |
| 96 | − void *psyInfo, int *cb_width_long, int num_cb_long, | |
| 97 | − int *cb_width_short, int num_cb_short, | |
| 98 | − unsigned int numChannels); | |
| 99 | − void (*PsyBufferUpdate) (void *gpsyInfo, void *psyInfo, | |
| 100 | − double *newSamples, unsigned int bandwidth); | |
| 101 | − void (*BlockSwitch) (void *coderInfo, void *psyInfo, | |
| 102 | − unsigned int numChannels); | |
| 103 | −} psymodel_t; | |
| 104 | − | |
| 105 | −extern psymodel_t *psymodel; | |
| 106 | −extern psymodel_t psymodel1; | |
| 107 | −extern psymodel_t psymodel2; | |
| 108 | − | |
| 109 | 96 | faacEncConfigurationPtr FAACAPI faacEncGetCurrentConfiguration(faacEncHandle hEncoder); |
| 110 | 97 | int FAACAPI faacEncSetConfiguration (faacEncHandle hEncoder, faacEncConfigurationPtr config); |
| 111 | 98 | |