From 6a469111d07fb7ddc01f6a19d4bbfee3e20d738e Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 16 Nov 2017 11:50:38 -0800 Subject: [PATCH] libavcodec/error_resilience.h: Use C11 atomics for ERContext error_count. --- libavcodec/error_resilience.c | 22 ++++++++++++---------- libavcodec/error_resilience.h | 3 ++- libavcodec/h264_slice.c | 6 ++++-- libavcodec/mpeg12dec.c | 11 ++++++----- libavcodec/mpegvideo_enc.c | 5 ++++- 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 0c7f29d171..0da5777b52 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -25,6 +25,7 @@ * Error resilience / concealment. */ +#include #include #include "libavutil/atomic.h" @@ -807,7 +808,7 @@ void ff_er_frame_start(ERContext *s) memset(s->error_status_table, ER_MB_ERROR | VP_START | ER_MB_END, s->mb_stride * s->mb_height * sizeof(uint8_t)); - s->error_count = 3 * s->mb_num; + atomic_store(&s->error_count, 3 * s->mb_num); s->error_occurred = 0; } @@ -852,20 +853,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); - avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); + atomic_fetch_add(&s->error_count, start_i - end_i - 1); } if (status & (ER_DC_ERROR | ER_DC_END)) { mask &= ~(ER_DC_ERROR | ER_DC_END); - avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); + atomic_fetch_add(&s->error_count, start_i - end_i - 1); } if (status & (ER_MV_ERROR | ER_MV_END)) { mask &= ~(ER_MV_ERROR | ER_MV_END); - avpriv_atomic_int_add_and_fetch(&s->error_count, start_i - end_i - 1); + atomic_fetch_add(&s->error_count, start_i - end_i - 1); } if (status & ER_MB_ERROR) { s->error_occurred = 1; - avpriv_atomic_int_set(&s->error_count, INT_MAX); + atomic_store(&s->error_count, INT_MAX); } if (mask == ~0x7F) { @@ -878,7 +879,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, } if (end_i == s->mb_num) - avpriv_atomic_int_set(&s->error_count, INT_MAX); + atomic_store(&s->error_count, INT_MAX); else { s->error_status_table[end_xy] &= mask; s->error_status_table[end_xy] |= status; @@ -893,7 +894,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; - avpriv_atomic_int_set(&s->error_count, INT_MAX); + atomic_store(&s->error_count, INT_MAX); } } } @@ -910,10 +911,11 @@ void ff_er_frame_end(ERContext *s) /* We do not support ER of field pictures yet, * though it should not crash if enabled. */ - if (!s->avctx->error_concealment || s->error_count == 0 || + if (!s->avctx->error_concealment || + atomic_load(&s->error_count) == 0 || s->avctx->lowres || !er_supported(s) || - s->error_count == 3 * s->mb_width * + atomic_load(&s->error_count) == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom)) { return; } @@ -927,7 +929,7 @@ void ff_er_frame_end(ERContext *s) if ( mb_x == s->mb_width && s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && (FFALIGN(s->avctx->height, 16)&16) - && s->error_count == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom + 1) + && atomic_load(&s->error_count) == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom + 1) ) { av_log(s->avctx, AV_LOG_DEBUG, "ignoring last missing slice\n"); return; diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 27c2008694..010e64a184 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -19,6 +19,7 @@ #ifndef AVCODEC_ERROR_RESILIENCE_H #define AVCODEC_ERROR_RESILIENCE_H +#include #include #include "avcodec.h" @@ -60,7 +61,7 @@ typedef struct ERContext { ptrdiff_t mb_stride; ptrdiff_t b8_stride; - volatile int error_count; + atomic_int error_count; int error_occurred; uint8_t *error_status_table; uint8_t *er_temp_buffer; diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index da76b9293f..176f8de396 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -25,6 +25,8 @@ * @author Michael Niedermayer */ +#include + #include "libavutil/avassert.h" #include "libavutil/display.h" #include "libavutil/imgutils.h" @@ -2747,7 +2749,7 @@ int ff_h264_execute_decode_slices(H264Context *h) sl = &h->slice_ctx[i]; if (CONFIG_ERROR_RESILIENCE) { - sl->er.error_count = 0; + atomic_store(&sl->er.error_count, 0); } /* make sure none of those slices overlap */ @@ -2771,7 +2773,7 @@ int ff_h264_execute_decode_slices(H264Context *h) h->mb_y = sl->mb_y; if (CONFIG_ERROR_RESILIENCE) { for (i = 1; i < context_count; i++) - h->slice_ctx[0].er.error_count += h->slice_ctx[i].er.error_count; + atomic_fetch_add(&h->slice_ctx[0].er.error_count, atomic_load(&h->slice_ctx[i].er.error_count)); } if (h->postpone_filter) { diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 2b213eebcd..89bb42c353 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -28,6 +28,7 @@ #define UNCHECKED_BITSTREAM_READER 1 #include +#include "libavutil/atomic.h" #include "libavutil/attributes.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" @@ -1986,7 +1987,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg) int mb_y = s->start_mb_y; const int field_pic = s->picture_structure != PICT_FRAME; - s->er.error_count = (3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic; + atomic_store(&s->er.error_count, (3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic); for (;;) { uint32_t start_code; @@ -1996,7 +1997,7 @@ static int slice_decode_thread(AVCodecContext *c, void *arg) emms_c(); ff_dlog(c, "ret:%d resync:%d/%d mb:%d/%d ts:%d/%d ec:%d\n", ret, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, - s->start_mb_y, s->end_mb_y, s->er.error_count); + s->start_mb_y, s->end_mb_y, atomic_load(&s->er.error_count)); if (ret < 0) { if (c->err_recognition & AV_EF_EXPLODE) return ret; @@ -2479,7 +2480,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, &s2->thread_context[0], NULL, s->slice_count, sizeof(void *)); for (i = 0; i < s->slice_count; i++) - s2->er.error_count += s2->thread_context[i]->er.error_count; + atomic_fetch_add(&s2->er.error_count, atomic_load(&s2->thread_context[i]->er.error_count)); } ret = slice_end(avctx, picture); @@ -2493,7 +2494,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, } s2->pict_type = 0; - if (avctx->err_recognition & AV_EF_EXPLODE && s2->er.error_count) + if (avctx->err_recognition & AV_EF_EXPLODE && atomic_load(&s2->er.error_count)) return AVERROR_INVALIDDATA; return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index); @@ -2547,7 +2548,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, s2->thread_context, NULL, s->slice_count, sizeof(void *)); for (i = 0; i < s->slice_count; i++) - s2->er.error_count += s2->thread_context[i]->er.error_count; + atomic_fetch_add(&s2->er.error_count, atomic_load(&s2->thread_context[i]->er.error_count)); s->slice_count = 0; } if (last_code == 0 || last_code == SLICE_MIN_START_CODE) { diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f1f4989231..73f77f37a9 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3576,6 +3576,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } #define MERGE(field) dst->field += src->field; src->field=0 +#define ATOMIC_MERGE(field) { \ + __typeof__(src->field) tmp = atomic_exchange(&src->field, 0); \ + atomic_fetch_add(&dst->field, tmp); } static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){ MERGE(me.scene_change_score); MERGE(me.mc_mb_var_sum_temp); @@ -3595,7 +3598,7 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(b_count); MERGE(skip_count); MERGE(misc_bits); - MERGE(er.error_count); + ATOMIC_MERGE(er.error_count); MERGE(padding_bug_score); MERGE(current_picture.encoding_error[0]); MERGE(current_picture.encoding_error[1]); -- 2.15.0.448.gf294e3d99a-goog