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/encoder/encodeframe.c | |
| 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/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 0ced6e7b0..0613b9070 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1184,7 +1184,8 @@ int vp8cx_encode_intra_macro_block(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) int distortion2; x->e_mbd.mode_info_context->mbmi.mode = mode; - vp8_build_intra_predictors_mby_ptr(&x->e_mbd); + RECON_INVOKE(&cpi->common.rtcd.recon, build_intra_predictors_mby) + (&x->e_mbd); distortion2 = VARIANCE_INVOKE(&cpi->rtcd.variance, get16x16prederror)(x->src.y_buffer, x->src.y_stride, x->e_mbd.predictor, 16, 0x7fffffff); rate2 = x->mbmode_cost[x->e_mbd.frame_type][mode]; this_rd = RD_ESTIMATE(x->rdmult, x->rddiv, rate2, distortion2); |