Mercurial > libavcodec.hg
diff ac3.c @ 6002:29635f7c3d9c libavcodec
cosmetics: rename ac3 tables
| author | jbr |
|---|---|
| date | Sun, 09 Dec 2007 03:21:33 +0000 |
| parents | b24bcdd0ae86 |
| children | 608c8e9ac412 |
line wrap: on
line diff
--- a/ac3.c Sat Dec 08 21:21:11 2007 +0000 +++ b/ac3.c Sun Dec 09 03:21:33 2007 +0000 @@ -72,7 +72,7 @@ for(i=j;i<end1;i++) { /* logadd */ int adr = FFMIN(FFABS(v - psd[j]) >> 1, 255); - v = FFMAX(v, psd[j]) + ff_ac3_latab[adr]; + v = FFMAX(v, psd[j]) + ff_ac3_log_add_tab[adr]; j++; } bndpsd[k]=v; @@ -149,7 +149,7 @@ if (tmp > 0) { excite[bin] += tmp >> 2; } - mask[bin] = FFMAX(ff_ac3_hth[bin >> s->halfratecod][s->fscod], excite[bin]); + mask[bin] = FFMAX(ff_ac3_hearing_threshold_tab[bin >> s->halfratecod][s->fscod], excite[bin]); } /* delta bit allocation */ @@ -187,10 +187,10 @@ j = masktab[start]; do { v = (FFMAX(mask[j] - snroffset - floor, 0) & 0x1FE0) + floor; - end1 = FFMIN(bndtab[j] + ff_ac3_bndsz[j], end); + end1 = FFMIN(bndtab[j] + ff_ac3_critical_band_size_tab[j], end); for (k = i; k < end1; k++) { address = av_clip((psd[i] - v) >> 5, 0, 63); - bap[i] = ff_ac3_baptab[address]; + bap[i] = ff_ac3_bap_tab[address]; i++; } } while (end > bndtab[j++]); @@ -231,7 +231,7 @@ l = 0; for(i=0;i<50;i++) { bndtab[i] = l; - v = ff_ac3_bndsz[i]; + v = ff_ac3_critical_band_size_tab[i]; for(j=0;j<v;j++) masktab[k++]=i; l += v; }
