generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removing unused seg0_* vars."

Browse Source
This commit is contained in:
Dmitry Kovalev 2014-04-07 13:16:06 -07:00 committed by Gerrit Code Review
commit 0cb65fe5cc
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vp9/encoder/vp9_encodeframe.c
View File

@ -258,22 +258,6 @@ static void set_offsets(VP9_COMP *cpi, const TileInfo *const tile,
}
vp9_init_plane_quantizers(cpi, x);
if (seg->enabled && cpi->seg0_cnt > 0 &&
!vp9_segfeature_active(seg, 0, SEG_LVL_REF_FRAME) &&
vp9_segfeature_active(seg, 1, SEG_LVL_REF_FRAME)) {
cpi->seg0_progress = (cpi->seg0_idx << 16) / cpi->seg0_cnt;
} else {
const int y = mb_row & ~3;
const int x = mb_col & ~3;
const int p16 = ((mb_row & 1) << 1) + (mb_col & 1);
const int p32 = ((mb_row & 2) << 2) + ((mb_col & 2) << 1);
const int tile_progress = tile->mi_col_start * cm->mb_rows >> 1;
const int mb_cols = (tile->mi_col_end - tile->mi_col_start) >> 1;
cpi->seg0_progress = ((y * mb_cols + x * 4 + p32 + p16 + tile_progress)
<< 16) / cm->MBs;
}
x->encode_breakout = cpi->segment_encode_breakout[mbmi->segment_id];
} else {
mbmi->segment_id = 0;
@ -2414,7 +2398,6 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
const int aligned_mi_cols = mi_cols_aligned_to_sb(cm->mi_cols);
x->act_zbin_adj = 0;
cpi->seg0_idx = 0;
// Copy data over into macro block data structures.
vp9_setup_src_planes(x, cpi->Source, 0, 0);

1
vp9/encoder/vp9_mbgraph.c
View File

@ -370,7 +370,6 @@ static void separate_arf_mbs(VP9_COMP *cpi) {
else
cpi->static_mb_pct = 0;
cpi->seg0_cnt = ncnt[0];
vp9_enable_segmentation(&cm->seg);
} else {
cpi->static_mb_pct = 0;

1
vp9/encoder/vp9_onyx_int.h
View File

@ -394,7 +394,6 @@ typedef struct VP9_COMP {
MBGRAPH_FRAME_STATS mbgraph_stats[MAX_LAG_BUFFERS];
int mbgraph_n_frames; // number of frames filled in the above
int static_mb_pct; // % forced skip mbs by segmentation
int seg0_progress, seg0_idx, seg0_cnt;
// for real time encoding
int speed;