comparison vp8.c @ 12240:e6ade5e849c9 libavcodec

VP8: Clean up some variable shadowing.

12239:13b1ad24a4b1

    }
}

static void idct_mb(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb)
{
    int x, y, ch, nnz;

    if (mb->mode != MODE_I4x4) {
        uint8_t *y_dst = dst[0];
        for (y = 0; y < 4; y++) {
            uint32_t nnz = AV_RN32A(s->non_zero_count_cache[y]);
            if (nnz) {
                if (nnz&~0x01010101) {
                    for (x = 0; x < 4; x++) {
                        nnz = s->non_zero_count_cache[y][x];
                        if (nnz) {
                            if (nnz == 1)
                                s->vp8dsp.vp8_idct_dc_add(y_dst+4*x, s->block[y][x], s->linesize);
                            else
                                s->vp8dsp.vp8_idct_add(y_dst+4*x, s->block[y][x], s->linesize);

    for (ch = 0; ch < 2; ch++) {
        if (AV_RN32A(s->non_zero_count_cache[4+ch])) {
            uint8_t *ch_dst = dst[1+ch];
            for (y = 0; y < 2; y++) {
                for (x = 0; x < 2; x++) {
                    nnz = s->non_zero_count_cache[4+ch][(y<<1)+x];
                    if (nnz) {
                        if (nnz == 1)
                            s->vp8dsp.vp8_idct_dc_add(ch_dst+4*x, s->block[4+ch][(y<<1)+x], s->uvlinesize);
                        else
                            s->vp8dsp.vp8_idct_add(ch_dst+4*x, s->block[4+ch][(y<<1)+x], s->uvlinesize);

12240:e6ade5e849c9

    }
}

static void idct_mb(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb)
{
    int x, y, ch;

    if (mb->mode != MODE_I4x4) {
        uint8_t *y_dst = dst[0];
        for (y = 0; y < 4; y++) {
            uint32_t nnz4 = AV_RN32A(s->non_zero_count_cache[y]);
            if (nnz4) {
                if (nnz4&~0x01010101) {
                    for (x = 0; x < 4; x++) {
                        int nnz = s->non_zero_count_cache[y][x];
                        if (nnz) {
                            if (nnz == 1)
                                s->vp8dsp.vp8_idct_dc_add(y_dst+4*x, s->block[y][x], s->linesize);
                            else
                                s->vp8dsp.vp8_idct_add(y_dst+4*x, s->block[y][x], s->linesize);

    for (ch = 0; ch < 2; ch++) {
        if (AV_RN32A(s->non_zero_count_cache[4+ch])) {
            uint8_t *ch_dst = dst[1+ch];
            for (y = 0; y < 2; y++) {
                for (x = 0; x < 2; x++) {
                    int nnz = s->non_zero_count_cache[4+ch][(y<<1)+x];
                    if (nnz) {
                        if (nnz == 1)
                            s->vp8dsp.vp8_idct_dc_add(ch_dst+4*x, s->block[4+ch][(y<<1)+x], s->uvlinesize);
                        else
                            s->vp8dsp.vp8_idct_add(ch_dst+4*x, s->block[4+ch][(y<<1)+x], s->uvlinesize);