diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-06-01 08:18:27 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-06-04 07:13:19 -0700 |
| commit | 8bb37dd0696ab3277f637d900da76db2e0dc7b6f (patch) | |
| tree | c3bb7af864eac3663bec85fc924eb2f8070d7ef9 /vp9/common | |
| parent | 877fac122b283455cf699e41e2fd4d455ef122dc (diff) | |
| download | libvpx-8bb37dd0696ab3277f637d900da76db2e0dc7b6f.tar libvpx-8bb37dd0696ab3277f637d900da76db2e0dc7b6f.tar.gz libvpx-8bb37dd0696ab3277f637d900da76db2e0dc7b6f.tar.bz2 libvpx-8bb37dd0696ab3277f637d900da76db2e0dc7b6f.zip | |
Remove cm parameter from vp9_decode_block_tokens() part 2
Change-Id: Iee24b6bb095f748333223e6036fc5c9d9e7e5f1c
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 8 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index c9b359a45..e53e15da9 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -124,9 +124,12 @@ struct macroblockd_plane { int subsampling_y; struct buf_2d dst; struct buf_2d pre[2]; - const int16_t *dequant; ENTROPY_CONTEXT *above_context; ENTROPY_CONTEXT *left_context; + int16_t seg_dequant[MAX_SEGMENTS][2]; + + // encoder + const int16_t *dequant; }; #define BLOCK_OFFSET(x, i) ((x) + (i) * 16) @@ -159,6 +162,9 @@ typedef struct macroblockd { int mb_to_top_edge; int mb_to_bottom_edge; + FRAME_CONTEXT *fc; + int frame_parallel_decoding_mode; + /* pointers to reference frames */ RefBuffer *block_refs[2]; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 188b03d41..045d35049 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -341,6 +341,14 @@ static INLINE void init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd) { xd->plane[i].dqcoeff = xd->dqcoeff; xd->above_context[i] = cm->above_context + i * sizeof(*cm->above_context) * 2 * mi_cols_aligned_to_sb(cm->mi_cols); + + if (xd->plane[i].plane_type == PLANE_TYPE_Y) { + memcpy(xd->plane[i].seg_dequant, cm->y_dequant, sizeof(cm->y_dequant)); + } else { + memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant)); + } + xd->fc = cm->fc; + xd->frame_parallel_decoding_mode = cm->frame_parallel_decoding_mode; } xd->above_seg_context = cm->above_seg_context; |