mirror of
https://github.com/cookiengineer/audacity
synced 2026-04-26 07:53:42 +02:00
Update libvorbis to 1.3.3.
This commit is contained in:
@@ -5,13 +5,13 @@
|
||||
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
|
||||
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
||||
* *
|
||||
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 *
|
||||
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: random psychoacoustics (not including preecho)
|
||||
last mod: $Id: psy.h,v 1.7 2008-02-02 15:53:53 richardash1981 Exp $
|
||||
last mod: $Id: psy.h 16946 2010-03-03 16:12:40Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
@@ -57,8 +57,7 @@ typedef struct vorbis_info_psy{
|
||||
|
||||
float max_curve_dB;
|
||||
|
||||
int normal_channel_p;
|
||||
int normal_point_p;
|
||||
int normal_p;
|
||||
int normal_start;
|
||||
int normal_partition;
|
||||
double normal_thresh;
|
||||
@@ -76,11 +75,11 @@ typedef struct{
|
||||
float ampmax_att_per_sec;
|
||||
|
||||
/* channel coupling config */
|
||||
int coupling_pkHz[PACKETBLOBS];
|
||||
int coupling_pointlimit[2][PACKETBLOBS];
|
||||
int coupling_prepointamp[PACKETBLOBS];
|
||||
int coupling_postpointamp[PACKETBLOBS];
|
||||
int sliding_lowpass[2][PACKETBLOBS];
|
||||
int coupling_pkHz[PACKETBLOBS];
|
||||
int coupling_pointlimit[2][PACKETBLOBS];
|
||||
int coupling_prepointamp[PACKETBLOBS];
|
||||
int coupling_postpointamp[PACKETBLOBS];
|
||||
int sliding_lowpass[2][PACKETBLOBS];
|
||||
|
||||
} vorbis_info_psy_global;
|
||||
|
||||
@@ -89,7 +88,7 @@ typedef struct {
|
||||
int channels;
|
||||
|
||||
vorbis_info_psy_global *gi;
|
||||
int coupling_pointlimit[2][P_NOISECURVES];
|
||||
int coupling_pointlimit[2][P_NOISECURVES];
|
||||
} vorbis_look_psy_global;
|
||||
|
||||
|
||||
@@ -107,7 +106,7 @@ typedef struct {
|
||||
long firstoc;
|
||||
long shiftoc;
|
||||
int eighth_octave_lines; /* power of two, please */
|
||||
int total_octave_lines;
|
||||
int total_octave_lines;
|
||||
long rate; /* cache it */
|
||||
|
||||
float m_val; /* Masking compensation value */
|
||||
@@ -115,72 +114,41 @@ typedef struct {
|
||||
} vorbis_look_psy;
|
||||
|
||||
extern void _vp_psy_init(vorbis_look_psy *p,vorbis_info_psy *vi,
|
||||
vorbis_info_psy_global *gi,int n,long rate);
|
||||
vorbis_info_psy_global *gi,int n,long rate);
|
||||
extern void _vp_psy_clear(vorbis_look_psy *p);
|
||||
extern void *_vi_psy_dup(void *source);
|
||||
|
||||
extern void _vi_psy_free(vorbis_info_psy *i);
|
||||
extern vorbis_info_psy *_vi_psy_copy(vorbis_info_psy *i);
|
||||
|
||||
extern void _vp_remove_floor(vorbis_look_psy *p,
|
||||
float *mdct,
|
||||
int *icodedflr,
|
||||
float *residue,
|
||||
int sliding_lowpass);
|
||||
|
||||
extern void _vp_noisemask(vorbis_look_psy *p,
|
||||
float *logmdct,
|
||||
float *logmask);
|
||||
float *logmdct,
|
||||
float *logmask);
|
||||
|
||||
extern void _vp_tonemask(vorbis_look_psy *p,
|
||||
float *logfft,
|
||||
float *logmask,
|
||||
float global_specmax,
|
||||
float local_specmax);
|
||||
float *logfft,
|
||||
float *logmask,
|
||||
float global_specmax,
|
||||
float local_specmax);
|
||||
|
||||
extern void _vp_offset_and_mix(vorbis_look_psy *p,
|
||||
float *noise,
|
||||
float *tone,
|
||||
int offset_select,
|
||||
float *logmask,
|
||||
float *mdct,
|
||||
float *logmdct);
|
||||
float *noise,
|
||||
float *tone,
|
||||
int offset_select,
|
||||
float *logmask,
|
||||
float *mdct,
|
||||
float *logmdct);
|
||||
|
||||
extern float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd);
|
||||
|
||||
extern float **_vp_quantize_couple_memo(vorbis_block *vb,
|
||||
vorbis_info_psy_global *g,
|
||||
vorbis_look_psy *p,
|
||||
vorbis_info_mapping0 *vi,
|
||||
float **mdct);
|
||||
|
||||
extern void _vp_couple(int blobno,
|
||||
vorbis_info_psy_global *g,
|
||||
vorbis_look_psy *p,
|
||||
vorbis_info_mapping0 *vi,
|
||||
float **res,
|
||||
float **mag_memo,
|
||||
int **mag_sort,
|
||||
int **ifloor,
|
||||
int *nonzero,
|
||||
int sliding_lowpass);
|
||||
|
||||
extern void _vp_noise_normalize(vorbis_look_psy *p,
|
||||
float *in,float *out,int *sortedindex);
|
||||
|
||||
extern void _vp_noise_normalize_sort(vorbis_look_psy *p,
|
||||
float *magnitudes,int *sortedindex);
|
||||
|
||||
extern int **_vp_quantize_couple_sort(vorbis_block *vb,
|
||||
vorbis_look_psy *p,
|
||||
vorbis_info_mapping0 *vi,
|
||||
float **mags);
|
||||
|
||||
extern void hf_reduction(vorbis_info_psy_global *g,
|
||||
vorbis_look_psy *p,
|
||||
vorbis_info_mapping0 *vi,
|
||||
float **mdct);
|
||||
|
||||
extern void _vp_couple_quantize_normalize(int blobno,
|
||||
vorbis_info_psy_global *g,
|
||||
vorbis_look_psy *p,
|
||||
vorbis_info_mapping0 *vi,
|
||||
float **mdct,
|
||||
int **iwork,
|
||||
int *nonzero,
|
||||
int sliding_lowpass,
|
||||
int ch);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user