Commit c5fb0eb8 authored by Scott LaVarnway's avatar Scott LaVarnway

Improved subset block search

Improved the subset block search and fill.  (about 3% improvement for
32 bit)  Modified/merged the code in order to create
vp8_read_mb_modes_mv which can decode the modes/mvs on a macroblock
level. This will allow the decode loop (in the future) to decode
modes/mvs on a frame, row, or mb level.

Change-Id: If637d994b508792f846d39b5d44a7bf9aa5cddf3
parent c2140b8a
This diff is collapsed.
......@@ -23,7 +23,7 @@
#include "quant_common.h"
#include "setupintrarecon.h"
#include "demode.h"
#include "decodemv.h"
#include "extend.h"
#include "vpx_mem/vpx_mem.h"
......@@ -151,15 +151,11 @@ static void clamp_mv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
/* A version of the above function for chroma block MVs.*/
static void clamp_uvmv_to_umv_border(MV *mv, const MACROBLOCKD *xd)
{
if (2*mv->col < (xd->mb_to_left_edge - (19 << 3)))
mv->col = (xd->mb_to_left_edge - (16 << 3)) >> 1;
else if (2*mv->col > xd->mb_to_right_edge + (18 << 3))
mv->col = (xd->mb_to_right_edge + (16 << 3)) >> 1;
if (2*mv->row < (xd->mb_to_top_edge - (19 << 3)))
mv->row = (xd->mb_to_top_edge - (16 << 3)) >> 1;
else if (2*mv->row > xd->mb_to_bottom_edge + (18 << 3))
mv->row = (xd->mb_to_bottom_edge + (16 << 3)) >> 1;
mv->col = (2*mv->col < (xd->mb_to_left_edge - (19 << 3))) ? (xd->mb_to_left_edge - (16 << 3)) >> 1 : mv->col;
mv->col = (2*mv->col > xd->mb_to_right_edge + (18 << 3)) ? (xd->mb_to_right_edge + (16 << 3)) >> 1 : mv->col;
mv->row = (2*mv->row < (xd->mb_to_top_edge - (19 << 3))) ? (xd->mb_to_top_edge - (16 << 3)) >> 1 : mv->row;
mv->row = (2*mv->row > xd->mb_to_bottom_edge + (18 << 3)) ? (xd->mb_to_bottom_edge + (16 << 3)) >> 1 : mv->row;
}
static void clamp_mvs(MACROBLOCKD *xd)
......@@ -838,10 +834,8 @@ int vp8_decode_frame(VP8D_COMP *pbi)
// Read the mb_no_coeff_skip flag
pc->mb_no_coeff_skip = (int)vp8_read_bit(bc);
if (pc->frame_type == KEY_FRAME)
vp8_kfread_modes(pbi);
else
vp8_decode_mode_mvs(pbi);
vp8_decode_mode_mvs(pbi);
vpx_memset(pc->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * pc->mb_cols);
......
/*
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "onyxd_int.h"
#include "entropymode.h"
#include "findnearmv.h"
int vp8_read_bmode(vp8_reader *bc, const vp8_prob *p)
{
const int i = vp8_treed_read(bc, vp8_bmode_tree, p);
return i;
}
int vp8_read_ymode(vp8_reader *bc, const vp8_prob *p)
{
const int i = vp8_treed_read(bc, vp8_ymode_tree, p);
return i;
}
int vp8_kfread_ymode(vp8_reader *bc, const vp8_prob *p)
{
const int i = vp8_treed_read(bc, vp8_kf_ymode_tree, p);
return i;
}
int vp8_read_uv_mode(vp8_reader *bc, const vp8_prob *p)
{
const int i = vp8_treed_read(bc, vp8_uv_mode_tree, p);
return i;
}
void vp8_read_mb_features(vp8_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *x)
{
// Is segmentation enabled
if (x->segmentation_enabled && x->update_mb_segmentation_map)
{
// If so then read the segment id.
if (vp8_read(r, x->mb_segment_tree_probs[0]))
mi->segment_id = (unsigned char)(2 + vp8_read(r, x->mb_segment_tree_probs[2]));
else
mi->segment_id = (unsigned char)(vp8_read(r, x->mb_segment_tree_probs[1]));
}
}
void vp8_kfread_modes(VP8D_COMP *pbi)
{
VP8_COMMON *const cp = & pbi->common;
vp8_reader *const bc = & pbi->bc;
MODE_INFO *m = cp->mi;
const int ms = cp->mode_info_stride;
int mb_row = -1;
vp8_prob prob_skip_false = 0;
if (cp->mb_no_coeff_skip)
prob_skip_false = (vp8_prob)(vp8_read_literal(bc, 8));
while (++mb_row < cp->mb_rows)
{
int mb_col = -1;
while (++mb_col < cp->mb_cols)
{
MB_PREDICTION_MODE y_mode;
// Read the Macroblock segmentation map if it is being updated explicitly this frame (reset to 0 above by default)
// By default on a key frame reset all MBs to segment 0
m->mbmi.segment_id = 0;
if (pbi->mb.update_mb_segmentation_map)
vp8_read_mb_features(bc, &m->mbmi, &pbi->mb);
// Read the macroblock coeff skip flag if this feature is in use, else default to 0
if (cp->mb_no_coeff_skip)
m->mbmi.mb_skip_coeff = vp8_read(bc, prob_skip_false);
else
m->mbmi.mb_skip_coeff = 0;
y_mode = (MB_PREDICTION_MODE) vp8_kfread_ymode(bc, cp->kf_ymode_prob);
m->mbmi.ref_frame = INTRA_FRAME;
if ((m->mbmi.mode = y_mode) == B_PRED)
{
int i = 0;
do
{
const B_PREDICTION_MODE A = vp8_above_bmi(m, i, ms)->mode;
const B_PREDICTION_MODE L = vp8_left_bmi(m, i)->mode;
m->bmi[i].mode = (B_PREDICTION_MODE) vp8_read_bmode(bc, cp->kf_bmode_prob [A] [L]);
}
while (++i < 16);
}
else
{
int BMode;
int i = 0;
switch (y_mode)
{
case DC_PRED:
BMode = B_DC_PRED;
break;
case V_PRED:
BMode = B_VE_PRED;
break;
case H_PRED:
BMode = B_HE_PRED;
break;
case TM_PRED:
BMode = B_TM_PRED;
break;
default:
BMode = B_DC_PRED;
break;
}
do
{
m->bmi[i].mode = (B_PREDICTION_MODE)BMode;
}
while (++i < 16);
}
(m++)->mbmi.uv_mode = (MB_PREDICTION_MODE)vp8_read_uv_mode(bc, cp->kf_uv_mode_prob);
}
m++; // skip the border
}
}
/*
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "onyxd_int.h"
/* Read (intra) modes for all blocks in a keyframe */
void vp8_kfread_modes(VP8D_COMP *pbi);
/* Intra mode for a Y subblock */
int vp8_read_bmode(vp8_reader *, const vp8_prob *);
/* MB intra Y mode trees differ for key and inter frames. */
int vp8_read_ymode(vp8_reader *, const vp8_prob *);
int vp8_kfread_ymode(vp8_reader *, const vp8_prob *);
/* MB intra UV mode trees are the same for key and inter frames. */
int vp8_read_uv_mode(vp8_reader *, const vp8_prob *);
/* Read any macroblock-level features that may be present. */
void vp8_read_mb_features(vp8_reader *, MB_MODE_INFO *, MACROBLOCKD *);
......@@ -125,6 +125,12 @@ typedef struct VP8Decompressor
struct vp8_dboolhuff_rtcd_vtable dboolhuff;
#endif
vp8_prob prob_intra;
vp8_prob prob_last;
vp8_prob prob_gf;
vp8_prob prob_skip_false;
} VP8D_COMP;
int vp8_decode_frame(VP8D_COMP *cpi);
......
......@@ -54,14 +54,12 @@ CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder
VP8_DX_SRCS-yes += decoder/dboolhuff.c
VP8_DX_SRCS-yes += decoder/decodemv.c
VP8_DX_SRCS-yes += decoder/decodframe.c
VP8_DX_SRCS-yes += decoder/demode.c
VP8_DX_SRCS-yes += decoder/dequantize.c
VP8_DX_SRCS-yes += decoder/detokenize.c
VP8_DX_SRCS-yes += decoder/generic/dsystemdependent.c
VP8_DX_SRCS-yes += decoder/dboolhuff.h
VP8_DX_SRCS-yes += decoder/decodemv.h
VP8_DX_SRCS-yes += decoder/decoderthreading.h
VP8_DX_SRCS-yes += decoder/demode.h
VP8_DX_SRCS-yes += decoder/dequantize.h
VP8_DX_SRCS-yes += decoder/detokenize.h
VP8_DX_SRCS-yes += decoder/onyxd_int.h
......
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