virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/error_resilience: Avoid race with updating the error_count

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-04 11:46:09 +02:00
parent 4a58d757de
commit cf880ccb6a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/error_resilience.c
View File

@ -27,6 +27,7 @@
#include <limits.h> #include <limits.h>
#include "libavutil/atomic.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "avcodec.h" #include "avcodec.h"
#include "error_resilience.h" #include "error_resilience.h"
@ -813,20 +814,20 @@ void ff_er_add_slice(ERContext *s, int startx, int starty,
mask &= ~VP_START; mask &= ~VP_START;
if (status & (ER_AC_ERROR | ER_AC_END)) { if (status & (ER_AC_ERROR | ER_AC_END)) {
mask &= ~(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)) { if (status & (ER_DC_ERROR | ER_DC_END)) {
mask &= ~(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)) { if (status & (ER_MV_ERROR | ER_MV_END)) {
mask &= ~(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) { if (status & ER_MB_ERROR) {
s->error_occurred = 1; s->error_occurred = 1;
s->error_count = INT_MAX; avpriv_atomic_int_set(&s->error_count, INT_MAX);
} }
if (mask == ~0x7F) { if (mask == ~0x7F) {
@ -839,7 +840,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty,
} }
if (end_i == s->mb_num) if (end_i == s->mb_num)
s->error_count = INT_MAX; avpriv_atomic_int_set(&s->error_count, INT_MAX);
else { else {
s->error_status_table[end_xy] &= mask; s->error_status_table[end_xy] &= mask;
s->error_status_table[end_xy] |= status; 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; prev_status &= ~ VP_START;
if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END)) { if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END)) {
s->error_occurred = 1; s->error_occurred = 1;
s->error_count = INT_MAX; avpriv_atomic_int_set(&s->error_count, INT_MAX);
} }
} }
} }

3
libavcodec/error_resilience.h
View File

@ -61,7 +61,8 @@ typedef struct ERContext {
int mb_stride; int mb_stride;
int b8_stride; int b8_stride;
int error_count, error_occurred; volatile int error_count;
int error_occurred;
uint8_t *error_status_table; uint8_t *error_status_table;
uint8_t *er_temp_buffer; uint8_t *er_temp_buffer;
int16_t *dc_val[3]; int16_t *dc_val[3];