diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-04-02 14:50:40 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-04-04 16:30:57 -0700 |
| commit | 4c05a051ab574368e552866e28373f8eb03a6f80 (patch) | |
| tree | d7fe5e7e3f1ee500e11387038cdeab04b7a2d81a /vp9/encoder/vp9_encodemb.c | |
| parent | ffc92da4c229a007c2553e95e7bb0b07e863e95e (diff) | |
| download | libvpx-4c05a051ab574368e552866e28373f8eb03a6f80.tar libvpx-4c05a051ab574368e552866e28373f8eb03a6f80.tar.gz libvpx-4c05a051ab574368e552866e28373f8eb03a6f80.tar.bz2 libvpx-4c05a051ab574368e552866e28373f8eb03a6f80.zip | |
Move qcoeff, dqcoeff from BLOCKD to per-plane data
Start grouping data per-plane, as part of refactoring to support
additional planes, and chroma planes with other-than 4:2:0
subsampling.
Change-Id: Idb76a0e23ab239180c818025bae1f36f1608bb23
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 27015773f..a30268886 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -549,9 +549,10 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCKD *const xd = &mb->e_mbd; vp9_token_state tokens[1025][2]; unsigned best_index[1025][2]; + const struct plane_block_idx pb_idx = plane_block_idx(xd, ib); const int16_t *coeff_ptr = mb->coeff + ib * 16; - int16_t *qcoeff_ptr = xd->qcoeff + ib * 16; - int16_t *dqcoeff_ptr = xd->dqcoeff + ib * 16; + int16_t *qcoeff_ptr; + int16_t *dqcoeff_ptr; int eob = xd->eobs[ib], final_eob, sz = 0; const int i0 = 0; int rc, x, next, i; @@ -582,6 +583,8 @@ static void optimize_b(VP9_COMMON *const cm, nzc0 = nzc1 = nzc; #endif + dqcoeff_ptr = BLOCK_OFFSET(xd->plane[pb_idx.plane].dqcoeff, pb_idx.block, 16); + qcoeff_ptr = BLOCK_OFFSET(xd->plane[pb_idx.plane].qcoeff, pb_idx.block, 16); switch (tx_size) { default: case TX_4X4: { |