diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 11:46:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 13:32:09 +0200 |
| commit | cf880ccb6a82476e1b944d5d0e742b63de21283a (patch) | |
| tree | 9e3c9f0b0262aece73f593a520aea7c0c98460eb | |
| parent | 4a58d757de286f49eacb071d12f7e5c6cff61941 (diff) | |
| download | ffmpeg-cf880ccb6a82476e1b944d5d0e742b63de21283a.tar.gz | |
avcodec/error_resilience: Avoid race with updating the error_count
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/error_resilience.c | 13 | ||||
| -rw-r--r-- | libavcodec/error_resilience.h | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 3366db1355..ced0ceb36c 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -27,6 +27,7 @@ #include <limits.h> +#include "libavutil/atomic.h" #include "libavutil/internal.h" #include "avcodec.h" #include "error_resilience.h" @@ -813,20 +814,20 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, mask &= ~VP_START; if (status & (ER_AC_ERROR | ER_AC_END)) { mask &= ~(ER_AC_ERROR | ER_AC_END); - s->error_count -= end_i - start_i + 1; + avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); } if (status & (ER_DC_ERROR | ER_DC_END)) { mask &= ~(ER_DC_ERROR | ER_DC_END); - s->error_count -= end_i - start_i + 1; + avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); } if (status & (ER_MV_ERROR | ER_MV_END)) { mask &= ~(ER_MV_ERROR | ER_MV_END); - s->error_count -= end_i - start_i + 1; + avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); } if (status & ER_MB_ERROR) { s->error_occurred = 1; - s->error_count = INT_MAX; + avpriv_atomic_int_set(&s->error_count, INT_MAX); } if (mask == ~0x7F) { @@ -839,7 +840,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, } if (end_i == s->mb_num) - s->error_count = INT_MAX; + avpriv_atomic_int_set(&s->error_count, INT_MAX); else { s->error_status_table[end_xy] &= mask; s->error_status_table[end_xy] |= status; @@ -854,7 +855,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, prev_status &= ~ VP_START; if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END)) { s->error_occurred = 1; - s->error_count = INT_MAX; + avpriv_atomic_int_set(&s->error_count, INT_MAX); } } } diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 4e00863ba3..1f52f200f2 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -61,7 +61,8 @@ typedef struct ERContext { int mb_stride; int b8_stride; - int error_count, error_occurred; + volatile int error_count; + int error_occurred; uint8_t *error_status_table; uint8_t *er_temp_buffer; int16_t *dc_val[3]; |