diff options
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/block.h | 5 | ||||
| -rw-r--r-- | vp8/encoder/encodeframe.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/encodeintra.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/ethreading.c | 5 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/pickinter.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/rdopt.c | 1 | ||||
| -rw-r--r-- | vp8/encoder/temporal_filter.c | 1 |
8 files changed, 0 insertions, 17 deletions
diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 5e5a60db7..0a74ca46d 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -45,10 +45,6 @@ typedef struct unsigned char **base_src; int src; int src_stride; - -// MV enc_mv; - int force_empty; - } BLOCK; typedef struct @@ -107,7 +103,6 @@ typedef struct int mv_row_min; int mv_row_max; - int vector_range; // Used to monitor limiting range of recent vectors to guide search. int skip; int encode_breakout; diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 88868d684..6a9ba291d 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -595,8 +595,6 @@ void init_encode_frame_mb_context(VP8_COMP *cpi) // Activity map pointer x->mb_activity_ptr = cpi->mb_activity_map; - x->vector_range = 32; - x->act_zbin_adj = 0; x->partition_info = x->pi; diff --git a/vp8/encoder/encodeintra.c b/vp8/encoder/encodeintra.c index 4378b634e..16393a1ff 100644 --- a/vp8/encoder/encodeintra.c +++ b/vp8/encoder/encodeintra.c @@ -18,7 +18,6 @@ #include "vp8/common/invtrans.h" #include "vp8/common/recon.h" #include "dct.h" -#include "vp8/common/g_common.h" #include "encodeintra.h" diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index ef8ead588..69655989d 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -302,7 +302,6 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) z->mv_col_max = x->mv_col_max; z->mv_row_min = x->mv_row_min; z->mv_row_max = x->mv_row_max; - z->vector_range = x->vector_range ; */ z->vp8_short_fdct4x4 = x->vp8_short_fdct4x4; @@ -350,8 +349,6 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) z->block[i].src = x->block[i].src; */ z->block[i].src_stride = x->block[i].src_stride; - z->block[i].force_empty = x->block[i].force_empty; - } { @@ -421,8 +418,6 @@ void vp8cx_init_mbrthread_data(VP8_COMP *cpi, #endif mb->gf_active_ptr = x->gf_active_ptr; - mb->vector_range = 32; - vpx_memset(mbr_ei[i].segment_counts, 0, sizeof(mbr_ei[i].segment_counts)); mbr_ei[i].totalrate = 0; diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 6e0254644..e3f951925 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -23,7 +23,6 @@ #include "ratectrl.h" #include "vp8/common/quant_common.h" #include "segmentation.h" -#include "vp8/common/g_common.h" #include "vpx_scale/yv12extend.h" #if CONFIG_POSTPROC #include "vp8/common/postproc.h" diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 31101d12f..46f53a18d 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -21,7 +21,6 @@ #include "vp8/common/reconinter.h" #include "vp8/common/reconintra.h" #include "vp8/common/reconintra4x4.h" -#include "vp8/common/g_common.h" #include "variance.h" #include "mcomp.h" #include "rdopt.h" diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 638fa0c1d..ce979619a 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -28,7 +28,6 @@ #include "encodemb.h" #include "quantize.h" #include "vp8/common/idct.h" -#include "vp8/common/g_common.h" #include "variance.h" #include "mcomp.h" #include "rdopt.h" diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index a773d4391..545e4f205 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -22,7 +22,6 @@ #include "ratectrl.h" #include "vp8/common/quant_common.h" #include "segmentation.h" -#include "vp8/common/g_common.h" #include "vpx_scale/yv12extend.h" #include "vpx_mem/vpx_mem.h" #include "vp8/common/swapyv12buffer.h" |