libavcodec.hg: vorbis_dec.c comparison

comparison vorbis_dec.c @ 10251:b9ea1706bf27 libavcodec

Make error return sign consistent.

author	michael
date	Wed, 23 Sep 2009 13:18:29 +0000
parents	6e01bba7a930
children	b9f5f8b8f073

comparison

equal deleted inserted replaced

-:6e01bba7a930
+:b9ea1706bf27
 // Error:
 error:
 av_free(tmp_vlc_bits);
 av_free(tmp_vlc_codes);
-return 1;
+return -1;
 }
 // Process time domain transforms part (unused in Vorbis I)
 static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc) {
 AV_DEBUG(" Vorbis time domain transform %d: %d \n", vorbis_time_count, vorbis_tdtransform);
 if (vorbis_tdtransform) {
 av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n");
-return 1;
+return -1;
 }
 }
 return 0;
 }
 if (floor_setup->data.t1.class_subclasses[j]) {
 int bits=get_bits(gb, 8);
 if (bits>=vc->codebook_count) {
 av_log(vc->avccontext, AV_LOG_ERROR, "Masterbook index %d is out of range.\n", bits);
-return 1;
+return -1;
 }
 floor_setup->data.t1.class_masterbook[j]=bits;
 AV_DEBUG("   masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]);
 }
 for(k=0;k<(1<<floor_setup->data.t1.class_subclasses[j]);++k) {
 int16_t bits=get_bits(gb, 8)-1;
 if (bits!=-1 && bits>=vc->codebook_count) {
 av_log(vc->avccontext, AV_LOG_ERROR, "Subclass book index %d is out of range.\n", bits);
-return 1;
+return -1;
 }
 floor_setup->data.t1.subclass_books[j][k]=bits;
 AV_DEBUG("    book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
 }
 /* zero would result in a div by zero later *
 * 2^0 - 1 == 0                             */
 if (floor_setup->data.t0.amplitude_bits == 0) {
 av_log(vc->avccontext, AV_LOG_ERROR,
 "Floor 0 amplitude bits is 0.\n");
-return 1;
+return -1;
 }
 floor_setup->data.t0.amplitude_offset=get_bits(gb, 8);
 floor_setup->data.t0.num_books=get_bits(gb, 4)+1;
 /* allocate mem for booklist */
 floor_setup->data.t0.book_list=
 av_malloc(floor_setup->data.t0.num_books);
-if(!floor_setup->data.t0.book_list) { return 1; }
+if(!floor_setup->data.t0.book_list) { return -1; }
 /* read book indexes */
 {
 int idx;
 uint_fast8_t book_idx;
 for (idx=0;idx<floor_setup->data.t0.num_books;++idx) {
 book_idx=get_bits(gb, 8);
 if (book_idx>=vc->codebook_count)
-return 1;
+return -1;
 floor_setup->data.t0.book_list[idx]=book_idx;
 if (vc->codebooks[book_idx].dimensions > max_codebook_dim)
 max_codebook_dim=vc->codebooks[book_idx].dimensions;
 }
 }
 /* codebook dim is for padding if codebook dim doesn't *
 * divide order+1 then we need to read more data       */
 floor_setup->data.t0.lsp=
 av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim)
 * sizeof(float));
-if(!floor_setup->data.t0.lsp) { return 1; }
+if(!floor_setup->data.t0.lsp) { return -1; }
 }
 #ifdef V_DEBUG /* debug output parsed headers */
 AV_DEBUG("floor0 order: %u\n", floor_setup->data.t0.order);
 AV_DEBUG("floor0 rate: %u\n", floor_setup->data.t0.rate);
 }
 #endif
 }
 else {
 av_log(vc->avccontext, AV_LOG_ERROR, "Invalid floor type!\n");
-return 1;
+return -1;
 }
 }
 return 0;
 }
 /* Validations to prevent a buffer overflow later. */
 if (res_setup->begin>res_setup->end
 || res_setup->end>vc->blocksize[1]/(res_setup->type==2?1:2)
 || (res_setup->end-res_setup->begin)/res_setup->partition_size>V_MAX_PARTITIONS) {
 av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %d, %d, %d, %d, %d\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1]/2);
