godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update libvorbis to 1.3.6 

(cherry picked from commit 4932c7ddcf)
This commit is contained in:
Guilherme Felipe 2018-05-24 13:52:05 -03:00 committed by Rémi Verschelde
parent 3f94d2697a
commit c3ad539b41
72 changed files with 82 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -183,7 +183,7 @@ Files extracted from upstream source:
## libvorbis ## libvorbis
- Upstream: https://www.xiph.org/vorbis - Upstream: https://www.xiph.org/vorbis
- Version: 1.3.5 - Version: 1.3.6
- License: BSD-3-Clause - License: BSD-3-Clause
Files extracted from upstream source: Files extracted from upstream source:

2
thirdparty/libvorbis/COPYING vendored
View File

@ -1,4 +1,4 @@
Copyright (c) 2002-2015 Xiph.org Foundation Copyright (c) 2002-2018 Xiph.org Foundation
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions

1
thirdparty/libvorbis/analysis.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: single-block PCM analysis mode dispatch function: single-block PCM analysis mode dispatch
last mod: $Id: analysis.c 16226 2009-07-08 06:43:49Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/backends.h vendored
View File

@ -12,7 +12,6 @@
function: libvorbis backend and mapping structures; needed for function: libvorbis backend and mapping structures; needed for
static mode headers static mode headers
last mod: $Id: backends.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/barkmel.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: bark scale utility function: bark scale utility
last mod: $Id: barkmel.c 19454 2015-03-02 22:39:28Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/bitrate.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: bitrate tracking and management function: bitrate tracking and management
last mod: $Id: bitrate.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/bitrate.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: bitrate tracking and management function: bitrate tracking and management
last mod: $Id: bitrate.h 13293 2007-07-24 00:09:47Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/block.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly function: PCM data vector blocking, windowing and dis/reassembly
last mod: $Id: block.c 19457 2015-03-03 00:15:29Z giles $
Handle windowing, overlap-add, etc of the PCM vectors. This is made Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes. more amusing by Vorbis' current two allowed block sizes.

1
thirdparty/libvorbis/books/coupled/res_books_51.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
* *
* function: static codebooks for 5.1 surround * function: static codebooks for 5.1 surround
* last modified: $Id: res_books_51.h 19057 2014-01-22 12:32:31Z xiphmont $
* *
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/books/coupled/res_books_stereo.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: static codebooks autogenerated by huff/huffbuld function: static codebooks autogenerated by huff/huffbuld
last modified: $Id: res_books_stereo.h 19057 2014-01-22 12:32:31Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/books/floor/floor_books.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: static codebooks autogenerated by huff/huffbuld function: static codebooks autogenerated by huff/huffbuld
last modified: $Id: floor_books.h 19057 2014-01-22 12:32:31Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/books/uncoupled/res_books_uncoupled.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: static codebooks autogenerated by huff/huffbuld function: static codebooks autogenerated by huff/huffbuld
last modified: $Id: res_books_uncoupled.h 19057 2014-01-22 12:32:31Z xiphmont $
********************************************************************/ ********************************************************************/

