pool/libvorbis
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=6

Browse Source
This commit is contained in:
OBS User unknown 2007-08-03 15:13:47 +00:00 committed by Git OBS Bridge
parent 42e4021ec9
commit 2768b75a9e
8 changed files with 208 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
libvorbis-1.1.2-warning-fixes.diff
View File

@ -1,158 +0,0 @@
--- lib/mapping0.c-dist 2007-04-23 18:01:34.000000000 +0200
+++ lib/mapping0.c 2007-04-23 18:01:44.000000000 +0200
@@ -623,8 +623,8 @@ static int mapping0_forward(vorbis_block
float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
- float **mag_memo;
- int **mag_sort;
+ float **mag_memo = NULL;
+ int **mag_sort = NULL;
if(info->coupling_steps){
mag_memo=_vp_quantize_couple_memo(vb,
@@ -783,7 +783,7 @@ static int mapping0_inverse(vorbis_block
codec_setup_info *ci=vi->codec_setup;
private_state *b=vd->backend_state;
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
- int hs=ci->halfrate_flag;
+ /*int hs=ci->halfrate_flag; */
int i,j;
long n=vb->pcmend=ci->blocksizes[vb->W];
--- lib/scales.h-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/scales.h 2007-04-23 18:01:44.000000000 +0200
@@ -25,7 +25,7 @@
#define VORBIS_IEEE_FLOAT32 1
#ifdef VORBIS_IEEE_FLOAT32
-static float unitnorm(float x){
+static inline float unitnorm(float x){
union {
ogg_uint32_t i;
float f;
@@ -36,7 +36,7 @@ static float unitnorm(float x){
}
/* Segher was off (too high) by ~ .3 decibel. Center the conversion correctly. */
-static float todB(const float *x){
+static inline float todB(const float *x){
union {
ogg_uint32_t i;
float f;
@@ -50,7 +50,7 @@ static float todB(const float *x){
#else
-static float unitnorm(float x){
+static inline float unitnorm(float x){
if(x<0)return(-1.f);
return(1.f);
}
--- lib/psy.c-dist 2007-04-23 18:01:34.000000000 +0200
+++ lib/psy.c 2007-04-23 18:01:44.000000000 +0200
@@ -623,7 +623,7 @@ static void bark_noise_hybridmp(int n,co
int i;
int lo, hi;
- float R, A, B, D;
+ float R, A = 0, B = 0, D = 0;
float w, x, y;
tN = tX = tXX = tY = tXY = 0.f;
--- lib/res0.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/res0.c 2007-04-23 18:01:44.000000000 +0200
@@ -370,7 +370,7 @@ static long **_01class(vorbis_block *vb,
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
vorbis_info *vi=vb->vd->vi;
- codec_setup_info *ci=vi->codec_setup;
+ /*codec_setup_info *ci=vi->codec_setup;*/
/* move all this setup out later */
int samples_per_partition=info->grouping;
@@ -498,7 +498,7 @@ static int _01forward(oggpack_buffer *op
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
- vorbis_dsp_state *vd=vb->vd;
+ /*vorbis_dsp_state *vd=vb->vd;*/
/* move all this setup out later */
int samples_per_partition=info->grouping;
--- lib/vorbisfile.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/vorbisfile.c 2007-04-23 18:01:44.000000000 +0200
@@ -987,7 +987,7 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_i
int lastblock=0;
int accblock=0;
int thisblock;
- int eosflag;
+ int eosflag = 0;
ogg_stream_init(&work_os,vf->current_serialno); /* get the memory ready */
ogg_stream_reset(&work_os); /* eliminate the spurious OV_HOLE
--- lib/floor1.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/floor1.c 2007-04-23 18:01:44.000000000 +0200
@@ -413,7 +413,7 @@ static int accumulate_fit(const float *f
int x0, int x1,lsfit_acc *a,
int n,vorbis_info_floor1 *info){
long i;
- int quantized=vorbis_dBquant(flr+x0);
+ /*int quantized=vorbis_dBquant(flr+x0);*/
long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0;
@@ -591,7 +591,7 @@ static int post_Y(int *A,int *B,int pos)
return (A[pos]+B[pos])>>1;
}
-static int seq=0;
+/*static int seq=0;*/
int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
const float *logmdct, /* in */
@@ -763,7 +763,7 @@ int floor1_encode(oggpack_buffer *opb,vo
long i,j;
vorbis_info_floor1 *info=look->vi;
- long n=look->n;
+ /*long n=look->n;*/
long posts=look->posts;
codec_setup_info *ci=vb->vd->vi->codec_setup;
int out[VIF_POSIT+2];
--- examples/seeking_example.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ examples/seeking_example.c 2007-04-23 18:01:44.000000000 +0200
@@ -130,7 +130,7 @@ int main(){
for(i=0;i<1000;i++){
ogg_int64_t val=(double)rand()/RAND_MAX*length;
- ogg_int64_t pos;
+ ogg_int64_t pos=0;
printf("\r\t%d [raw position %ld]... ",i,(long)val);
fflush(stdout);
ret=ov_raw_seek(&ov,val);
@@ -151,7 +151,7 @@ int main(){
for(i=0;i<1000;i++){
ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
- ogg_int64_t pos;
+ ogg_int64_t pos=0;
printf("\r\t%d [pcm position %ld]... ",i,(long)val);
fflush(stdout);
ret=ov_pcm_seek_page(&ov,val);
@@ -167,13 +167,13 @@ int main(){
printf("\r");
{
- ogg_int64_t length=ov.end;
+ /*ogg_int64_t length=ov.end;*/
printf("testing pcm exact seeking to random places in %ld samples....\n",
(long)pcmlength);
for(i=0;i<1000;i++){
ogg_int64_t val=(double)rand()/RAND_MAX*pcmlength;
- ogg_int64_t pos;
+ ogg_int64_t pos=0;
printf("\r\t%d [pcm position %ld]... ",i,(long)val);
fflush(stdout);
ret=ov_pcm_seek(&ov,val);

3
libvorbis-1.1.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e9d49d0b20df5e080d8696deb5dd07547c91027d962cebb708011b375bbf320
size 1079944

154
libvorbis-1.1.2-aotuv-b5.diff → libvorbis-1.2.0-aotuv-b5.diff
View File

@ -1,5 +1,5 @@
--- lib/block.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/block.c 2007-04-23 17:54:23.000000000 +0200
--- lib/block.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/block.c 2007-08-02 12:25:50.000000000 +0200
@@ -106,7 +106,7 @@ int vorbis_block_init(vorbis_dsp_state *
oggpack_writeinit(vbi->packetblob[i]);
}
@ -21,7 +21,7 @@
/* Initialize the envelope state storage */
b->ve=_ogg_calloc(1,sizeof(*b->ve));
_ve_envelope_init(b->ve,vi);
@@ -348,6 +353,11 @@ void vorbis_dsp_clear(vorbis_dsp_state *
@@ -351,6 +356,11 @@ void vorbis_dsp_clear(vorbis_dsp_state *
drft_clear(&b->fft_look[0]);
drft_clear(&b->fft_look[1]);
@ -33,8 +33,8 @@
}
--- lib/modes/setup_X.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_X.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_X.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_X.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,13 +15,14 @@
********************************************************************/
@ -83,8 +83,8 @@
rate_mapping_X,
quality_mapping_8,
-1,
--- lib/modes/psych_16.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/psych_16.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/psych_16.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/psych_16.h 2007-08-02 12:25:50.000000000 +0200
@@ -16,9 +16,13 @@
********************************************************************/
@ -189,8 +189,8 @@
{-10,-10,-10,-10,-10, -5, -2, -2, 0, 0, 0, 4, 5, 6, 8, 8, 15},
{-30,-30,-30,-30,-30,-24,-20,-14,-10, -6, -8, -8, -6, -6, -6, -6, -6}}},
@@ -112,17 +130,17 @@ static noise3 _psy_noisebias_16[4]={
{-30,-30,-30,-30,-26,-26,-26,-26,-26,-26,-26,-26,-26,-24,-20,-20,-20}}},
@@ -119,17 +137,17 @@ static noiseguard _psy_noiseguards_16[4]
{20,20,-1},
};
-static double _noise_thresh_16[4]={ .3,.5,.5,.5 };
@ -214,8 +214,8 @@
};
--- lib/modes/psych_11.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/psych_11.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/psych_11.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/psych_11.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,25 +15,31 @@
********************************************************************/
@ -265,8 +265,8 @@
-static double _noise_thresh_11[3]={ .3,.5,.5 };
+static double _noise_thresh_11[4]={ .3,.3,.5,.5 };
--- lib/modes/setup_32.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_32.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_32.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_32.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,22 +15,26 @@
********************************************************************/
@ -329,8 +329,8 @@
{_noise_part_short_44,_noise_part_long_44},
_noise_thresh_44,
--- lib/modes/residue_44u.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/residue_44u.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/residue_44u.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/residue_44u.h 2007-08-02 12:25:50.000000000 +0200
@@ -304,6 +304,7 @@ static vorbis_residue_template _res_44u_
};
@ -339,8 +339,8 @@
{ _map_nominal_u, _res_44u_n1 }, /* -1 */
{ _map_nominal_u, _res_44u_0 }, /* 0 */
{ _map_nominal_u, _res_44u_1 }, /* 1 */
--- lib/modes/psych_8.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/psych_8.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/psych_8.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/psych_8.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,23 +15,29 @@
********************************************************************/
@ -447,8 +447,8 @@
+ -130,-130,-130,-140,
};
--- lib/modes/setup_16.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_16.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_16.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_16.h 2007-08-02 12:25:50.000000000 +0200
@@ -18,36 +18,40 @@
#include "psych_16.h"
#include "residue_16.h"
@ -516,8 +516,8 @@
rate_mapping_16_uncoupled,
quality_mapping_16,
-1,
--- lib/modes/setup_11.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_11.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_11.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_11.h 2007-08-02 12:25:50.000000000 +0200
@@ -17,28 +17,31 @@
#include "psych_11.h"
@ -571,8 +571,8 @@
rate_mapping_11_uncoupled,
quality_mapping_11,
-1,
--- lib/modes/residue_44.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/residue_44.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/residue_44.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/residue_44.h 2007-08-02 12:25:50.000000000 +0200
@@ -278,6 +278,7 @@ static vorbis_residue_template _res_44s_
};
@ -581,8 +581,8 @@
{ _map_nominal, _res_44s_n1 }, /* -1 */
{ _map_nominal, _res_44s_0 }, /* 0 */
{ _map_nominal, _res_44s_1 }, /* 1 */
--- lib/modes/setup_22.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_22.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_22.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_22.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,18 +15,21 @@
********************************************************************/
@ -621,8 +621,8 @@
rate_mapping_22_uncoupled,
quality_mapping_16,
-1,
--- lib/modes/psych_44.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/psych_44.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/psych_44.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/psych_44.h 2007-08-02 12:25:50.000000000 +0200
@@ -18,10 +18,26 @@
/* preecho trigger settings *****************************************/
@ -1573,8 +1573,8 @@
+// 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999
+ 320,320,160,160,320,640,9999,9999,9999,9999,9999,9999
+};
--- lib/modes/setup_8.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_8.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_8.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_8.h 2007-08-02 12:25:50.000000000 +0200
@@ -18,32 +18,37 @@
#include "psych_8.h"
#include "residue_8.h"
@ -1636,8 +1636,8 @@
rate_mapping_8_uncoupled,
quality_mapping_8,
-1,
--- lib/modes/setup_44.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_44.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_44.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_44.h 2007-08-02 12:25:50.000000000 +0200
@@ -19,43 +19,47 @@
#include "modes/residue_44.h"
#include "modes/psych_44.h"
@ -1705,8 +1705,8 @@
rate_mapping_44_stereo,
quality_mapping_44,
2,
--- lib/modes/residue_16.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/residue_16.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/residue_16.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/residue_16.h 2007-08-02 12:25:50.000000000 +0200
@@ -84,7 +84,8 @@ static vorbis_residue_template _res_16s_
&_resbook_16s_2,&_resbook_16s_2}
};
@ -1727,9 +1727,9 @@
{ _map_nominal_u, _res_16u_0 }, /* 0 */
{ _map_nominal_u, _res_16u_1 }, /* 1 */
{ _map_nominal_u, _res_16u_2 }, /* 2 */
--- lib/modes/residue_8.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/residue_8.h 2007-04-23 17:54:23.000000000 +0200
@@ -48,7 +48,8 @@ static vorbis_residue_template _res_8s_1
--- lib/modes/residue_8.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/residue_8.h 2007-08-02 12:25:50.000000000 +0200
@@ -60,7 +60,8 @@ static vorbis_residue_template _res_8s_1
&_resbook_8s_1,&_resbook_8s_1},
};
@ -1739,7 +1739,7 @@
{ _map_nominal, _res_8s_0 }, /* 0 */
{ _map_nominal, _res_8s_1 }, /* 1 */
};
@@ -91,7 +92,8 @@ static vorbis_residue_template _res_8u_1
@@ -103,7 +104,8 @@ static vorbis_residue_template _res_8u_1
&_resbook_8u_1,&_resbook_8u_1},
};
@ -1749,8 +1749,8 @@
{ _map_nominal_u, _res_8u_0 }, /* 0 */
{ _map_nominal_u, _res_8u_1 }, /* 1 */
};
--- lib/modes/setup_44u.h-dist 2005-11-28 06:43:23.000000000 +0100
+++ lib/modes/setup_44u.h 2007-04-23 17:54:23.000000000 +0200
--- lib/modes/setup_44u.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/modes/setup_44u.h 2007-08-02 12:25:50.000000000 +0200
@@ -17,13 +17,15 @@
#include "modes/residue_44u.h"
@ -1770,8 +1770,8 @@
rate_mapping_44_un,
quality_mapping_44,
-1,
--- lib/mapping0.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/mapping0.c 2007-04-23 17:54:23.000000000 +0200
--- lib/mapping0.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/mapping0.c 2007-08-02 12:25:50.000000000 +0200
@@ -246,11 +246,14 @@ static int mapping0_forward(vorbis_block
codec_setup_info *ci=vi->codec_setup;
private_state *b=vb->vd->backend_state;
@ -1936,8 +1936,8 @@
/* ok, done encoding. Next protopacket. */
}
--- lib/masking.h-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/masking.h 2007-04-23 17:54:23.000000000 +0200
--- lib/masking.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/masking.h 2007-08-02 12:25:50.000000000 +0200
@@ -23,16 +23,29 @@
#define MAX_ATH 88
@ -1978,8 +1978,8 @@
/*16k*/ -80, -70, -50, -40, -30, -30, -30, -30
};
--- lib/psy.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/psy.c 2007-04-23 17:54:23.000000000 +0200
--- lib/psy.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/psy.c 2007-08-02 12:25:50.000000000 +0200
@@ -30,8 +30,34 @@
#include "misc.h"
@ -2080,7 +2080,7 @@
/* set up the lookups for a given blocksize and sample rate */
for(i=0,j=0;i<MAX_ATH-1;i++){
@@ -690,70 +760,70 @@ static void bark_noise_hybridmp(int n,co
@@ -693,70 +763,70 @@ static void bark_noise_hybridmp(int n,co
}
static float FLOOR1_fromdB_INV_LOOKUP[256]={
@ -2215,7 +2215,7 @@
};
void _vp_remove_floor(vorbis_look_psy *p,
@@ -776,6 +846,7 @@ void _vp_remove_floor(vorbis_look_psy *p
@@ -779,6 +849,7 @@ void _vp_remove_floor(vorbis_look_psy *p
}
void _vp_noisemask(vorbis_look_psy *p,
@ -2223,7 +2223,7 @@
float *logmdct,
float *logmask){
@@ -814,7 +885,19 @@ void _vp_noisemask(vorbis_look_psy *p,
@@ -817,7 +888,19 @@ void _vp_noisemask(vorbis_look_psy *p,
}
#endif
@ -2244,7 +2244,7 @@
int dB=logmask[i]+.5;
if(dB>=NOISE_COMPAND_LEVELS)dB=NOISE_COMPAND_LEVELS-1;
if(dB<0)dB=0;
@@ -854,18 +937,172 @@ void _vp_offset_and_mix(vorbis_look_psy
@@ -857,18 +940,172 @@ void _vp_offset_and_mix(vorbis_look_psy
int offset_select,
float *logmask,
float *mdct,
@ -2422,7 +2422,7 @@
/* AoTuV */
/** @ M1 **
@@ -904,6 +1141,24 @@ void _vp_offset_and_mix(vorbis_look_psy
@@ -907,6 +1144,24 @@ void _vp_offset_and_mix(vorbis_look_psy
}
}
@ -2447,7 +2447,7 @@
}
float _vp_ampmax_decay(float amp,vorbis_dsp_state *vd){
@@ -955,7 +1210,7 @@ static void precomputed_couple_point(flo
@@ -958,7 +1213,7 @@ static void precomputed_couple_point(flo
int test=(floorA>floorB)-1;
int offset=31-abs(floorA-floorB);
@ -2456,7 +2456,7 @@
floormag*=FLOOR1_fromdB_INV_LOOKUP[(floorB&test)|(floorA&(~test))];
@@ -989,6 +1244,22 @@ static float round_hypot(float a, float
@@ -992,6 +1247,22 @@ static float round_hypot(float a, float
if(-a>b)return -sqrt(a*a+b*b);
return sqrt(b*b+a*a);
}
@ -2479,7 +2479,7 @@
/* revert to round hypot for now */
float **_vp_quantize_couple_memo(vorbis_block *vb,
@@ -1001,16 +1272,27 @@ float **_vp_quantize_couple_memo(vorbis_
@@ -1004,16 +1275,27 @@ float **_vp_quantize_couple_memo(vorbis_
float **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret));
int limit=g->coupling_pointlimit[p->vi->blockflag][PACKETBLOBS/2];
@ -2516,7 +2516,7 @@
return(ret);
}
@@ -1021,12 +1303,130 @@ static int apsort(const void *a, const v
@@ -1024,12 +1306,130 @@ static int apsort(const void *a, const v
return (f1<f2)-(f1>f2);
}
@ -2648,7 +2648,7 @@
if(p->vi->normal_point_p){
int i,j,k,n=p->n;
int **ret=_vorbis_block_alloc(vb,vi->coupling_steps*sizeof(*ret));
@@ -1045,10 +1445,22 @@ int **_vp_quantize_couple_sort(vorbis_bl
@@ -1048,10 +1448,22 @@ int **_vp_quantize_couple_sort(vorbis_bl
return(ret);
}
return(NULL);
@ -2671,7 +2671,7 @@
int i,j,n=p->n;
vorbis_info_psy *vi=p->vi;
int partition=vi->normal_partition;
@@ -1063,11 +1475,12 @@ void _vp_noise_normalize_sort(vorbis_loo
@@ -1066,11 +1478,12 @@ void _vp_noise_normalize_sort(vorbis_loo
sortedindex[i+j-start]=work[i]-magnitudes;
}
}
@ -2685,7 +2685,7 @@
vorbis_info_psy *vi=p->vi;
int partition=vi->normal_partition;
int start=vi->normal_start;
@@ -1081,27 +1494,64 @@ void _vp_noise_normalize(vorbis_look_psy
@@ -1084,27 +1497,64 @@ void _vp_noise_normalize(vorbis_look_psy
for(;j+partition<=n;j+=partition){
float acc=0.;
int k;
@ -2765,7 +2765,7 @@
}
}
}
@@ -1120,7 +1570,8 @@ void _vp_couple(int blobno,
@@ -1123,7 +1573,8 @@ void _vp_couple(int blobno,
int **mag_sort,
int **ifloor,
int *nonzero,
@ -2775,7 +2775,7 @@
int i,j,k,n=p->n;
@@ -1144,39 +1595,196 @@ void _vp_couple(int blobno,
@@ -1147,39 +1598,196 @@ void _vp_couple(int blobno,
float *rM=res[vi->coupling_mag[i]];
float *rA=res[vi->coupling_ang[i]];
@ -2982,7 +2982,7 @@
}else{
couple_lossless(rM[l],rA[l],qM+l,qA+l);
}
@@ -1185,40 +1793,106 @@ void _vp_couple(int blobno,
@@ -1188,40 +1796,106 @@ void _vp_couple(int blobno,
qA[l]=0.;
}
}
@ -3112,8 +3112,8 @@
+
+ return(noise_compand_level);
}
--- lib/psy.h-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/psy.h 2007-04-23 17:54:23.000000000 +0200
--- lib/psy.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/psy.h 2007-08-02 12:25:50.000000000 +0200
@@ -15,6 +15,8 @@
********************************************************************/
@ -3200,8 +3200,8 @@
#endif
--- lib/vorbisenc.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/vorbisenc.c 2007-04-23 17:54:23.000000000 +0200
--- lib/vorbisenc.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/vorbisenc.c 2007-08-02 12:25:50.000000000 +0200
@@ -370,11 +370,16 @@ static void vorbis_encode_tonemask_setup
static void vorbis_encode_compand_setup(vorbis_info *vi,double s,int block,
@ -3254,8 +3254,8 @@
return;
}
--- lib/codec_internal.h-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/codec_internal.h 2007-04-23 17:54:23.000000000 +0200
--- lib/codec_internal.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/codec_internal.h 2007-08-02 12:25:50.000000000 +0200
@@ -82,6 +82,15 @@ typedef struct private_state {
bitrate_manager_state bms;
@ -3272,19 +3272,19 @@
} private_state;
/* codec_setup_info contains all the setup information specific to the
--- lib/info.c-dist 2005-11-28 06:43:25.000000000 +0100
+++ lib/info.c 2007-04-23 17:54:23.000000000 +0200
@@ -416,7 +416,7 @@ static int _vorbis_pack_info(oggpack_buf
--- lib/info.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/info.c 2007-08-02 12:26:53.000000000 +0200
@@ -451,7 +451,7 @@ static int _vorbis_pack_info(oggpack_buf
}
static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
- char temp[]="Xiph.Org libVorbis I 20050304";
+ char temp[]="AO; aoTuV b5 [20061024] (based on Xiph.Org's libVorbis)";
- char temp[]="Xiph.Org libVorbis I 20070622";
+ char temp[]="AO; aoTuV b5 [20061024] (based on Xiph.Org's I 20070622)";
int bytes = strlen(temp);
/* preamble */
--- aoTuV_technical.txt-dist 2007-04-23 17:54:23.000000000 +0200
+++ aoTuV_technical.txt 2007-04-23 17:54:23.000000000 +0200
--- aoTuV_technical.txt-dist 2007-08-02 12:25:50.000000000 +0200
+++ aoTuV_technical.txt 2007-08-02 12:25:50.000000000 +0200
@@ -0,0 +1,144 @@
+aoTuV beta5 technical information
+
@ -3430,8 +3430,8 @@
+
+2004/11/21
+Aoyumi
--- aoTuV_README-1st.txt-dist 2007-04-23 17:54:23.000000000 +0200
+++ aoTuV_README-1st.txt 2007-04-23 17:54:23.000000000 +0200
--- aoTuV_README-1st.txt-dist 2007-08-02 12:25:50.000000000 +0200
+++ aoTuV_README-1st.txt 2007-08-02 12:25:50.000000000 +0200
@@ -0,0 +1,21 @@
+aoTuV Beta 5
+
@ -3454,8 +3454,8 @@
+
+
+AUTHOR : aoyumi <aoyumi@gmail.com>
--- COPYING-dist 2005-11-28 06:43:25.000000000 +0100
+++ COPYING 2007-04-23 17:54:23.000000000 +0200
--- COPYING-dist 2004-09-20 23:09:21.000000000 +0200
+++ COPYING 2007-08-02 12:25:50.000000000 +0200
@@ -1,4 +1,5 @@
-Copyright (c) 2002-2004 Xiph.org Foundation
+aoTuV - Copyright (c) 2003-2006 Aoyumi

100
libvorbis-1.2.0-warning-fixes.diff Normal file
View File

@ -0,0 +1,100 @@
--- lib/mapping0.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/mapping0.c 2007-08-02 12:04:35.000000000 +0200
@@ -586,8 +586,8 @@ static int mapping0_forward(vorbis_block
float **couple_bundle=alloca(sizeof(*couple_bundle)*vi->channels);
int *zerobundle=alloca(sizeof(*zerobundle)*vi->channels);
int **sortindex=alloca(sizeof(*sortindex)*vi->channels);
- float **mag_memo;
- int **mag_sort;
+ float **mag_memo = NULL;
+ int **mag_sort = NULL;
if(info->coupling_steps){
mag_memo=_vp_quantize_couple_memo(vb,
@@ -735,7 +735,7 @@ static int mapping0_inverse(vorbis_block
codec_setup_info *ci=vi->codec_setup;
private_state *b=vd->backend_state;
vorbis_info_mapping0 *info=(vorbis_info_mapping0 *)l;
- int hs=ci->halfrate_flag;
+ /*int hs=ci->halfrate_flag; */
int i,j;
long n=vb->pcmend=ci->blocksizes[vb->W];
--- lib/scales.h-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/scales.h 2007-08-02 12:04:35.000000000 +0200
@@ -25,7 +25,7 @@
#define VORBIS_IEEE_FLOAT32 1
#ifdef VORBIS_IEEE_FLOAT32
-static float unitnorm(float x){
+static inline float unitnorm(float x){
union {
ogg_uint32_t i;
float f;
@@ -36,7 +36,7 @@ static float unitnorm(float x){
}
/* Segher was off (too high) by ~ .3 decibel. Center the conversion correctly. */
-static float todB(const float *x){
+static inline float todB(const float *x){
union {
ogg_uint32_t i;
float f;
@@ -50,7 +50,7 @@ static float todB(const float *x){
#else
-static float unitnorm(float x){
+static inline float unitnorm(float x){
if(x<0)return(-1.f);
return(1.f);
}
--- lib/res0.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/res0.c 2007-08-02 12:04:35.000000000 +0200
@@ -372,7 +372,7 @@ static long **_01class(vorbis_block *vb,
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
vorbis_info *vi=vb->vd->vi;
- codec_setup_info *ci=vi->codec_setup;
+ /*codec_setup_info *ci=vi->codec_setup;*/
/* move all this setup out later */
int samples_per_partition=info->grouping;
@@ -500,7 +500,7 @@ static int _01forward(oggpack_buffer *op
vorbis_look_residue0 *look=(vorbis_look_residue0 *)vl;
vorbis_info_residue0 *info=look->info;
- vorbis_dsp_state *vd=vb->vd;
+ /*vorbis_dsp_state *vd=vb->vd;*/
/* move all this setup out later */
int samples_per_partition=info->grouping;
--- lib/floor1.c-dist 2007-07-24 02:09:47.000000000 +0200
+++ lib/floor1.c 2007-08-02 12:04:35.000000000 +0200
@@ -417,7 +417,7 @@ static int accumulate_fit(const float *f
int x0, int x1,lsfit_acc *a,
int n,vorbis_info_floor1 *info){
long i;
- int quantized=vorbis_dBquant(flr+x0);
+ /*int quantized=vorbis_dBquant(flr+x0);*/
long xa=0,ya=0,x2a=0,y2a=0,xya=0,na=0, xb=0,yb=0,x2b=0,y2b=0,xyb=0,nb=0;
@@ -595,7 +595,7 @@ static int post_Y(int *A,int *B,int pos)
return (A[pos]+B[pos])>>1;
}
-static int seq=0;
+/*static int seq=0;*/
int *floor1_fit(vorbis_block *vb,vorbis_look_floor1 *look,
const float *logmdct, /* in */
@@ -767,7 +767,7 @@ int floor1_encode(oggpack_buffer *opb,vo
long i,j;
vorbis_info_floor1 *info=look->vi;
- long n=look->n;
+ /*long n=look->n;*/
long posts=look->posts;
codec_setup_info *ci=vb->vd->vi->codec_setup;
int out[VIF_POSIT+2];

3
libvorbis-1.2.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:184494c0281f651f21ad3afc1b66bdc784ffe79b839ed46aa33c8cd27d4cbb79
size 1214375

41
libvorbis-maptype-check.diff
View File

@ -1,41 +0,0 @@
Index: lib/info.c
===================================================================
--- lib/info.c (revision 13159)
+++ lib/info.c (revision 13160)
@@ -139,7 +139,7 @@
memset(vc,0,sizeof(*vc));
}
-/* blocksize 0 is guaranteed to be short, 1 is guarantted to be long.
+/* blocksize 0 is guaranteed to be short, 1 is guaranteed to be long.
They may be equal, but short will never ge greater than long */
int vorbis_info_blocksize(vorbis_info *vi,int zo){
codec_setup_info *ci = vi->codec_setup;
@@ -162,14 +162,23 @@
if(ci->mode_param[i])_ogg_free(ci->mode_param[i]);
for(i=0;i<ci->maps;i++) /* unpack does the range checking */
- _mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]);
+ if(ci->map_param[i]) /* this may be cleaning up an aborted
+ unpack, in which case the below type
+ cannot be trusted */
+ _mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]);
for(i=0;i<ci->floors;i++) /* unpack does the range checking */
- _floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]);
+ if(ci->floor_param[i]) /* this may be cleaning up an aborted
+ unpack, in which case the below type
+ cannot be trusted */
+ _floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]);
for(i=0;i<ci->residues;i++) /* unpack does the range checking */
- _residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]);
-
+ if(ci->residue_param[i]) /* this may be cleaning up an aborted
+ unpack, in which case the below type
+ cannot be trusted */
+ _residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]);
+
for(i=0;i<ci->books;i++){
if(ci->book_param[i]){
/* knows if the book was not alloced */

13
libvorbis.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Aug 2 12:22:21 CEST 2007 - tiwai@suse.de
- updated to version 1.2.0:
* new ov_fopen() convenience call that avoids the common
stdio conflicts with ov_open() and MSVC runtimes.
* libvorbisfile now handles multiplexed streams
* improve robustness to corrupt input streams
* fix a minor encoder bug
* updated RTP draft
* build system updates
* minor corrections to the specification
-------------------------------------------------------------------
Fri Jul 27 12:56:43 CEST 2007 - tiwai@suse.de

22
libvorbis.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package libvorbis (Version 1.1.2)
# spec file for package libvorbis (Version 1.2.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,8 +13,8 @@
Name: libvorbis
BuildRequires: libogg-devel pkgconfig
Summary: The Vorbis General Audio Compression Codec
Version: 1.1.2
Release: 65
Version: 1.2.0
Release: 1
Group: System/Libraries
License: BSD 3-Clause
URL: http://www.vorbis.com/
@ -24,7 +24,6 @@ Patch2: libvorbis-m4.dif
Patch5: libvorbis-%{version}-aotuv-b5.diff
Patch6: libvorbis-%{version}-warning-fixes.diff
Patch7: libvorbis-cflags.diff
Patch8: libvorbis-maptype-check.diff
Patch9: libvorbis-doc-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -76,19 +75,18 @@ Authors:
Xiphophorus Company <team@xiph.org>
%prep
%setup
%setup -q
%patch2
%patch5
%patch6
%patch7
%patch8
%patch9
if [ "%_lib" == "lib64" ]; then
%patch1
fi
%{?suse_update_config:%{suse_update_config -f}}
%build
%{?suse_update_config:%{suse_update_config -f}}
autoreconf -fi
%configure \
--with-ogg-libraries=%{_libdir} \
@ -131,6 +129,16 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%doc %{_docdir}/%{name}
%changelog
* Thu Aug 02 2007 - tiwai@suse.de
- updated to version 1.2.0:
* new ov_fopen() convenience call that avoids the common
stdio conflicts with ov_open() and MSVC runtimes.
* libvorbisfile now handles multiplexed streams
* improve robustness to corrupt input streams
* fix a minor encoder bug
* updated RTP draft
* build system updates
* minor corrections to the specification
* Fri Jul 27 2007 - tiwai@suse.de
- fix the documentation link (#293784)
- split documentation to doc subpackage