Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
b3a12b5e
Commit
b3a12b5e
authored
Mar 23, 2017
by
Angie Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use av1_set_txb_context in block_rd_txfm
Change-Id: Iea2c2ab6f606d6bfc98684dc0b7d32b0a940713f
parent
36aca339
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+5
-11
No files found.
av1/encoder/rdopt.c
View file @
b3a12b5e
...
...
@@ -1475,8 +1475,6 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
};
av1_encode_block_intra(plane, block, blk_row, blk_col, plane_bsize, tx_size,
&b_args);
av1_set_txb_context(x, plane, block, plane_bsize, tx_size,
args->t_above + blk_col, args->t_left + blk_row);
if (args->cpi->sf.use_transform_domain_distortion && !CONFIG_DAALA_DIST) {
dist_block(args->cpi, x, plane, block, blk_row, blk_col, tx_size,
&this_rd_stats.dist, &this_rd_stats.sse);
...
...
@@ -1561,13 +1559,8 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
coeff_ctx, AV1_XFORM_QUANT_FP);
#endif // CONFIG_NEW_QUANT
#if !CONFIG_PVQ
if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id]) {
args->t_above[blk_col] = args->t_left[blk_row] =
(av1_optimize_b(cm, x, plane, block, tx_size, coeff_ctx) > 0);
} else {
args->t_above[blk_col] = (x->plane[plane].eobs[block] > 0);
args->t_left[blk_row] = (x->plane[plane].eobs[block] > 0);
}
if (x->plane[plane].eobs[block] && !xd->lossless[mbmi->segment_id])
av1_optimize_b(cm, x, plane, block, tx_size, coeff_ctx);
#endif // !CONFIG_PVQ
dist_block(args->cpi, x, plane, block, blk_row, blk_col, tx_size,
&this_rd_stats.dist, &this_rd_stats.sse);
...
...
@@ -1587,9 +1580,10 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
#else
this_rd_stats.rate = x->rate;
args->t_above[blk_col] = !x->pvq_skip[plane];
args->t_left[blk_row] = !x->pvq_skip[plane];
#endif // !CONFIG_PVQ
av1_set_txb_context(x, plane, block, plane_bsize, tx_size,
args->t_above + blk_col, args->t_left + blk_row);
rd1 = RDCOST(x->rdmult, x->rddiv, this_rd_stats.rate, this_rd_stats.dist);
rd2 = RDCOST(x->rdmult, x->rddiv, 0, this_rd_stats.sse);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment