Skip to content
GitLab
Commit 9cf7a0f0 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Cleaning up optimize_b(). 

Change-Id: I5c62fabd380492740c1c2c0d71861e64ee1b05e8
parent 35c18baa
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 14 deletions
vp9/encoder/vp9_encodemb.c
+ 11
− 14
View file @ 9cf7a0f0
...@@ -105,9 +105,8 @@ static int trellis_get_coeff_context(const int16_t *scan, ...@@ -105,9 +105,8 @@ static int trellis_get_coeff_context(const int16_t *scan,
return pt; return pt;
} }
static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize, static int optimize_b(MACROBLOCK *mb, int plane, int block,
TX_SIZE tx_size, MACROBLOCK *mb, BLOCK_SIZE plane_bsize, TX_SIZE tx_size, int ctx) {
ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l) {
MACROBLOCKD *const xd = &mb->e_mbd; MACROBLOCKD *const xd = &mb->e_mbd;
struct macroblock_plane *p = &mb->plane[plane]; struct macroblock_plane *p = &mb->plane[plane];
struct macroblockd_plane *pd = &xd->plane[plane]; struct macroblockd_plane *pd = &xd->plane[plane];
...@@ -172,12 +171,10 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize, ...@@ -172,12 +171,10 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize,
if (next < default_eob) { if (next < default_eob) {
band = band_translate[i + 1]; band = band_translate[i + 1];
pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache); pt = trellis_get_coeff_context(scan, nb, i, t0, token_cache);
rate0 += rate0 += mb->token_costs[tx_size][type][ref][band][0][pt]
mb->token_costs[tx_size][type][ref][band][0][pt] [tokens[next][0].token];
[tokens[next][0].token]; rate1 += mb->token_costs[tx_size][type][ref][band][0][pt]
rate1 += [tokens[next][1].token];
mb->token_costs[tx_size][type][ref][band][0][pt]
[tokens[next][1].token];
} }
UPDATE_RD_COST(); UPDATE_RD_COST();
/* And pick the best. */ /* And pick the best. */
...@@ -274,15 +271,14 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize, ...@@ -274,15 +271,14 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize,
/* Now pick the best path through the whole trellis. */ /* Now pick the best path through the whole trellis. */
band = band_translate[i + 1]; band = band_translate[i + 1];
pt = combine_entropy_contexts(*a, *l);
rate0 = tokens[next][0].rate; rate0 = tokens[next][0].rate;
rate1 = tokens[next][1].rate; rate1 = tokens[next][1].rate;
error0 = tokens[next][0].error; error0 = tokens[next][0].error;
error1 = tokens[next][1].error; error1 = tokens[next][1].error;
t0 = tokens[next][0].token; t0 = tokens[next][0].token;
t1 = tokens[next][1].token; t1 = tokens[next][1].token;
rate0 += mb->token_costs[tx_size][type][ref][band][0][pt][t0]; rate0 += mb->token_costs[tx_size][type][ref][band][0][ctx][t0];
rate1 += mb->token_costs[tx_size][type][ref][band][0][pt][t1]; rate1 += mb->token_costs[tx_size][type][ref][band][0][ctx][t1];
UPDATE_RD_COST(); UPDATE_RD_COST();
best = rd_cost1 < rd_cost0; best = rd_cost1 < rd_cost0;
final_eob = i0 - 1; final_eob = i0 - 1;
...@@ -303,7 +299,7 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize, ...@@ -303,7 +299,7 @@ static void optimize_b(int plane, int block, BLOCK_SIZE plane_bsize,
final_eob++; final_eob++;
mb->plane[plane].eobs[block] = final_eob; mb->plane[plane].eobs[block] = final_eob;
*a = *l = (final_eob > 0); return final_eob;
} }
static INLINE void fdct32x32(int rd_transform, static INLINE void fdct32x32(int rd_transform,
...@@ -393,7 +389,8 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize, ...@@ -393,7 +389,8 @@ static void encode_block(int plane, int block, BLOCK_SIZE plane_bsize,
vp9_xform_quant(x, plane, block, plane_bsize, tx_size); vp9_xform_quant(x, plane, block, plane_bsize, tx_size);
if (x->optimize && (!x->skip_recode || !x->skip_optimize)) { if (x->optimize && (!x->skip_recode || !x->skip_optimize)) {
optimize_b(plane, block, plane_bsize, tx_size, x, a, l); const int ctx = combine_entropy_contexts(*a, *l);
*a = *l = optimize_b(x, plane, block, plane_bsize, tx_size, ctx) > 0;
} else { } else {
*a = *l = p->eobs[block] > 0; *a = *l = p->eobs[block] > 0;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment