sheepy-clone: comparison misc/libtremor/tremor/info.c

equal deleted inserted replaced

-:78a00bc68913
+:767d3c4153a1
 #include <ctype.h>
 #include "ogg.h"
 #include "ivorbiscodec.h"
 #include "codec_internal.h"
 #include "codebook.h"
-#include "registry.h"
-#include "window.h"
 #include "misc.h"
+#include "os.h"
 /* helpers */
 static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
 while(bytes--){
 *buf++=oggpack_read(o,8);
 for(i=0;i<vc->comments;i++)
 if(vc->user_comments[i])_ogg_free(vc->user_comments[i]);
 if(vc->user_comments)_ogg_free(vc->user_comments);
 	if(vc->comment_lengths)_ogg_free(vc->comment_lengths);
 if(vc->vendor)_ogg_free(vc->vendor);
-memset(vc,0,sizeof(*vc));
+}
-}
+memset(vc,0,sizeof(*vc));
 }
 /* blocksize 0 is guaranteed to be short, 1 is guarantted 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=(codec_setup_info *)vi->codec_setup;
 int i;
 if(ci){
-for(i=0;i<ci->modes;i++)
+if(ci->mode_param)_ogg_free(ci->mode_param);
-if(ci->mode_param[i])_ogg_free(ci->mode_param[i]);
+if(ci->map_param){
 for(i=0;i<ci->maps;i++) /* unpack does the range checking */
-if(ci->map_param[i])
+	mapping_clear_info(ci->map_param+i);
-	_mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]);
+_ogg_free(ci->map_param);
+}
-for(i=0;i<ci->floors;i++) /* unpack does the range checking */
-if(ci->floor_param[i])
+if(ci->floor_param){
-	_floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]);
+for(i=0;i<ci->floors;i++) /* unpack does the range checking */
+	if(ci->floor_type[i])
-for(i=0;i<ci->residues;i++) /* unpack does the range checking */
+	  floor1_free_info(ci->floor_param[i]);
-if(ci->residue_param[i])
+	else
-	_residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]);
+	  floor0_free_info(ci->floor_param[i]);
+_ogg_free(ci->floor_param);
-for(i=0;i<ci->books;i++){
+_ogg_free(ci->floor_type);
-if(ci->book_param[i]){
+}
-	/* knows if the book was not alloced */
-	vorbis_staticbook_destroy(ci->book_param[i]);
+if(ci->residue_param){
-}
+for(i=0;i<ci->residues;i++) /* unpack does the range checking */
-if(ci->fullbooks)
+	res_clear_info(ci->residue_param+i);
-	vorbis_book_clear(ci->fullbooks+i);
+_ogg_free(ci->residue_param);
 }
-if(ci->fullbooks)
-	_ogg_free(ci->fullbooks);
+if(ci->book_param){
+for(i=0;i<ci->books;i++)
+	vorbis_book_clear(ci->book_param+i);
+_ogg_free(ci->book_param);
+}
 _ogg_free(ci);
 }
 memset(vi,0,sizeof(*vi));
 int i;
 if(!ci)return(OV_EFAULT);
 /* codebooks */
 ci->books=oggpack_read(opb,8)+1;
-/*ci->book_param=_ogg_calloc(ci->books,sizeof(*ci->book_param));*/
+ci->book_param=(codebook *)_ogg_calloc(ci->books,sizeof(*ci->book_param));
-for(i=0;i<ci->books;i++){
+for(i=0;i<ci->books;i++)
-ci->book_param[i]=(static_codebook *)_ogg_calloc(1,sizeof(*ci->book_param[i]));
+if(vorbis_book_unpack(opb,ci->book_param+i))goto err_out;
-if(vorbis_staticbook_unpack(opb,ci->book_param[i]))goto err_out;
-}
+/* time backend settings, not actually used */
+i=oggpack_read(opb,6);
-/* time backend settings */
+for(;i>=0;i--)
-ci->times=oggpack_read(opb,6)+1;
+if(oggpack_read(opb,16)!=0)goto err_out;
-/*ci->time_type=_ogg_malloc(ci->times*sizeof(*ci->time_type));*/
-/*ci->time_param=_ogg_calloc(ci->times,sizeof(void *));*/
-for(i=0;i<ci->times;i++){
-ci->time_type[i]=oggpack_read(opb,16);
-if(ci->time_type[i]<0 || ci->time_type[i]>=VI_TIMEB)goto err_out;
-/* ci->time_param[i]=_time_P[ci->time_type[i]]->unpack(vi,opb);
-Vorbis I has no time backend */
-/*if(!ci->time_param[i])goto err_out;*/
-}
 /* floor backend settings */
 ci->floors=oggpack_read(opb,6)+1;
-/*ci->floor_type=_ogg_malloc(ci->floors*sizeof(*ci->floor_type));*/
+ci->floor_param=_ogg_malloc(sizeof(*ci->floor_param)*ci->floors);
-/*ci->floor_param=_ogg_calloc(ci->floors,sizeof(void *));*/
+ci->floor_type=_ogg_malloc(sizeof(*ci->floor_type)*ci->floors);
 for(i=0;i<ci->floors;i++){
 ci->floor_type[i]=oggpack_read(opb,16);
 if(ci->floor_type[i]<0 || ci->floor_type[i]>=VI_FLOORB)goto err_out;
-ci->floor_param[i]=_floor_P[ci->floor_type[i]]->unpack(vi,opb);
+if(ci->floor_type[i])
+ci->floor_param[i]=floor1_info_unpack(vi,opb);
+else
+ci->floor_param[i]=floor0_info_unpack(vi,opb);
 if(!ci->floor_param[i])goto err_out;
 }
 /* residue backend settings */
 ci->residues=oggpack_read(opb,6)+1;
-/*ci->residue_type=_ogg_malloc(ci->residues*sizeof(*ci->residue_type));*/
+ci->residue_param=_ogg_malloc(sizeof(*ci->residue_param)*ci->residues);
-/*ci->residue_param=_ogg_calloc(ci->residues,sizeof(void *));*/
+for(i=0;i<ci->residues;i++)
-for(i=0;i<ci->residues;i++){
+if(res_unpack(ci->residue_param+i,vi,opb))goto err_out;
-ci->residue_type[i]=oggpack_read(opb,16);
-if(ci->residue_type[i]<0 || ci->residue_type[i]>=VI_RESB)goto err_out;
-ci->residue_param[i]=_residue_P[ci->residue_type[i]]->unpack(vi,opb);
-if(!ci->residue_param[i])goto err_out;
-}
 /* map backend settings */
 ci->maps=oggpack_read(opb,6)+1;
-/*ci->map_type=_ogg_malloc(ci->maps*sizeof(*ci->map_type));*/
+ci->map_param=_ogg_malloc(sizeof(*ci->map_param)*ci->maps);
-/*ci->map_param=_ogg_calloc(ci->maps,sizeof(void *));*/
 for(i=0;i<ci->maps;i++){
-ci->map_type[i]=oggpack_read(opb,16);
+if(oggpack_read(opb,16)!=0)goto err_out;
-if(ci->map_type[i]<0 || ci->map_type[i]>=VI_MAPB)goto err_out;
+if(mapping_info_unpack(ci->map_param+i,vi,opb))goto err_out;
-ci->map_param[i]=_mapping_P[ci->map_type[i]]->unpack(vi,opb);
-if(!ci->map_param[i])goto err_out;
 }
 /* mode settings */
 ci->modes=oggpack_read(opb,6)+1;
-/*vi->mode_param=_ogg_calloc(vi->modes,sizeof(void *));*/
+ci->mode_param=
+(vorbis_info_mode *)_ogg_malloc(ci->modes*sizeof(*ci->mode_param));
 for(i=0;i<ci->modes;i++){
-ci->mode_param[i]=(vorbis_info_mode *)_ogg_calloc(1,sizeof(*ci->mode_param[i]));
+ci->mode_param[i].blockflag=oggpack_read(opb,1);
-ci->mode_param[i]->blockflag=oggpack_read(opb,1);
+if(oggpack_read(opb,16))goto err_out;
-ci->mode_param[i]->windowtype=oggpack_read(opb,16);
+if(oggpack_read(opb,16))goto err_out;
-ci->mode_param[i]->transformtype=oggpack_read(opb,16);
+ci->mode_param[i].mapping=oggpack_read(opb,8);
-ci->mode_param[i]->mapping=oggpack_read(opb,8);
+if(ci->mode_param[i].mapping>=ci->maps)goto err_out;
-if(ci->mode_param[i]->windowtype>=VI_WINDOWB)goto err_out;
-if(ci->mode_param[i]->transformtype>=VI_WINDOWB)goto err_out;
-if(ci->mode_param[i]->mapping>=ci->maps)goto err_out;
 }
 if(oggpack_read(opb,1)!=1)goto err_out; /* top level EOP check */
 return(0);
 /* The Vorbis header is in three packets; the initial small packet in
 the first page that identifies basic parameters, a second packet
 with bitstream comments and a third packet that holds the
 codebook. */
-int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op){
+int vorbis_dsp_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op){
 oggpack_buffer opb;
 if(op){
 oggpack_readinit(&opb,op->packet);

changeset 7697	767d3c4153a1
parent 6045	9a7cc0f29430
child 7849	a12155461b34