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
41a36ded
Commit
41a36ded
authored
Mar 23, 2017
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiling for supertx
Change-Id: I0a067e89d544f72d7ce08b0e4cccb77c4c3c9497
parent
1f89d0f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+6
-0
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+4
-3
No files found.
av1/encoder/bitstream.c
View file @
41a36ded
...
...
@@ -2690,6 +2690,7 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
int
skip
;
const
int
bsw
=
mi_size_wide
[
bsize
];
const
int
bsh
=
mi_size_high
[
bsize
];
xd
->
mi
=
cm
->
mi_grid_visible
+
mi_offset
;
supertx_size
=
mbmi
->
tx_size
;
#if CONFIG_DEPENDENT_HORZTILES
...
...
@@ -2711,6 +2712,11 @@ static void write_modes_sb(AV1_COMP *const cpi, const TileInfo *const tile,
get_ext_tx_set
(
supertx_size
,
bsize
,
1
,
cm
->
reduced_tx_set_used
);
if
(
eset
>
0
)
{
#if CONFIG_EC_MULTISYMBOL
#if CONFIG_EC_ADAPT
FRAME_CONTEXT
*
ec_ctx
=
xd
->
tile_ctx
;
#else
FRAME_CONTEXT
*
ec_ctx
=
cm
->
fc
;
#endif
aom_write_symbol
(
w
,
av1_ext_tx_inter_ind
[
eset
][
mbmi
->
tx_type
],
ec_ctx
->
inter_ext_tx_cdf
[
eset
][
supertx_size
],
ext_tx_cnt_inter
[
eset
]);
...
...
av1/encoder/rdopt.c
View file @
41a36ded
...
...
@@ -10819,19 +10819,20 @@ void av1_rd_pick_inter_mode_sb(const AV1_COMP *cpi, TileDataEnc *tile_data,
*returnrate_nocoef -= av1_cost_bit(av1_get_intra_inter_prob(cm, xd),
mbmi->ref_frame[0] != INTRA_FRAME);
#if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
MODE_INFO *const mi = xd->mi[0];
const MOTION_MODE motion_allowed = motion_mode_allowed(
#if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
0, xd->global_motion,
#endif // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
mi);
#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
if (motion_allowed == WARPED_CAUSAL)
#endif // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
*returnrate_nocoef -= cpi->motion_mode_cost[bsize][mbmi->motion_mode];
#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
else if (motion_allowed == OBMC_CAUSAL)
*returnrate_nocoef -=
cpi->motion_mode_cost1[bsize][mbmi->motion_mode];
#else
*returnrate_nocoef -= cpi->motion_mode_cost[bsize][mbmi->motion_mode];
#endif // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
#endif // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
#endif // CONFIG_SUPERTX
...
...
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