From patchwork Tue Mar 13 01:49:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 7954 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp214286jad; Mon, 12 Mar 2018 18:49:36 -0700 (PDT) X-Google-Smtp-Source: AG47ELuWXnaob3nOJwWrkVhkEHsdTU6oUdi22dZQwysBjj0hVB4aO4h/UyJ7sgQSy6p7mdq7VuoD X-Received: by 10.28.132.80 with SMTP id g77mr7689581wmd.39.1520905776015; Mon, 12 Mar 2018 18:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520905775; cv=none; d=google.com; s=arc-20160816; b=vsHXR/hstq/MMd9iVwRaibtuGgyGjDirWw3HEuu7puNA1kEoYWCdA+H8OBt3YFJZt7 pbCaqeW7DxokVDHVujZIYOiOTCw77EtfmWb/+rl66mqQ2NIF3QwbQ7OMOwOxBAIWoibW HV52hKqB+7SKod/+jt3Tuul1ECuDIq1kUUC1TQKHNGaQLLq9fgyvnxa8IAii8gQURBgb CqwsYkzjSRnrrgiAg6BIrOyfg7wzucyFzy3fTumfwtG+mFiuqoRj0qDx9PZJQLMxlqIH K0fA9/t1pTx/t4QydtW0mVxQTPcMeYMTxz9yXedqEmK8gQAxs6ojZo1IdOx3xJtH11Bh +zUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=H0dh9pLjsxBS0eiCQtSEKd+H1h43eQZ52LA944soTx0=; b=pP+PGmqxPKke1uzYds/ouLv++9uubDNIX2qkOK+5Cy1/+l206UyR6mqZzpRejefVjq DXT1YxuK27F3fqM3AbZ08Xo/FfuweFfmu1M1lujBEHMPlh1qxxkEZUP+5JYR4JKCuPqF g9k0ZPLm2ZKctyW/ASY5UXlWDf/S+4H6Tqi2JDrIoJ8SChcsllNFeZUl4AoDLLC9zTr5 3qeczi68FoB91U9oCq8zPfJHOFH1CRM0TJVN4s6+C7UnohIb+sTKN+8dmwXSyfosuYC9 jErONlXmoyu34KSPONYcNlFLa2ZhJ+F8ZrXXWRg2nnXq66PidH2kwe+an+IY41Gs57I2 2TrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=HUIWb+el; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x10si3959567wmf.150.2018.03.12.18.49.34; Mon, 12 Mar 2018 18:49:35 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=HUIWb+el; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A75D689C2F; Tue, 13 Mar 2018 03:49:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D9DE689C16 for ; Tue, 13 Mar 2018 03:49:15 +0200 (EET) Received: by mail-pf0-f172.google.com with SMTP id 68so5198953pfx.3 for ; Mon, 12 Mar 2018 18:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BMHueaVb707HdkPKymyC7WuE8FVNn0J57MhysbsjZjE=; b=HUIWb+eljhewwIb2pAenpl7CIFeXqHRbSN+IzI06wkek3dCgVJX9VAMYbYp1/AYX97 NYSlA3Hqpy5OvdU0j0FPsO04gpGO5v1Q9ACv4wS+L5Ysb5ngkm3fmnuwf+msgLvrCDPb bx5UBzCB3C/8Jr0gKf5fqMn7W409/lFh4fgRYkJlTTLOaeP8GWC61Pv7nGr68ADFFow1 M6p3Sk0Z93iv8p2hioaWd0GjFRzOL5LRQ1cWoJeBjwKnNOLYxEUDvfF1sT5HMjhBdLCg LnM750F1G2C+6binbVCHfwoS2i9GKk3KoTquUeq3xHkCZ+gp7kH9YdYQqJeQ9sCeFQf1 I1FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BMHueaVb707HdkPKymyC7WuE8FVNn0J57MhysbsjZjE=; b=Lk93pRkAX2c2T1RNk8bRYiX5dYfqXk2T68k4oPP3tXeitEt/RPJIscMPEv20dXuwEL 9EFGeTw0i2EjSLc5c5JGS/VaPok5w7yR063gAGBhbl4vpJ/HV65j2TgxUluffyDaKP7o 0E4G1y1PIanVoxrv9YsHjIGgkW2d7Cd2pRDs2FCR89hkz/Ei5OM7hKhMk51IfySvGkgD Raz0I7ofYHFvWPzl3lVqebNC/ed6BfrEzjcr567bku/bub8kD9vBAQyWo8wEGK9665gJ 9v6VoaBn0qFcQD7tRJfrESuuayTWkSt20ciEiLnSQ4MGMUTiRTDpXq9PK+eWO0QIlPy2 cgmQ== X-Gm-Message-State: AElRT7GIeG2Uhssn4AvZ/VT7tX4fy4LOxnH7Kx1UguFdSbYlNH6c+uxt acIzHRftMgQcYRHNhh6kEq5NKoVa X-Received: by 10.99.117.26 with SMTP id q26mr6935015pgc.169.1520905764088; Mon, 12 Mar 2018 18:49:24 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id n27sm10044623pgc.40.2018.03.12.18.49.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 18:49:23 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Mar 2018 18:49:19 -0700 Message-Id: <20180313014919.47956-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180311230102.13713-1-atomnuker@gmail.com> References: <20180311230102.13713-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avcodec: fix atomics usage for h264/mpeg error_count X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: michael@niedermayer.cc, Aman Gupta , atomnuker@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavcodec/h264_slice.c | 5 +++-- libavcodec/mpeg12dec.c | 12 +++++++----- libavcodec/mpegvideo_enc.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 90e05ed8f1..b381397b4d 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -2762,7 +2762,7 @@ int ff_h264_execute_decode_slices(H264Context *h) sl = &h->slice_ctx[i]; if (CONFIG_ERROR_RESILIENCE) { - sl->er.error_count = 0; + sl->er.error_count = ATOMIC_VAR_INIT(0); } /* make sure none of those slices overlap */ @@ -2786,7 +2786,8 @@ 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 9e076e89da..5a8570672c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1992,7 +1992,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; + s->er.error_count = ATOMIC_VAR_INIT((3 * (s->end_mb_y - s->start_mb_y) * s->mb_width) >> field_pic); for (;;) { uint32_t start_code; @@ -2002,7 +2002,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; @@ -2485,7 +2485,8 @@ 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); @@ -2499,7 +2500,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); @@ -2553,7 +2554,8 @@ 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 979e138b88..3447c5e87a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3595,7 +3595,8 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) MERGE(b_count); MERGE(skip_count); MERGE(misc_bits); - MERGE(er.error_count); + atomic_fetch_add(&dst->er.error_count, atomic_load(&src->er.error_count)); + atomic_store(&src->er.error_count, 0); MERGE(padding_bug_score); MERGE(current_picture.encoding_error[0]); MERGE(current_picture.encoding_error[1]);