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

Removing dummy_packing member from VP9_COMP.

Browse Source 
Change-Id: I571ce84c97087f8a1a36a10058393bfdcefbf72a
This commit is contained in:
Dmitry Kovalev 2014-08-21 17:28:44 -07:00
parent deb8882cca
commit 4ab2241f5b
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/encoder/vp9_encodemv.c
View File

@ -216,7 +216,7 @@ void vp9_encode_mv(VP9_COMP* cpi, vp9_writer* w,
// If auto_mv_step_size is enabled then keep track of the largest // If auto_mv_step_size is enabled then keep track of the largest
// motion vector component used. // motion vector component used.
if (!cpi->dummy_packing && cpi->sf.mv.auto_mv_step_size) { if (cpi->sf.mv.auto_mv_step_size) {
unsigned int maxv = MAX(abs(mv->row), abs(mv->col)) >> 3; unsigned int maxv = MAX(abs(mv->row), abs(mv->col)) >> 3;
cpi->max_mv_magnitude = MAX(maxv, cpi->max_mv_magnitude); cpi->max_mv_magnitude = MAX(maxv, cpi->max_mv_magnitude);
} }

2
vp9/encoder/vp9_encoder.c
View File

@ -1778,7 +1778,6 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
// to recode. // to recode.
if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) { if (cpi->sf.recode_loop >= ALLOW_RECODE_KFARFGF) {
save_coding_context(cpi); save_coding_context(cpi);
cpi->dummy_packing = 1;
if (!cpi->sf.use_nonrd_pick_mode) if (!cpi->sf.use_nonrd_pick_mode)
vp9_pack_bitstream(cpi, dest, size); vp9_pack_bitstream(cpi, dest, size);
@ -2248,7 +2247,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
loopfilter_frame(cpi, cm); loopfilter_frame(cpi, cm);
// build the bitstream // build the bitstream
cpi->dummy_packing = 0;
vp9_pack_bitstream(cpi, dest, size); vp9_pack_bitstream(cpi, dest, size);
if (cm->seg.update_map) if (cm->seg.update_map)

2
vp9/encoder/vp9_encoder.h
View File

@ -370,8 +370,6 @@ typedef struct VP9_COMP {
int droppable; int droppable;
int dummy_packing; /* flag to indicate if packing is dummy */
int initial_width; int initial_width;
int initial_height; int initial_height;