comparison ac3.c @ 4879:60603c9c89d1 libavcodec

move ac3 tables from a .h to a .c

4878:0e38c828bdae

 * Common code between AC3 encoder and decoder.
 */

#include "avcodec.h"
#include "ac3.h"
#include "ac3tab.h"
#include "bitstream.h"

static inline int calc_lowcomp1(int a, int b0, int b1, int c)
{
    if ((b0 + 256) == b1) {
        a = c;

        j++;
        end1 = FFMIN(bndtab[k+1], end);
        for(i=j;i<end1;i++) {
            /* logadd */
            int adr = FFMIN(FFABS(v - psd[j]) >> 1, 255);
            v = FFMAX(v, psd[j]) + latab[adr];
            j++;
        }
        bndpsd[k]=v;
        k++;
    } while (end > bndtab[k]);

    for (bin = bndstrt; bin < bndend; bin++) {
        tmp = s->dbknee - bndpsd[bin];
        if (tmp > 0) {
            excite[bin] += tmp >> 2;
        }
        mask[bin] = FFMAX(hth[bin >> s->halfratecod][s->fscod], excite[bin]);
    }

    /* delta bit allocation */

    if (deltbae == 0 || deltbae == 1) {

    i = start;
    j = masktab[start];
    do {
        v = (FFMAX(mask[j] - snroffset - floor, 0) & 0x1FE0) + floor;
        end1 = FFMIN(bndtab[j] + bndsz[j], end);
        for (k = i; k < end1; k++) {
            address = av_clip((psd[i] - v) >> 5, 0, 63);
            bap[i] = baptab[address];
            i++;
        }
    } while (end > bndtab[j++]);
}

    /* compute bndtab and masktab from bandsz */
    k = 0;
    l = 0;
    for(i=0;i<50;i++) {
        bndtab[i] = l;
        v = bndsz[i];
        for(j=0;j<v;j++) masktab[k++]=i;
        l += v;
    }
    bndtab[50] = l;
}

4879:60603c9c89d1

 * Common code between AC3 encoder and decoder.
 */

#include "avcodec.h"
#include "ac3.h"
#include "bitstream.h"

static uint8_t bndtab[51];
static uint8_t masktab[253];

static inline int calc_lowcomp1(int a, int b0, int b1, int c)
{
    if ((b0 + 256) == b1) {
        a = c;

        j++;
        end1 = FFMIN(bndtab[k+1], end);
        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];
            j++;
        }
        bndpsd[k]=v;
        k++;
    } while (end > bndtab[k]);

    for (bin = bndstrt; bin < bndend; bin++) {
        tmp = s->dbknee - bndpsd[bin];
        if (tmp > 0) {
            excite[bin] += tmp >> 2;
        }
        mask[bin] = FFMAX(ff_ac3_hth[bin >> s->halfratecod][s->fscod], excite[bin]);
    }

    /* delta bit allocation */

    if (deltbae == 0 || deltbae == 1) {

    i = start;
    j = masktab[start];
    do {
        v = (FFMAX(mask[j] - snroffset - floor, 0) & 0x1FE0) + floor;
        end1 = FFMIN(bndtab[j] + ff_ac3_bndsz[j], end);
        for (k = i; k < end1; k++) {
            address = av_clip((psd[i] - v) >> 5, 0, 63);
            bap[i] = ff_ac3_baptab[address];
            i++;
        }
    } while (end > bndtab[j++]);
}

    /* compute bndtab and masktab from bandsz */
    k = 0;
    l = 0;
    for(i=0;i<50;i++) {
        bndtab[i] = l;
        v = ff_ac3_bndsz[i];
        for(j=0;j<v;j++) masktab[k++]=i;
        l += v;
    }
    bndtab[50] = l;
}