Commit f2408ec9 authored by Diego Biurrun's avatar Diego Biurrun

Give IDCT matrix transpose macro a more descriptive name

This also avoids a macro name clash and related warning on ARM.
parent 291e49d4
...@@ -2904,18 +2904,18 @@ static void init_scan_tables(H264Context *h) ...@@ -2904,18 +2904,18 @@ static void init_scan_tables(H264Context *h)
{ {
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
#define T(x) (x >> 2) | ((x << 2) & 0xF) #define TRANSPOSE(x) (x >> 2) | ((x << 2) & 0xF)
h->zigzag_scan[i] = T(zigzag_scan[i]); h->zigzag_scan[i] = TRANSPOSE(zigzag_scan[i]);
h->field_scan[i] = T(field_scan[i]); h->field_scan[i] = TRANSPOSE(field_scan[i]);
#undef T #undef TRANSPOSE
} }
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
#define T(x) (x >> 3) | ((x & 7) << 3) #define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]); h->zigzag_scan8x8[i] = TRANSPOSE(ff_zigzag_direct[i]);
h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); h->zigzag_scan8x8_cavlc[i] = TRANSPOSE(zigzag_scan8x8_cavlc[i]);
h->field_scan8x8[i] = T(field_scan8x8[i]); h->field_scan8x8[i] = TRANSPOSE(field_scan8x8[i]);
h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); h->field_scan8x8_cavlc[i] = TRANSPOSE(field_scan8x8_cavlc[i]);
#undef T #undef TRANSPOSE
} }
if (h->sps.transform_bypass) { // FIXME same ugly if (h->sps.transform_bypass) { // FIXME same ugly
h->zigzag_scan_q0 = zigzag_scan; h->zigzag_scan_q0 = zigzag_scan;
......
...@@ -1705,10 +1705,10 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) ...@@ -1705,10 +1705,10 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
ff_vp3dsp_init(&s->vp3dsp, avctx->flags); ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
#define T(x) (x >> 3) | ((x & 7) << 3) #define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
s->idct_permutation[i] = T(i); s->idct_permutation[i] = TRANSPOSE(i);
s->idct_scantable[i] = T(ff_zigzag_direct[i]); s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]);
#undef T #undef TRANSPOSE
} }
/* initialize to an impossible value which will force a recalculation /* initialize to an impossible value which will force a recalculation
......
...@@ -664,9 +664,9 @@ av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha) ...@@ -664,9 +664,9 @@ av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
ff_vp3dsp_init(&s->vp3dsp, avctx->flags); ff_vp3dsp_init(&s->vp3dsp, avctx->flags);
ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id); ff_vp56dsp_init(&s->vp56dsp, avctx->codec->id);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
#define T(x) (x >> 3) | ((x & 7) << 3) #define TRANSPOSE(x) (x >> 3) | ((x & 7) << 3)
s->idct_scantable[i] = T(ff_zigzag_direct[i]); s->idct_scantable[i] = TRANSPOSE(ff_zigzag_direct[i]);
#undef T #undef TRANSPOSE
} }
for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) { for (i = 0; i < FF_ARRAY_ELEMS(s->frames); i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment