Mercurial > libavcodec.hg
changeset 12257:ad42f9293ec6 libavcodec
aacenc: Factorize some scalefactor utilities.
| author | alexc |
|---|---|
| date | Fri, 23 Jul 2010 22:37:42 +0000 |
| parents | 6e6c92d36c4b |
| children | 86d6c00756cc |
| files | aaccoder.c |
| diffstat | 1 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/aaccoder.c Fri Jul 23 21:46:30 2010 +0000 +++ b/aaccoder.c Fri Jul 23 22:37:42 2010 +0000 @@ -515,6 +515,16 @@ } } +/** Return the minimum scalefactor where the quantized coef does not clip. */ +static av_always_inline uint8_t coef2minsf(float coef) { + return av_clip_uint8(log2(coef)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); +} + +/** Return the maximum scalefactor where the quantized coef is not zero. */ +static av_always_inline uint8_t coef2maxsf(float coef) { + return av_clip_uint8(log2(coef)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); +} + typedef struct TrellisPath { float cost; int prev; @@ -554,9 +564,9 @@ } //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped - q0 = av_clip_uint8(log2(q0f)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); + q0 = coef2minsf(q0f); //maximum scalefactor index is when maximum coefficient after quantizing is still not zero - q1 = av_clip_uint8(log2(q1f)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); + q1 = coef2maxsf(q1f); //av_log(NULL, AV_LOG_ERROR, "q0 %d, q1 %d\n", q0, q1); if (q1 - q0 > 60) { int q0low = q0; @@ -618,9 +628,9 @@ float minrd = INFINITY; float maxval; //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped - minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); + minscale = coef2minsf(qmin); //maximum scalefactor index is when maximum coefficient after quantizing is still not zero - maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); + maxscale = coef2maxsf(qmax); minscale = av_clip(minscale - q0, 0, TRELLIS_STATES - 1); maxscale = av_clip(maxscale - q0, 0, TRELLIS_STATES); maxval = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], s->scoefs+start);