comparison atrac3.c @ 5513:9f8219a3b86f libavcodec

use get_bits1(..) instead get_bits(.., 1)
author alex
date Thu, 09 Aug 2007 00:13:31 +0000
parents 2c98d63a8956
children c2ab2ac31edb
comparison
equal deleted inserted replaced
5512:28dcc5cd79d2 5513:9f8219a3b86f
361 int subband_vlc_index[32], SF_idxs[32]; 361 int subband_vlc_index[32], SF_idxs[32];
362 int mantissas[128]; 362 int mantissas[128];
363 float SF; 363 float SF;
364 364
365 numSubbands = get_bits(gb, 5); // number of coded subbands 365 numSubbands = get_bits(gb, 5); // number of coded subbands
366 codingMode = get_bits(gb, 1); // coding Mode: 0 - VLC/ 1-CLC 366 codingMode = get_bits1(gb); // coding Mode: 0 - VLC/ 1-CLC
367 367
368 /* Get the VLC selector table for the subbands, 0 means not coded. */ 368 /* Get the VLC selector table for the subbands, 0 means not coded. */
369 for (cnt = 0; cnt <= numSubbands; cnt++) 369 for (cnt = 0; cnt <= numSubbands; cnt++)
370 subband_vlc_index[cnt] = get_bits(gb, 3); 370 subband_vlc_index[cnt] = get_bits(gb, 3);
371 371
809 /* set the bitstream reader at the start of the second Sound Unit*/ 809 /* set the bitstream reader at the start of the second Sound Unit*/
810 init_get_bits(&q->gb,ptr1,q->bits_per_frame); 810 init_get_bits(&q->gb,ptr1,q->bits_per_frame);
811 811
812 /* Fill the Weighting coeffs delay buffer */ 812 /* Fill the Weighting coeffs delay buffer */
813 memmove(q->weighting_delay,&(q->weighting_delay[2]),4*sizeof(int)); 813 memmove(q->weighting_delay,&(q->weighting_delay[2]),4*sizeof(int));
814 q->weighting_delay[4] = get_bits(&q->gb,1); 814 q->weighting_delay[4] = get_bits1(&q->gb);
815 q->weighting_delay[5] = get_bits(&q->gb,3); 815 q->weighting_delay[5] = get_bits(&q->gb,3);
816 816
817 for (i = 0; i < 4; i++) { 817 for (i = 0; i < 4; i++) {
818 q->matrix_coeff_index_prev[i] = q->matrix_coeff_index_now[i]; 818 q->matrix_coeff_index_prev[i] = q->matrix_coeff_index_now[i];
819 q->matrix_coeff_index_now[i] = q->matrix_coeff_index_next[i]; 819 q->matrix_coeff_index_now[i] = q->matrix_coeff_index_next[i];