Skip to content
GitLab
Commit f42bee7e authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Don't use BLOCKD in vp9_invtrans.c. 

Change-Id: I40524170334109e2864b06e3c73c8b34e5aa8b0f
parent aeefa6e1
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m29-baseline m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 42 deletions
vp9/common/vp9_invtrans.c
+ 24
− 42
View file @ f42bee7e
...@@ -25,14 +25,15 @@ void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd) { ...@@ -25,14 +25,15 @@ void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd) {
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
TX_TYPE tx_type = get_tx_type_4x4(xd, i); TX_TYPE tx_type = get_tx_type_4x4(xd, i);
const int x = i & 3, y = i >> 2;
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp9_short_iht4x4(BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16), vp9_short_iht4x4(BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16),
xd->block[i].diff, 16, tx_type); xd->diff + 64 * y + 4 * x, 16, tx_type);
} else { } else {
vp9_inverse_transform_b_4x4(xd, vp9_inverse_transform_b_4x4(xd,
xd->plane[0].eobs[i], xd->plane[0].eobs[i],
BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16), BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16),
xd->block[i].diff, 32); xd->diff + 64 * y + 4 * x, 32);
} }
} }
} }
...@@ -40,15 +41,14 @@ void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd) { ...@@ -40,15 +41,14 @@ void vp9_inverse_transform_mby_4x4(MACROBLOCKD *xd) {
void vp9_inverse_transform_mbuv_4x4(MACROBLOCKD *xd) { void vp9_inverse_transform_mbuv_4x4(MACROBLOCKD *xd) {
int i; int i;
for (i = 16; i < 20; i++) { for (i = 0; i < 4; i++) {
vp9_inverse_transform_b_4x4(xd, xd->plane[1].eobs[i - 16], const int y = i >> 1, x = i & 1;
BLOCK_OFFSET(xd->plane[1].dqcoeff, i - 16, 16), vp9_inverse_transform_b_4x4(xd, xd->plane[1].eobs[i],
xd->block[i].diff, 16); BLOCK_OFFSET(xd->plane[1].dqcoeff, i, 16),
} xd->diff + 256 + y * 32 + x * 4, 16);
for (i = 20; i < 24; i++) { vp9_inverse_transform_b_4x4(xd, xd->plane[2].eobs[i],
vp9_inverse_transform_b_4x4(xd, xd->plane[2].eobs[i - 20], BLOCK_OFFSET(xd->plane[2].dqcoeff, i, 16),
BLOCK_OFFSET(xd->plane[2].dqcoeff, i - 20, 16), xd->diff + 320 + y * 32 + x * 4, 16);
xd->block[i].diff, 16);
} }
} }
...@@ -64,42 +64,25 @@ void vp9_inverse_transform_b_8x8(int16_t *input_dqcoeff, int16_t *output_coeff, ...@@ -64,42 +64,25 @@ void vp9_inverse_transform_b_8x8(int16_t *input_dqcoeff, int16_t *output_coeff,
void vp9_inverse_transform_mby_8x8(MACROBLOCKD *xd) { void vp9_inverse_transform_mby_8x8(MACROBLOCKD *xd) {
int i; int i;
BLOCKD *blockd = xd->block;
for (i = 0; i < 9; i += 8) { for (i = 0; i < 4; i++) {
TX_TYPE tx_type = get_tx_type_8x8(xd, i); const int y = i >> 1, x = i & 1;
if (tx_type != DCT_DCT) { TX_TYPE tx_type = get_tx_type_8x8(xd, x * 2 + y * 8);
vp9_short_iht8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16),
xd->block[i].diff, 16, tx_type);
} else {
vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i, 16),
&blockd[i].diff[0], 32);
}
}
for (i = 2; i < 11; i += 8) {
TX_TYPE tx_type = get_tx_type_8x8(xd, i);
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp9_short_iht8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i + 2, 16), vp9_short_iht8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i * 4, 16),
xd->block[i].diff, 16, tx_type); xd->diff + y * 128 + x * 8, 16, tx_type);
} else { } else {
vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i + 2, 16), vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[0].dqcoeff, i * 4, 16),
&blockd[i].diff[0], 32); xd->diff + y * 128 + x * 8, 32);
} }
} }
} }
void vp9_inverse_transform_mbuv_8x8(MACROBLOCKD *xd) { void vp9_inverse_transform_mbuv_8x8(MACROBLOCKD *xd) {
int i; vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[1].dqcoeff, 0, 16),
BLOCKD *blockd = xd->block; xd->diff + 256, 16);
vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[2].dqcoeff, 0, 16),
for (i = 16; i < 20; i += 4) { xd->diff + 320, 16);
vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[1].dqcoeff, i - 16, 16),
&blockd[i].diff[0], 16);
}
for (i = 20; i < 24; i += 4) {
vp9_inverse_transform_b_8x8(BLOCK_OFFSET(xd->plane[2].dqcoeff, i - 20, 16),
&blockd[i].diff[0], 16);
}
} }
void vp9_inverse_transform_mb_8x8(MACROBLOCKD *xd) { void vp9_inverse_transform_mb_8x8(MACROBLOCKD *xd) {
...@@ -113,14 +96,13 @@ void vp9_inverse_transform_b_16x16(int16_t *input_dqcoeff, ...@@ -113,14 +96,13 @@ void vp9_inverse_transform_b_16x16(int16_t *input_dqcoeff,
} }
void vp9_inverse_transform_mby_16x16(MACROBLOCKD *xd) { void vp9_inverse_transform_mby_16x16(MACROBLOCKD *xd) {
BLOCKD *bd = &xd->block[0];
TX_TYPE tx_type = get_tx_type_16x16(xd, 0); TX_TYPE tx_type = get_tx_type_16x16(xd, 0);
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp9_short_iht16x16(BLOCK_OFFSET(xd->plane[0].dqcoeff, 0, 16), vp9_short_iht16x16(BLOCK_OFFSET(xd->plane[0].dqcoeff, 0, 16),
bd->diff, 16, tx_type); xd->diff, 16, tx_type);
} else { } else {
vp9_inverse_transform_b_16x16(BLOCK_OFFSET(xd->plane[0].dqcoeff, 0, 16), vp9_inverse_transform_b_16x16(BLOCK_OFFSET(xd->plane[0].dqcoeff, 0, 16),
&xd->block[0].diff[0], 32); xd->diff, 32);
} }
} }
......
Supports Markdown
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