-return 1;
+return -1;
 }
 res_setup->classifications=get_bits(gb, 6)+1;
 res_setup->classbook=get_bits(gb, 8);
 if (res_setup->classbook>=vc->codebook_count) {
 av_log(vc->avccontext, AV_LOG_ERROR, "classbook value %d out of range. \n", res_setup->classbook);
-return 1;
+return -1;
 }
 AV_DEBUG("    begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
 res_setup->classifications, res_setup->classbook);
 for(k=0;k<8;++k) {
 if (cascade[j]&(1<<k)) {
 int bits=get_bits(gb, 8);
 if (bits>=vc->codebook_count) {
 av_log(vc->avccontext, AV_LOG_ERROR, "book value %d out of range. \n", bits);
-return 1;
+return -1;
 }
 res_setup->books[j][k]=bits;
 AV_DEBUG("     %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]);
 for(i=0;i<vc->mapping_count;++i) {
 vorbis_mapping *mapping_setup=&vc->mappings[i];
 if (get_bits(gb, 16)) {
 av_log(vc->avccontext, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n");
-return 1;
+return -1;
 }
 if (get_bits1(gb)) {
 mapping_setup->submaps=get_bits(gb, 4)+1;
 } else {
 mapping_setup->submaps=1;
 for(j=0;j<mapping_setup->coupling_steps;++j) {
 mapping_setup->magnitude[j]=get_bits(gb, ilog(vc->audio_channels-1));
 mapping_setup->angle[j]=get_bits(gb, ilog(vc->audio_channels-1));
 if (mapping_setup->magnitude[j]>=vc->audio_channels) {
 av_log(vc->avccontext, AV_LOG_ERROR, "magnitude channel %d out of range. \n", mapping_setup->magnitude[j]);
-return 1;
+return -1;
 }
 if (mapping_setup->angle[j]>=vc->audio_channels) {
 av_log(vc->avccontext, AV_LOG_ERROR, "angle channel %d out of range. \n", mapping_setup->angle[j]);
-return 1;
+return -1;
 }
 }
 } else {
 mapping_setup->coupling_steps=0;
 }
 AV_DEBUG("   %d mapping coupling steps: %d \n", i, mapping_setup->coupling_steps);
 if(get_bits(gb, 2)) {
 av_log(vc->avccontext, AV_LOG_ERROR, "%d. mapping setup data invalid. \n", i);
-return 1; // following spec.
+return -1; // following spec.
 }
 if (mapping_setup->submaps>1) {
 mapping_setup->mux=av_mallocz(vc->audio_channels * sizeof(uint_fast8_t));
 for(j=0;j<vc->audio_channels;++j) {
 mode_setup->windowtype=get_bits(gb, 16); //FIXME check
 mode_setup->transformtype=get_bits(gb, 16); //FIXME check
 mode_setup->mapping=get_bits(gb, 8);
 if (mode_setup->mapping>=vc->mapping_count) {
 av_log(vc->avccontext, AV_LOG_ERROR, "mode mapping value %d out of range. \n", mode_setup->mapping);
-return 1;
+return -1;
 }
 AV_DEBUG(" %d mode: blockflag %d, windowtype %d, transformtype %d, mapping %d \n", i, mode_setup->blockflag, mode_setup->windowtype, mode_setup->transformtype, mode_setup->mapping);
 }
 return 0;
 if ((get_bits(gb, 8)!='v') || (get_bits(gb, 8)!='o') ||
 (get_bits(gb, 8)!='r') || (get_bits(gb, 8)!='b') ||
 (get_bits(gb, 8)!='i') || (get_bits(gb, 8)!='s')) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n");
-return 1;
+return -1;
 }
 if (vorbis_parse_setup_hdr_codebooks(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (codebooks). \n");
-return 2;
+return -2;
 }
 if (vorbis_parse_setup_hdr_tdtransforms(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (time domain transforms). \n");
-return 3;
+return -3;
 }
 if (vorbis_parse_setup_hdr_floors(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (floors). \n");
-return 4;
+return -4;
 }
 if (vorbis_parse_setup_hdr_residues(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (residues). \n");
-return 5;
+return -5;
 }
 if (vorbis_parse_setup_hdr_mappings(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (mappings). \n");
-return 6;
+return -6;
 }
 if (vorbis_parse_setup_hdr_modes(vc)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (modes). \n");
-return 7;
+return -7;
 }
 if (!get_bits1(gb)) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (framing flag). \n");
-return 8; // framing flag bit unset error
+return -8; // framing flag bit unset error
 }
 return 0;
 }
 if ((get_bits(gb, 8)!='v') || (get_bits(gb, 8)!='o') ||
 (get_bits(gb, 8)!='r') || (get_bits(gb, 8)!='b') ||
 (get_bits(gb, 8)!='i') || (get_bits(gb, 8)!='s')) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n");
-return 1;
+return -1;
 }
 vc->version=get_bits_long(gb, 32);    //FIXME check 0
 vc->audio_channels=get_bits(gb, 8);
 if(vc->audio_channels <= 0){
 bl1=get_bits(gb, 4);
 vc->blocksize[0]=(1<<bl0);
 vc->blocksize[1]=(1<<bl1);
 if (bl0>13 || bl0<6 || bl1>13 || bl1<6 || bl1<bl0) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
-return 3;
+return -3;
 }
 // output format int16
 if (vc->blocksize[1]/2 * vc->audio_channels * 2 >
 AVCODEC_MAX_AUDIO_FRAME_SIZE) {
 av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes "
 "output packets too large.\n");
-return 4;
+return -4;
 }
 vc->win[0]=ff_vorbis_vwin[bl0-6];
 vc->win[1]=ff_vorbis_vwin[bl1-6];
 if ((get_bits1(gb)) == 0) {
 av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n");
-return 2;
+return -2;
 }
 vc->channel_residues= av_malloc((vc->blocksize[1]/2)*vc->audio_channels * sizeof(float));
 vc->channel_floors  = av_malloc((vc->blocksize[1]/2)*vc->audio_channels * sizeof(float));
 vc->saved           = av_mallocz((vc->blocksize[1]/4)*vc->audio_channels * sizeof(float));
 return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 1);
 else if (vr->type==0)
 return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 0);
 else {
 av_log(vc->avccontext, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n");
-return 1;
+return -1;
 }
 }
 void vorbis_inverse_coupling(float *mag, float *ang, int blocksize)
 {

Mercurial > libavcodec.hg

comparison vorbis_dec.c @ 10251:b9ea1706bf27 libavcodec