shithub: libvpx

Info  •  Files  •  Log  •  Branches

Revert "Removing unnecessary vp9_clear_system_state() calls."

This reverts commit 36406fdb07dfe08df1d49abe36dbf27469e42213.

Change-Id: I0bd31d03ce2a562d0624f2cd67593d0d25df4a54

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -746,6 +746,7 @@

   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);

@@ -1294,6 +1295,8 @@

   else

     active_section = 7;

 #endif

+

+  vp9_clear_system_state();  // __asm emms;

   first_part_size = write_compressed_header(cpi, data);

   data += first_part_size;

--- a/vp9/encoder/vp9_encodemv.c

+++ b/vp9/encoder/vp9_encodemv.c

@@ -224,9 +224,13 @@

   }

 }

-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) {

+                              int usehp,

+                              int mvc_flag_v,

+                              int mvc_flag_h) {

+  vp9_clear_system_state();

   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);