summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2014-01-22 08:49:23 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-01-22 08:49:23 -0800
commite0740c1e761d0a2f2823ec499240d48d6a9f7241 (patch)
tree26d93e287ac9cb359cedbd29973d00761ac58751 /vp9
parentc77c5413e06e4cb71bf918ee3a2a62297c108df6 (diff)
parent36406fdb07dfe08df1d49abe36dbf27469e42213 (diff)
downloadlibvpx-e0740c1e761d0a2f2823ec499240d48d6a9f7241.tar
libvpx-e0740c1e761d0a2f2823ec499240d48d6a9f7241.tar.gz
libvpx-e0740c1e761d0a2f2823ec499240d48d6a9f7241.tar.bz2
libvpx-e0740c1e761d0a2f2823ec499240d48d6a9f7241.zip
Merge "Removing unnecessary vp9_clear_system_state() calls."
Diffstat (limited to 'vp9')
-rw-r--r--vp9/encoder/vp9_bitstream.c3
-rw-r--r--vp9/encoder/vp9_encodemv.c8
2 files changed, 2 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 2ab4c7907..7188d7674 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -746,7 +746,6 @@ static void update_coef_probs(VP9_COMP* cpi, vp9_writer* w) {
const TX_MODE tx_mode = cpi->common.tx_mode;
const TX_SIZE max_tx_size = tx_mode_to_biggest_tx_size[tx_mode];
TX_SIZE tx_size;
- vp9_clear_system_state();
for (tx_size = TX_4X4; tx_size <= TX_32X32; ++tx_size)
build_tree_distribution(cpi, tx_size);
@@ -1296,8 +1295,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) {
active_section = 7;
#endif
- vp9_clear_system_state(); // __asm emms;
-
first_part_size = write_compressed_header(cpi, data);
data += first_part_size;
vp9_wb_write_literal(&saved_wb, first_part_size, 16);
diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c
index af710a8f4..853094b29 100644
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -224,13 +224,9 @@ void vp9_encode_mv(VP9_COMP* cpi, vp9_writer* w,
}
}
-void vp9_build_nmv_cost_table(int *mvjoint,
- int *mvcost[2],
+void vp9_build_nmv_cost_table(int *mvjoint, int *mvcost[2],
const nmv_context* const mvctx,
- int usehp,
- int mvc_flag_v,
- int mvc_flag_h) {
- vp9_clear_system_state();
+ int usehp, int mvc_flag_v, int mvc_flag_h) {
vp9_cost_tokens(mvjoint, mvctx->joints, vp9_mv_joint_tree);
if (mvc_flag_v)
build_nmv_component_cost_table(mvcost[0], &mvctx->comps[0], usehp);