comparison ac3dec.c @ 7749:f44fc478863f libavcodec

cosmetics: indentation
author jbr
date Sun, 31 Aug 2008 02:32:08 +0000
parents 54bcd7270fd9
children 2994fe74068f
comparison
equal deleted inserted replaced
7748:5044f9b6aadf 7749:f44fc478863f
964 } 964 }
965 965
966 /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */ 966 /* signal-to-noise ratio offsets and fast gains (signal-to-mask ratios) */
967 if(!s->eac3 || !blk){ 967 if(!s->eac3 || !blk){
968 if(s->snr_offset_strategy && get_bits1(gbc)) { 968 if(s->snr_offset_strategy && get_bits1(gbc)) {
969 int snr = 0; 969 int snr = 0;
970 int csnr; 970 int csnr;
971 csnr = (get_bits(gbc, 6) - 15) << 4; 971 csnr = (get_bits(gbc, 6) - 15) << 4;
972 for (i = ch = !cpl_in_use; ch <= s->channels; ch++) { 972 for (i = ch = !cpl_in_use; ch <= s->channels; ch++) {
973 /* snr offset */ 973 /* snr offset */
974 if (ch == i || s->snr_offset_strategy == 2) 974 if (ch == i || s->snr_offset_strategy == 2)
975 snr = (csnr + get_bits(gbc, 4)) << 2; 975 snr = (csnr + get_bits(gbc, 4)) << 2;
976 /* run at least last bit allocation stage if snr offset changes */ 976 /* run at least last bit allocation stage if snr offset changes */
977 if(blk && s->snr_offset[ch] != snr) { 977 if(blk && s->snr_offset[ch] != snr) {
978 bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 1); 978 bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 1);
979 } 979 }
980 s->snr_offset[ch] = snr; 980 s->snr_offset[ch] = snr;
981 981
982 /* fast gain (normal AC-3 only) */ 982 /* fast gain (normal AC-3 only) */
983 if (!s->eac3) { 983 if (!s->eac3) {
984 int prev = s->fast_gain[ch]; 984 int prev = s->fast_gain[ch];
985 s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)]; 985 s->fast_gain[ch] = ff_ac3_fast_gain_tab[get_bits(gbc, 3)];
986 /* run last 2 bit allocation stages if fast gain changes */ 986 /* run last 2 bit allocation stages if fast gain changes */
987 if(blk && prev != s->fast_gain[ch]) 987 if(blk && prev != s->fast_gain[ch])
988 bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); 988 bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2);
989 }
990 } 989 }
990 }
991 } else if (!s->eac3 && !blk) { 991 } else if (!s->eac3 && !blk) {
992 av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n"); 992 av_log(s->avctx, AV_LOG_ERROR, "new snr offsets must be present in block 0\n");
993 return -1; 993 return -1;
994 } 994 }
995 } 995 }
996 996
997 /* fast gain (E-AC-3 only) */ 997 /* fast gain (E-AC-3 only) */
998 if (s->fast_gain_syntax && get_bits1(gbc)) { 998 if (s->fast_gain_syntax && get_bits1(gbc)) {
1020 int sl = get_bits(gbc, 3); 1020 int sl = get_bits(gbc, 3);
1021 /* run last 2 bit allocation stages for coupling channel if 1021 /* run last 2 bit allocation stages for coupling channel if
1022 coupling leak changes */ 1022 coupling leak changes */
1023 if(blk && (fl != s->bit_alloc_params.cpl_fast_leak || 1023 if(blk && (fl != s->bit_alloc_params.cpl_fast_leak ||
1024 sl != s->bit_alloc_params.cpl_slow_leak)) { 1024 sl != s->bit_alloc_params.cpl_slow_leak)) {
1025 bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2); 1025 bit_alloc_stages[CPL_CH] = FFMAX(bit_alloc_stages[CPL_CH], 2);
1026 } 1026 }
1027 s->bit_alloc_params.cpl_fast_leak = fl; 1027 s->bit_alloc_params.cpl_fast_leak = fl;
1028 s->bit_alloc_params.cpl_slow_leak = sl; 1028 s->bit_alloc_params.cpl_slow_leak = sl;
1029 } else if (!s->eac3 && !blk) { 1029 } else if (!s->eac3 && !blk) {
1030 av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n"); 1030 av_log(s->avctx, AV_LOG_ERROR, "new coupling leak info must be present in block 0\n");