diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-09-17 16:07:08 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-09-17 16:07:08 -0700 |
| commit | 154f1c22349070bba204d94100cf785f14db00da (patch) | |
| tree | a860fb7a08f14a2eec8972ad6750d473eec45856 /vp8/decoder/decodframe.c | |
| parent | eec08d5cfc71678293ee9e63258ebdf5c8aa0e7b (diff) | |
| parent | 648cfcb4375f23a6bec67b84d3677c0db728bae6 (diff) | |
| download | libvpx-154f1c22349070bba204d94100cf785f14db00da.tar libvpx-154f1c22349070bba204d94100cf785f14db00da.tar.gz libvpx-154f1c22349070bba204d94100cf785f14db00da.tar.bz2 libvpx-154f1c22349070bba204d94100cf785f14db00da.zip | |
Merge "Changed setup intra recon to be row based"
Diffstat (limited to 'vp8/decoder/decodframe.c')
| -rw-r--r-- | vp8/decoder/decodframe.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 3eb0d67c2..877eb7738 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -553,6 +553,8 @@ static void decode_mb_rows(VP8D_COMP *pbi) if(pc->filter_level) vp8_loop_filter_frame_init(pc, xd, pc->filter_level); + vp8_setup_intra_recon_top_line(&pc->yv12_fb[dst_fb_idx]); + /* Decode the individual macro block */ for (mb_row = 0; mb_row < pc->mb_rows; mb_row++) { @@ -593,6 +595,10 @@ static void decode_mb_rows(VP8D_COMP *pbi) xd->recon_left_stride[0] = xd->dst.y_stride; xd->recon_left_stride[1] = xd->dst.uv_stride; + setup_intra_recon_left(xd->recon_left[0], xd->recon_left[1], + xd->recon_left[2], xd->dst.y_stride, + xd->dst.uv_stride); + for (mb_col = 0; mb_col < pc->mb_cols; mb_col++) { /* Distance of Mb to the various image edges. @@ -1383,14 +1389,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) } } - - /* set up frame new frame for intra coded blocks */ -#if CONFIG_MULTITHREAD - if (!(pbi->b_multithreaded_rd) || pc->multi_token_partition == ONE_PARTITION || !(pc->filter_level)) -#endif - vp8_setup_intra_recon(&pc->yv12_fb[pc->new_fb_idx]); - - /* clear out the coeff buffer */ vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff)); |