Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
e3b604d6
Commit
e3b604d6
authored
Aug 06, 2017
by
Angie Chiang
Browse files
Fix conflict between txmg exp and hbd mode
Change-Id: I5558e18c8c706474df28e51e6ac9f598e0e2ab48
parent
482551b1
Changes
1
Show whitespace changes
Inline
Side-by-side
av1/common/idct.c
View file @
e3b604d6
...
@@ -2247,7 +2247,11 @@ void av1_inverse_transform_block(const MACROBLOCKD *xd,
...
@@ -2247,7 +2247,11 @@ void av1_inverse_transform_block(const MACROBLOCKD *xd,
txfm_param
.
mode
=
mode
;
txfm_param
.
mode
=
mode
;
#endif
#endif
const
int
is_hbd
=
get_bitdepth_data_path_index
(
xd
);
#if CONFIG_TXMG
#if CONFIG_TXMG
if
(
is_hbd
)
{
av1_highbd_inv_txfm_add
(
dqcoeff
,
dst
,
stride
,
&
txfm_param
);
}
else
{
DECLARE_ALIGNED
(
16
,
uint16_t
,
tmp
[
MAX_TX_SQUARE
]);
DECLARE_ALIGNED
(
16
,
uint16_t
,
tmp
[
MAX_TX_SQUARE
]);
int
tmp_stride
=
MAX_TX_SIZE
;
int
tmp_stride
=
MAX_TX_SIZE
;
int
w
=
tx_size_wide
[
tx_size
];
int
w
=
tx_size_wide
[
tx_size
];
...
@@ -2266,8 +2270,8 @@ void av1_inverse_transform_block(const MACROBLOCKD *xd,
...
@@ -2266,8 +2270,8 @@ void av1_inverse_transform_block(const MACROBLOCKD *xd,
dst
[
r
*
stride
+
c
]
=
tmp
[
r
*
tmp_stride
+
c
];
dst
[
r
*
stride
+
c
]
=
tmp
[
r
*
tmp_stride
+
c
];
}
}
}
}
}
#else // CONFIG_TXMG
#else // CONFIG_TXMG
const
int
is_hbd
=
get_bitdepth_data_path_index
(
xd
);
inv_txfm_func
[
is_hbd
](
dqcoeff
,
dst
,
stride
,
&
txfm_param
);
inv_txfm_func
[
is_hbd
](
dqcoeff
,
dst
,
stride
,
&
txfm_param
);
#endif // CONFIG_TXMG
#endif // CONFIG_TXMG
}
}
...
...
Write
Preview
Supports
Markdown
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