49
thirdparty/libvorbis/codebook.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: basic codebook pack/unpack/code/decode operations function: basic codebook pack/unpack/code/decode operations
last mod: $Id: codebook.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/
@ -387,7 +386,7 @@ long vorbis_book_decodevs_add(codebook *book,float *a,oggpack_buffer *b,int n){
t[i] = book->valuelist+entry[i]*book->dim; t[i] = book->valuelist+entry[i]*book->dim;
} }
for(i=0,o=0;i<book->dim;i++,o+=step) for(i=0,o=0;i<book->dim;i++,o+=step)
for (j=0;j<step;j++) for (j=0;o+j<n && j<step;j++)
a[o+j]+=t[j][i]; a[o+j]+=t[j][i];
} }
return(0); return(0);
@ -399,41 +398,12 @@ long vorbis_book_decodev_add(codebook *book,float *a,oggpack_buffer *b,int n){
int i,j,entry; int i,j,entry;
float *t; float *t;
if(book->dim>8){ for(i=0;i<n;){
for(i=0;i<n;){ entry = decode_packed_entry_number(book,b);
entry = decode_packed_entry_number(book,b); if(entry==-1)return(-1);
if(entry==-1)return(-1); t = book->valuelist+entry*book->dim;
t = book->valuelist+entry*book->dim; for(j=0;i<n && j<book->dim;)
for (j=0;j<book->dim;) a[i++]+=t[j++];
a[i++]+=t[j++];
}
}else{
for(i=0;i<n;){
entry = decode_packed_entry_number(book,b);
if(entry==-1)return(-1);
t = book->valuelist+entry*book->dim;
j=0;
switch((int)book->dim){
case 8:
a[i++]+=t[j++];
case 7:
a[i++]+=t[j++];
case 6:
a[i++]+=t[j++];
case 5:
a[i++]+=t[j++];
case 4:
a[i++]+=t[j++];
case 3:
a[i++]+=t[j++];
case 2:
a[i++]+=t[j++];
case 1:
a[i++]+=t[j++];
case 0:
break;
}
}
} }
} }
return(0); return(0);
@ -471,12 +441,13 @@ long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
long i,j,entry; long i,j,entry;
int chptr=0; int chptr=0;
if(book->used_entries>0){ if(book->used_entries>0){
for(i=offset/ch;i<(offset+n)/ch;){ int m=(offset+n)/ch;
for(i=offset/ch;i<m;){
entry = decode_packed_entry_number(book,b); entry = decode_packed_entry_number(book,b);
if(entry==-1)return(-1); if(entry==-1)return(-1);
{ {
const float *t = book->valuelist+entry*book->dim; const float *t = book->valuelist+entry*book->dim;
for (j=0;j<book->dim;j++){ for (j=0;i<m && j<book->dim;j++){
a[chptr++][i]+=t[j]; a[chptr++][i]+=t[j];
if(chptr==ch){ if(chptr==ch){
chptr=0; chptr=0;

1
thirdparty/libvorbis/codebook.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: basic shared codebook operations function: basic shared codebook operations
last mod: $Id: codebook.h 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/codec_internal.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: libvorbis codec headers function: libvorbis codec headers
last mod: $Id: codec_internal.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/envelope.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: PCM data envelope analysis function: PCM data envelope analysis
last mod: $Id: envelope.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/envelope.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: PCM data envelope analysis and manipulation function: PCM data envelope analysis and manipulation
last mod: $Id: envelope.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/floor0.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: floor backend 0 implementation function: floor backend 0 implementation
last mod: $Id: floor0.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/floor1.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: floor backend 1 implementation function: floor backend 1 implementation
last mod: $Id: floor1.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/highlevel.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: highlevel encoder setup struct separated out for vorbisenc clarity function: highlevel encoder setup struct separated out for vorbisenc clarity
last mod: $Id: highlevel.h 17195 2010-05-05 21:49:51Z giles $
********************************************************************/ ********************************************************************/

34
thirdparty/libvorbis/info.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: maintain the info structure, info <-> header packets function: maintain the info structure, info <-> header packets
last mod: $Id: info.c 19441 2015-01-21 01:17:41Z xiphmont $
********************************************************************/ ********************************************************************/
@ -31,8 +30,8 @@
#include "misc.h" #include "misc.h"
#include "os.h" #include "os.h"
#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.5" #define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.6"
#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20150105 (⛄⛄⛄⛄)" #define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20180316 (Now 100% fewer shells)"
/* helpers */ /* helpers */
static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){ static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){
@ -65,11 +64,13 @@ void vorbis_comment_add(vorbis_comment *vc,const char *comment){
} }
void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *contents){ void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *contents){
char *comment=alloca(strlen(tag)+strlen(contents)+2); /* +2 for = and \0 */ /* Length for key and value +2 for = and \0 */
char *comment=_ogg_malloc(strlen(tag)+strlen(contents)+2);
strcpy(comment, tag); strcpy(comment, tag);
strcat(comment, "="); strcat(comment, "=");
strcat(comment, contents); strcat(comment, contents);
vorbis_comment_add(vc, comment); vorbis_comment_add(vc, comment);
_ogg_free(comment);
} }
/* This is more or less the same as strncasecmp - but that doesn't exist /* This is more or less the same as strncasecmp - but that doesn't exist
@ -88,27 +89,30 @@ char *vorbis_comment_query(vorbis_comment *vc, const char *tag, int count){
long i; long i;
int found = 0; int found = 0;
int taglen = strlen(tag)+1; /* +1 for the = we append */ int taglen = strlen(tag)+1; /* +1 for the = we append */
char *fulltag = alloca(taglen+ 1); char *fulltag = _ogg_malloc(taglen+1);
strcpy(fulltag, tag); strcpy(fulltag, tag);
strcat(fulltag, "="); strcat(fulltag, "=");
for(i=0;i<vc->comments;i++){ for(i=0;i<vc->comments;i++){
if(!tagcompare(vc->user_comments[i], fulltag, taglen)){ if(!tagcompare(vc->user_comments[i], fulltag, taglen)){
if(count == found) if(count == found) {
/* We return a pointer to the data, not a copy */ /* We return a pointer to the data, not a copy */
return vc->user_comments[i] + taglen; _ogg_free(fulltag);
else return vc->user_comments[i] + taglen;
} else {
found++; found++;
}
} }
} }
_ogg_free(fulltag);
return NULL; /* didn't find anything */ return NULL; /* didn't find anything */
} }
int vorbis_comment_query_count(vorbis_comment *vc, const char *tag){ int vorbis_comment_query_count(vorbis_comment *vc, const char *tag){
int i,count=0; int i,count=0;
int taglen = strlen(tag)+1; /* +1 for the = we append */ int taglen = strlen(tag)+1; /* +1 for the = we append */
char *fulltag = alloca(taglen+1); char *fulltag = _ogg_malloc(taglen+1);
strcpy(fulltag,tag); strcpy(fulltag,tag);
strcat(fulltag, "="); strcat(fulltag, "=");
@ -117,6 +121,7 @@ int vorbis_comment_query_count(vorbis_comment *vc, const char *tag){
count++; count++;
} }
_ogg_free(fulltag);
return count; return count;
} }
@ -206,9 +211,9 @@ static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
vi->channels=oggpack_read(opb,8); vi->channels=oggpack_read(opb,8);
vi->rate=oggpack_read(opb,32); vi->rate=oggpack_read(opb,32);
vi->bitrate_upper=oggpack_read(opb,32); vi->bitrate_upper=(ogg_int32_t)oggpack_read(opb,32);
vi->bitrate_nominal=oggpack_read(opb,32); vi->bitrate_nominal=(ogg_int32_t)oggpack_read(opb,32);
vi->bitrate_lower=oggpack_read(opb,32); vi->bitrate_lower=(ogg_int32_t)oggpack_read(opb,32);
ci->blocksizes[0]=1<<oggpack_read(opb,4); ci->blocksizes[0]=1<<oggpack_read(opb,4);
ci->blocksizes[1]=1<<oggpack_read(opb,4); ci->blocksizes[1]=1<<oggpack_read(opb,4);
@ -583,7 +588,8 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
oggpack_buffer opb; oggpack_buffer opb;
private_state *b=v->backend_state; private_state *b=v->backend_state;
if(!b||vi->channels<=0){ if(!b||vi->channels<=0||vi->channels>256){
b = NULL;
ret=OV_EFAULT; ret=OV_EFAULT;
goto err_out; goto err_out;
} }
@ -642,7 +648,7 @@ int vorbis_analysis_headerout(vorbis_dsp_state *v,
memset(op_code,0,sizeof(*op_code)); memset(op_code,0,sizeof(*op_code));
if(b){ if(b){
oggpack_writeclear(&opb); if(vi->channels>0)oggpack_writeclear(&opb);
if(b->header)_ogg_free(b->header); if(b->header)_ogg_free(b->header);
if(b->header1)_ogg_free(b->header1); if(b->header1)_ogg_free(b->header1);
if(b->header2)_ogg_free(b->header2); if(b->header2)_ogg_free(b->header2);

1
thirdparty/libvorbis/lookup.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: lookup based functions function: lookup based functions
last mod: $Id: lookup.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/lookup.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: lookup based functions function: lookup based functions
last mod: $Id: lookup.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/lookup_data.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: lookup data; generated by lookups.pl; edit there function: lookup data; generated by lookups.pl; edit there
last mod: $Id: lookup_data.h 16037 2009-05-26 21:10:58Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/lpc.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: LPC low level routines function: LPC low level routines
last mod: $Id: lpc.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/lpc.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: LPC low level routines function: LPC low level routines
last mod: $Id: lpc.h 16037 2009-05-26 21:10:58Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/lsp.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: LSP (also called LSF) conversion routines function: LSP (also called LSF) conversion routines
last mod: $Id: lsp.c 19453 2015-03-02 22:35:34Z xiphmont $
The LSP generation code is taken (with minimal modification and a The LSP generation code is taken (with minimal modification and a
few bugfixes) from "On the Computation of the LSP Frequencies" by few bugfixes) from "On the Computation of the LSP Frequencies" by

1
thirdparty/libvorbis/lsp.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: LSP (also called LSF) conversion routines function: LSP (also called LSF) conversion routines
last mod: $Id: lsp.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

2
thirdparty/libvorbis/mapping0.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: channel mapping 0 implementation function: channel mapping 0 implementation
last mod: $Id: mapping0.c 19441 2015-01-21 01:17:41Z xiphmont $
********************************************************************/ ********************************************************************/
@ -93,7 +92,6 @@ static vorbis_info_mapping *mapping0_unpack(vorbis_info *vi,oggpack_buffer *opb)
int i,b; int i,b;
vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info)); vorbis_info_mapping0 *info=_ogg_calloc(1,sizeof(*info));
codec_setup_info *ci=vi->codec_setup; codec_setup_info *ci=vi->codec_setup;
memset(info,0,sizeof(*info));
if(vi->channels<=0)goto err_out; if(vi->channels<=0)goto err_out;
b=oggpack_read(opb,1); b=oggpack_read(opb,1);

1
thirdparty/libvorbis/masking.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: masking curve data for psychoacoustics function: masking curve data for psychoacoustics
last mod: $Id: masking.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/mdct.c vendored
View File

@ -12,7 +12,6 @@
function: normalized modified discrete cosine transform function: normalized modified discrete cosine transform
power of two length transform only [64 <= n ] power of two length transform only [64 <= n ]
last mod: $Id: mdct.c 16227 2009-07-08 06:58:46Z xiphmont $
Original algorithm adapted long ago from _The use of multirate filter Original algorithm adapted long ago from _The use of multirate filter
banks for coding of high quality digital audio_, by T. Sporer, banks for coding of high quality digital audio_, by T. Sporer,

1
thirdparty/libvorbis/mdct.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: modified discrete cosine transform prototypes function: modified discrete cosine transform prototypes
last mod: $Id: mdct.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/misc.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: miscellaneous prototypes function: miscellaneous prototypes
last mod: $Id: misc.h 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/floor_all.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: key floor settings function: key floor settings
last mod: $Id: floor_all.h 17050 2010-03-26 01:34:42Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/psych_11.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 11kHz settings function: 11kHz settings
last mod: $Id: psych_11.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/psych_16.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 16kHz settings function: 16kHz settings
last mod: $Id: psych_16.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/psych_44.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: key psychoacoustic settings for 44.1/48kHz function: key psychoacoustic settings for 44.1/48kHz
last mod: $Id: psych_44.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/psych_8.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 8kHz psychoacoustic settings function: 8kHz psychoacoustic settings
last mod: $Id: psych_8.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/residue_16.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel residue templates 16/22kHz function: toplevel residue templates 16/22kHz
last mod: $Id: residue_16.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/residue_44.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel residue templates for 32/44.1/48kHz function: toplevel residue templates for 32/44.1/48kHz
last mod: $Id: residue_44.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/residue_44p51.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel residue templates for 32/44.1/48kHz uncoupled function: toplevel residue templates for 32/44.1/48kHz uncoupled
last mod: $Id: residue_44p51.h 19013 2013-11-12 04:04:50Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/residue_44u.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel residue templates for 32/44.1/48kHz uncoupled function: toplevel residue templates for 32/44.1/48kHz uncoupled
last mod: $Id: residue_44u.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/residue_8.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel residue templates 8/11kHz function: toplevel residue templates 8/11kHz
last mod: $Id: residue_8.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_11.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 11kHz settings function: 11kHz settings
last mod: $Id: setup_11.h 16894 2010-02-12 20:32:12Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_16.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 16kHz settings function: 16kHz settings
last mod: $Id: setup_16.h 16894 2010-02-12 20:32:12Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_22.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 22kHz settings function: 22kHz settings
last mod: $Id: setup_22.h 17026 2010-03-25 05:00:27Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_32.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel settings for 32kHz function: toplevel settings for 32kHz
last mod: $Id: setup_32.h 16894 2010-02-12 20:32:12Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_44.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel settings for 44.1/48kHz function: toplevel settings for 44.1/48kHz
last mod: $Id: setup_44.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_44p51.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel settings for 44.1/48kHz 5.1 surround modes function: toplevel settings for 44.1/48kHz 5.1 surround modes
last mod: $Id: setup_44p51.h 19013 2013-11-12 04:04:50Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_44u.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: toplevel settings for 44.1/48kHz uncoupled modes function: toplevel settings for 44.1/48kHz uncoupled modes
last mod: $Id: setup_44u.h 16962 2010-03-11 07:30:34Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_8.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: 8kHz settings function: 8kHz settings
last mod: $Id: setup_8.h 16894 2010-02-12 20:32:12Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/modes/setup_X.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: catch-all toplevel settings for q modes only function: catch-all toplevel settings for q modes only
last mod: $Id: setup_X.h 16894 2010-02-12 20:32:12Z xiphmont $
********************************************************************/ ********************************************************************/

3
thirdparty/libvorbis/os.h vendored
View File

@ -13,7 +13,6 @@
******************************************************************** ********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal. function: #ifdef jail to whip a few platforms into the UNIX ideal.
last mod: $Id: os.h 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/
@ -31,7 +30,7 @@
# ifdef __GNUC__ # ifdef __GNUC__
# define STIN static __inline__ # define STIN static __inline__
# elif _WIN32 # elif defined(_WIN32)
# define STIN static __inline # define STIN static __inline
# else # else
# define STIN static # define STIN static

1
thirdparty/libvorbis/psy.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: psychoacoustics not including preecho function: psychoacoustics not including preecho
last mod: $Id: psy.c 18077 2011-09-02 02:49:00Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/psy.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: random psychoacoustics (not including preecho) function: random psychoacoustics (not including preecho)
last mod: $Id: psy.h 16946 2010-03-03 16:12:40Z xiphmont $
********************************************************************/ ********************************************************************/

65
thirdparty/libvorbis/psytune.c vendored
View File

@ -12,7 +12,6 @@
function: simple utility that runs audio through the psychoacoustics function: simple utility that runs audio through the psychoacoustics
without encoding without encoding
last mod: $Id: psytune.c 16037 2009-05-26 21:10:58Z xiphmont $
********************************************************************/ ********************************************************************/
@ -41,11 +40,11 @@
static vorbis_info_psy_global _psy_set0G={ static vorbis_info_psy_global _psy_set0G={
0, /* decaydBpms */ 0, /* decaydBpms */
8, /* lines per eighth octave */ 8, /* lines per eighth octave */
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */ /* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f, 256, {26.f,26.f,26.f,30.f}, {-90.f,-90.f,-90.f,-90.f}, -90.f,
-6.f, -6.f,
0, 0,
0., 0.,
@ -68,7 +67,7 @@ static vp_couple _vp_couple0[]={
static vorbis_info_psy _psy_set0={ static vorbis_info_psy _psy_set0={
ATH_Bark_dB_lineaggressive, ATH_Bark_dB_lineaggressive,
-100.f, -100.f,
-140.f, -140.f,
6.f, /* floor master att */ 6.f, /* floor master att */
@ -148,7 +147,7 @@ static vorbis_info_psy _psy_set0={
.900f, 0.f, /*11500*/ .900f, 0.f, /*11500*/
.900f, 1.f, /*16000*/ .900f, 1.f, /*16000*/
}, },
95.f, /* even decade + 5 is important; saves an rint() later in a 95.f, /* even decade + 5 is important; saves an rint() later in a
tight loop) */ tight loop) */
-44., -44.,
@ -159,7 +158,7 @@ static vorbis_info_psy _psy_set0={
static vorbis_info_floor1 _floor_set0={1, static vorbis_info_floor1 _floor_set0={1,
{0}, {0},
{32}, {32},
{0}, {0},
{0}, {0},
@ -171,12 +170,12 @@ static vorbis_info_floor1 _floor_set0={1,
88,31,243, 88,31,243,
14,54,143,460, 14,54,143,460,
6,3,10, 22,18,26, 41,36,47, 6,3,10, 22,18,26, 41,36,47,
69,61,78, 112,99,126, 185,162,211, 69,61,78, 112,99,126, 185,162,211,
329,282,387, 672,553,825 329,282,387, 672,553,825
}, },
60,30,400, 60,30,400,
20,8,1,18., 20,8,1,18.,
20,600, 20,600,
@ -184,8 +183,8 @@ static vorbis_info_floor1 _floor_set0={1,
static vorbis_info_mapping0 mapping_info={1,{0,1},{0},{0},{0},0, 1, {0},{1}}; static vorbis_info_mapping0 mapping_info={1,{0,1},{0},{0},{0},0, 1, {0},{1}};
static codec_setup_info codec_setup0={ {0,0}, static codec_setup_info codec_setup0={ {0,0},
1,1,1,1,1,0,1, 1,1,1,1,1,0,1,
{NULL}, {NULL},
{0},{&mapping_info}, {0},{&mapping_info},
{0},{NULL}, {0},{NULL},
@ -194,7 +193,7 @@ static codec_setup_info codec_setup0={ {0,0},
{NULL}, {NULL},
{&_psy_set0}, {&_psy_set0},
&_psy_set0G}; &_psy_set0G};
static int noisy=0; static int noisy=0;
void analysis(char *base,int i,float *v,int n,int bark,int dB){ void analysis(char *base,int i,float *v,int n,int bark,int dB){
if(noisy){ if(noisy){
@ -212,7 +211,7 @@ void analysis(char *base,int i,float *v,int n,int bark,int dB){
fprintf(of,"%g ",toBARK(22050.f*j/n)); fprintf(of,"%g ",toBARK(22050.f*j/n));
else else
fprintf(of,"%g ",(float)j); fprintf(of,"%g ",(float)j);
if(dB){ if(dB){
fprintf(of,"%g\n",todB(v+j)); fprintf(of,"%g\n",todB(v+j));
}else{ }else{
@ -269,7 +268,7 @@ int main(int argc,char *argv[]){
framesize=atoi(argv[0]); framesize=atoi(argv[0]);
argv++; argv++;
} }
vi.channels=2; vi.channels=2;
vi.codec_setup=&codec_setup0; vi.codec_setup=&codec_setup0;
@ -292,7 +291,7 @@ int main(int argc,char *argv[]){
/* we cheat on the WAV header; we just bypass 44 bytes and never /* we cheat on the WAV header; we just bypass 44 bytes and never
verify that it matches 16bit/stereo/44.1kHz. */ verify that it matches 16bit/stereo/44.1kHz. */
fread(buffer,1,44,stdin); fread(buffer,1,44,stdin);
fwrite(buffer,1,44,stdout); fwrite(buffer,1,44,stdout);
memset(buffer,0,framesize*2); memset(buffer,0,framesize*2);
@ -302,10 +301,10 @@ int main(int argc,char *argv[]){
fprintf(stderr,"Processing for frame size %d...\n",framesize); fprintf(stderr,"Processing for frame size %d...\n",framesize);
while(!eos){ while(!eos){
long bytes=fread(buffer2,1,framesize*2,stdin); long bytes=fread(buffer2,1,framesize*2,stdin);
if(bytes<framesize*2) if(bytes<framesize*2)
memset(buffer2+bytes,0,framesize*2-bytes); memset(buffer2+bytes,0,framesize*2-bytes);
if(bytes!=0){ if(bytes!=0){
int nonzero[2]; int nonzero[2];
@ -316,10 +315,10 @@ int main(int argc,char *argv[]){
pcm[1][i]=((buffer[i*4+3]<<8)| pcm[1][i]=((buffer[i*4+3]<<8)|
(0x00ff&(int)buffer[i*4+2]))/32768.f; (0x00ff&(int)buffer[i*4+2]))/32768.f;
} }
{ {
float secs=framesize/44100.; float secs=framesize/44100.;
ampmax+=secs*ampmax_att_per_sec; ampmax+=secs*ampmax_att_per_sec;
if(ampmax<-9999)ampmax=-9999; if(ampmax<-9999)ampmax=-9999;
} }
@ -331,11 +330,11 @@ int main(int argc,char *argv[]){
float *logmdct=mdct+framesize/2; float *logmdct=mdct+framesize/2;
analysis("pre",frameno+i,pcm[i],framesize,0,0); analysis("pre",frameno+i,pcm[i],framesize,0,0);
/* fft and mdct transforms */ /* fft and mdct transforms */
for(j=0;j<framesize;j++) for(j=0;j<framesize;j++)
fft[j]=pcm[i][j]*=window[j]; fft[j]=pcm[i][j]*=window[j];
drft_forward(&f_look,fft); drft_forward(&f_look,fft);
local_ampmax[i]=-9999.f; local_ampmax[i]=-9999.f;
@ -347,7 +346,7 @@ int main(int argc,char *argv[]){
if(temp>local_ampmax[i])local_ampmax[i]=temp; if(temp>local_ampmax[i])local_ampmax[i]=temp;
} }
if(local_ampmax[i]>ampmax)ampmax=local_ampmax[i]; if(local_ampmax[i]>ampmax)ampmax=local_ampmax[i];
mdct_forward(&m_look,pcm[i],mdct); mdct_forward(&m_look,pcm[i],mdct);
for(j=0;j<framesize/2;j++) for(j=0;j<framesize/2;j++)
logmdct[j]=todB(mdct+j); logmdct[j]=todB(mdct+j);
@ -391,7 +390,7 @@ int main(int argc,char *argv[]){
logmdct, logmdct,
mask, mask,
logmax, logmax,
flr[i]); flr[i]);
} }
@ -406,7 +405,7 @@ int main(int argc,char *argv[]){
for(j=0;j<framesize/2;j++) for(j=0;j<framesize/2;j++)
if(fabs(pcm[i][j])>1500) if(fabs(pcm[i][j])>1500)
fprintf(stderr,"%ld ",frameno+i); fprintf(stderr,"%ld ",frameno+i);
analysis("res",frameno+i,pcm[i],framesize/2,1,0); analysis("res",frameno+i,pcm[i],framesize/2,1,0);
analysis("codedflr",frameno+i,flr[i],framesize/2,1,1); analysis("codedflr",frameno+i,flr[i],framesize/2,1,1);
} }
@ -416,7 +415,7 @@ int main(int argc,char *argv[]){
&vi, &vi,
pcm, pcm,
nonzero); nonzero);
for(i=0;i<2;i++) for(i=0;i<2;i++)
analysis("quant",frameno+i,pcm[i],framesize/2,1,0); analysis("quant",frameno+i,pcm[i],framesize/2,1,0);
@ -426,7 +425,7 @@ int main(int argc,char *argv[]){
&mapping_info, &mapping_info,
pcm, pcm,
nonzero); nonzero);
for(i=0;i<2;i++) for(i=0;i<2;i++)
analysis("coupled",frameno+i,pcm[i],framesize/2,1,0); analysis("coupled",frameno+i,pcm[i],framesize/2,1,0);
@ -434,11 +433,11 @@ int main(int argc,char *argv[]){
for(i=mapping_info.coupling_steps-1;i>=0;i--){ for(i=mapping_info.coupling_steps-1;i>=0;i--){
float *pcmM=pcm[mapping_info.coupling_mag[i]]; float *pcmM=pcm[mapping_info.coupling_mag[i]];
float *pcmA=pcm[mapping_info.coupling_ang[i]]; float *pcmA=pcm[mapping_info.coupling_ang[i]];
for(j=0;j<framesize/2;j++){ for(j=0;j<framesize/2;j++){
float mag=pcmM[j]; float mag=pcmM[j];
float ang=pcmA[j]; float ang=pcmA[j];
if(mag>0) if(mag>0)
if(ang>0){ if(ang>0){
pcmM[j]=mag; pcmM[j]=mag;
@ -457,7 +456,7 @@ int main(int argc,char *argv[]){
} }
} }
} }
for(i=0;i<2;i++) for(i=0;i<2;i++)
analysis("decoupled",frameno+i,pcm[i],framesize/2,1,0); analysis("decoupled",frameno+i,pcm[i],framesize/2,1,0);
@ -479,7 +478,7 @@ int main(int argc,char *argv[]){
} }
/* write data. Use the part of buffer we're about to shift out */ /* write data. Use the part of buffer we're about to shift out */
for(i=0;i<2;i++){ for(i=0;i<2;i++){
char *ptr=buffer+i*2; char *ptr=buffer+i*2;
@ -503,7 +502,7 @@ int main(int argc,char *argv[]){
ptr+=4; ptr+=4;
} }
} }
fprintf(stderr,"*"); fprintf(stderr,"*");
fwrite(buffer,1,framesize*2,stdout); fwrite(buffer,1,framesize*2,stdout);
memmove(buffer,buffer2,framesize*2); memmove(buffer,buffer2,framesize*2);

1
thirdparty/libvorbis/registry.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: registry for time, floor, res backends and channel mappings function: registry for time, floor, res backends and channel mappings
last mod: $Id: registry.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/registry.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: registry for time, floor, res backends and channel mappings function: registry for time, floor, res backends and channel mappings
last mod: $Id: registry.h 15531 2008-11-24 23:50:06Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/res0.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: residue backend 0, 1 and 2 implementation function: residue backend 0, 1 and 2 implementation
last mod: $Id: res0.c 19441 2015-01-21 01:17:41Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/scales.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: linear scale -> dB, Bark and Mel scales function: linear scale -> dB, Bark and Mel scales
last mod: $Id: scales.h 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

19
thirdparty/libvorbis/sharedbook.c vendored
View File

@ -11,11 +11,11 @@
******************************************************************** ********************************************************************
function: basic shared codebook operations function: basic shared codebook operations
last mod: $Id: sharedbook.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/
#include <stdlib.h> #include <stdlib.h>
#include <limits.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
@ -158,25 +158,34 @@ ogg_uint32_t *_make_words(char *l,long n,long sparsecount){
that's portable and totally safe against roundoff, but I haven't that's portable and totally safe against roundoff, but I haven't
thought of it. Therefore, we opt on the side of caution */ thought of it. Therefore, we opt on the side of caution */
long _book_maptype1_quantvals(const static_codebook *b){ long _book_maptype1_quantvals(const static_codebook *b){
long vals=floor(pow((float)b->entries,1.f/b->dim)); long vals;
if(b->entries<1){
return(0);
}
vals=floor(pow((float)b->entries,1.f/b->dim));
/* the above *should* be reliable, but we'll not assume that FP is /* the above *should* be reliable, but we'll not assume that FP is
ever reliable when bitstream sync is at stake; verify via integer ever reliable when bitstream sync is at stake; verify via integer
means that vals really is the greatest value of dim for which means that vals really is the greatest value of dim for which
vals^b->bim <= b->entries */ vals^b->bim <= b->entries */
/* treat the above as an initial guess */ /* treat the above as an initial guess */
if(vals<1){
vals=1;
}
while(1){ while(1){
long acc=1; long acc=1;
long acc1=1; long acc1=1;
int i; int i;
for(i=0;i<b->dim;i++){ for(i=0;i<b->dim;i++){
if(b->entries/vals<acc)break;
acc*=vals; acc*=vals;
acc1*=vals+1; if(LONG_MAX/(vals+1)<acc1)acc1=LONG_MAX;
else acc1*=vals+1;
} }
if(acc<=b->entries && acc1>b->entries){ if(i>=b->dim && acc<=b->entries && acc1>b->entries){
return(vals); return(vals);
}else{ }else{
if(acc>b->entries){ if(i<b->dim || acc>b->entries){
vals--; vals--;
}else{ }else{
vals++; vals++;

1
thirdparty/libvorbis/smallft.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: *unnormalized* fft transform function: *unnormalized* fft transform
last mod: $Id: smallft.c 16227 2009-07-08 06:58:46Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/smallft.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: fft transform function: fft transform
last mod: $Id: smallft.h 13293 2007-07-24 00:09:47Z xiphmont $
********************************************************************/ ********************************************************************/

3
thirdparty/libvorbis/synthesis.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: single-block PCM synthesis function: single-block PCM synthesis
last mod: $Id: synthesis.c 19441 2015-01-21 01:17:41Z xiphmont $
********************************************************************/ ********************************************************************/
@ -117,7 +116,7 @@ int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op){
if(!ci->mode_param[mode]){ if(!ci->mode_param[mode]){
return(OV_EBADPACKET); return(OV_EBADPACKET);
} }
vb->W=ci->mode_param[mode]->blockflag; vb->W=ci->mode_param[mode]->blockflag;
if(vb->W){ if(vb->W){
vb->lW=oggpack_read(opb,1); vb->lW=oggpack_read(opb,1);

4
thirdparty/libvorbis/tone.c vendored
View File

@ -12,7 +12,7 @@ int main (int argc,char *argv[]){
int i,j; int i,j;
double *f; double *f;
double *amp; double *amp;
if(argc<2)usage(); if(argc<2)usage();
f=alloca(sizeof(*f)*(argc-1)); f=alloca(sizeof(*f)*(argc-1));
@ -21,7 +21,7 @@ int main (int argc,char *argv[]){
i=0; i=0;
while(argv[i+1]){ while(argv[i+1]){
char *pos=strchr(argv[i+1],','); char *pos=strchr(argv[i+1],',');
f[i]=atof(argv[i+1]); f[i]=atof(argv[i+1]);
if(pos) if(pos)
amp[i]=atof(pos+1)*32767.f; amp[i]=atof(pos+1)*32767.f;

1
thirdparty/libvorbis/vorbis/codec.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: libvorbis codec headers function: libvorbis codec headers
last mod: $Id: codec.h 17021 2010-03-24 09:29:41Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/vorbis/vorbisenc.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: vorbis encode-engine setup function: vorbis encode-engine setup
last mod: $Id: vorbisenc.h 17021 2010-03-24 09:29:41Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/vorbis/vorbisfile.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: stdio-based convenience library for opening/seeking/decoding function: stdio-based convenience library for opening/seeking/decoding
last mod: $Id: vorbisfile.h 17182 2010-04-29 03:48:32Z xiphmont $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/vorbisenc.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: simple programmatic interface for encoder mode setup function: simple programmatic interface for encoder mode setup
last mod: $Id: vorbisenc.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/vorbisfile.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: stdio-based convenience library for opening/seeking/decoding function: stdio-based convenience library for opening/seeking/decoding
last mod: $Id: vorbisfile.c 19457 2015-03-03 00:15:29Z giles $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/window.c vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: window functions function: window functions
last mod: $Id: window.c 19028 2013-12-02 23:23:39Z tterribe $
********************************************************************/ ********************************************************************/

1
thirdparty/libvorbis/window.h vendored
View File

@ -11,7 +11,6 @@
******************************************************************** ********************************************************************
function: window functions function: window functions
last mod: $Id: window.h 19028 2013-12-02 23:23:39Z tterribe $
********************************************************************/ ********************************************************************/