diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-03-11 11:35:38 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-03-11 13:04:50 -0500 |
| commit | 27972d2c1d53a0ff831c1f05d40a3720cf45aec7 (patch) | |
| tree | f3f009add4dfc70fbc1f58060de06878a638c274 /vp8/common/recon.h | |
| parent | 5db0eeea21a33820cb4e0adf171ed60868666bb6 (diff) | |
| download | libvpx-27972d2c1d53a0ff831c1f05d40a3720cf45aec7.tar libvpx-27972d2c1d53a0ff831c1f05d40a3720cf45aec7.tar.gz libvpx-27972d2c1d53a0ff831c1f05d40a3720cf45aec7.tar.bz2 libvpx-27972d2c1d53a0ff831c1f05d40a3720cf45aec7.zip | |
Move build_intra_predictors_mby to RTCD framework
The vp8_build_intra_predictors_mby and vp8_build_intra_predictors_mby_s
functions had global function pointers rather than using the RTCD
framework. This can show up as a potential data race with tools such as
helgrind. See https://bugzilla.mozilla.org/show_bug.cgi?id=640935
for an example.
Change-Id: I29c407f828ac2bddfc039f852f138de5de888534
Diffstat (limited to 'vp8/common/recon.h')
| -rw-r--r-- | vp8/common/recon.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/vp8/common/recon.h b/vp8/common/recon.h index e7df90a71..e608f218c 100644 --- a/vp8/common/recon.h +++ b/vp8/common/recon.h @@ -23,6 +23,9 @@ #define prototype_recon_macroblock(sym) \ void sym(const struct vp8_recon_rtcd_vtable *rtcd, MACROBLOCKD *x) +#define prototype_build_intra_predictors(sym) \ + void sym(MACROBLOCKD *x) + struct vp8_recon_rtcd_vtable; #if ARCH_X86 || ARCH_X86_64 @@ -73,9 +76,23 @@ extern prototype_recon_macroblock(vp8_recon_recon_mb); #endif extern prototype_recon_macroblock(vp8_recon_recon_mby); +#ifndef vp8_recon_build_intra_predictors_mby +#define vp8_recon_build_intra_predictors_mby vp8_build_intra_predictors_mby +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra_predictors_mby); + +#ifndef vp8_recon_build_intra_predictors_mby_s +#define vp8_recon_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s +#endif +extern prototype_build_intra_predictors\ + (vp8_recon_build_intra_predictors_mby_s); + + typedef prototype_copy_block((*vp8_copy_block_fn_t)); typedef prototype_recon_block((*vp8_recon_fn_t)); typedef prototype_recon_macroblock((*vp8_recon_mb_fn_t)); +typedef prototype_build_intra_predictors((*vp8_build_intra_pred_fn_t)); typedef struct vp8_recon_rtcd_vtable { vp8_copy_block_fn_t copy16x16; @@ -86,6 +103,8 @@ typedef struct vp8_recon_rtcd_vtable vp8_recon_fn_t recon4; vp8_recon_mb_fn_t recon_mb; vp8_recon_mb_fn_t recon_mby; + vp8_build_intra_pred_fn_t build_intra_predictors_mby_s; + vp8_build_intra_pred_fn_t build_intra_predictors_mby; } vp8_recon_rtcd_vtable_t; #if CONFIG_RUNTIME_CPU_DETECT |