shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removes stack allocation of token_cache"

--- a/vp9/encoder/vp9_block.h

+++ b/vp9/encoder/vp9_block.h

@@ -136,7 +136,7 @@

   // note that token_costs is the cost when eob node is skipped

   vp9_coeff_cost token_costs[TX_SIZES];

-  uint8_t token_cache[1024];

+  DECLARE_ALIGNED(16, uint8_t, token_cache[1024]);

   int optimize;

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -81,6 +81,7 @@

   MACROBLOCKD *xd;

   TOKENEXTRA **tp;

   TX_SIZE tx_size;

+  uint8_t *token_cache;

 };

 static void set_entropy_context_b(int plane, int block, BLOCK_SIZE plane_bsize,

@@ -99,6 +100,7 @@

   VP9_COMP *cpi = args->cpi;

   MACROBLOCKD *xd = args->xd;

   TOKENEXTRA **tp = args->tp;

+  uint8_t *token_cache = args->token_cache;

   struct macroblockd_plane *pd = &xd->plane[plane];

   MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi;

   int pt; /* near block/prev token context index */

@@ -113,7 +115,6 @@

   vp9_coeff_count *const counts = cpi->coef_counts[tx_size];

   vp9_coeff_probs_model *const coef_probs = cpi->common.fc.coef_probs[tx_size];

   const int ref = is_inter_block(mbmi);

-  uint8_t token_cache[1024];

   const uint8_t *const band_translate = get_band_translate(tx_size);

   const int seg_eob = get_tx_eob(&cpi->common.seg, segment_id, tx_size);

   int aoff, loff;

@@ -197,7 +198,7 @@

   const int mb_skip_context = vp9_get_pred_context_mbskip(xd);

   const int skip_inc = !vp9_segfeature_active(&cm->seg, mbmi->segment_id,

                                               SEG_LVL_SKIP);

-  struct tokenize_b_args arg = {cpi, xd, t, mbmi->tx_size};

+  struct tokenize_b_args arg = {cpi, xd, t, mbmi->tx_size, cpi->mb.token_cache};

   mbmi->skip_coeff = vp9_sb_is_skippable(xd, bsize);

   if (mbmi->skip_coeff) {