From patchwork Sun Mar 11 22:49:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 7925 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp981167jad; Sun, 11 Mar 2018 15:55:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELtBUUnnO407fC1ZzY2tHqJ8xCvyupknxT4pLLd01xutpa0/hY3DmHXJC7MnIifGD9tpvcdr X-Received: by 10.28.184.8 with SMTP id i8mr4348338wmf.52.1520808933077; Sun, 11 Mar 2018 15:55:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520808933; cv=none; d=google.com; s=arc-20160816; b=rraghq9hUxhRz3mraq/Bg/jutyz+OWqlsdSSBDtN6e56s2Ki02WBA6cPsVKB7X7WG/ n5FsI/F0KRViXjFOgMNJ6uz+zSzLTuX7pcfjPxTTpctweV3YFFR5M2J+R13L6iALtW7z oSAqDgc+ps7HI76efsal5pxlqG4VYPb7wpG7OItysdiuUFSCwvKeuVLFlOs7j1kckWcP DrYyqhc4st3Ezs9rA8MeHSWVRWpC4sZdyUJNCnxCCah3oW6DoyBPPPcUvKwe4EDOiNs5 TGW9uWSwz/ml3SLjCNhbKx3g0CpqG6y1HRKxKNOq7ohihq8LuI7FR9v2D3iRgtc0q6kM 5QKA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=do5DRDJ4kC0qXVKCNeOSkw1C3w5I/mPMlIZ/S6bZGZs=; b=nnidvwaCJjgJbXTbniF86rcWvU9xp+R9Aw6Rfjwal2FClScQvsE1VYKw0v09Xv8BSs fqgAhvxy7xy1xmyVHObYKi960WdlILueMuI4vUBz0etX5m31QwlFyNE7NqxDOqHxcPk1 KGi97b8DMMTiLkYfKfK1Nb59bDsd5Cx2D68a0FKCZBnoX48n7YM009N9MSnEs5Mu3Fsz vphXujuaaP8OEgjDiolW93HUduLzur+clfIPylTXDulQsWpLJbmi99emeRFXVmM2fAB4 ogqMB0N53EpeRvTn8YOYZJiDvBKVAbeYaVTli0XeT7O7ykrtpKypwflIS1cgAzayFCCp 8lVw== 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=E6BNnh+y; 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 n10si4323288wrh.425.2018.03.11.15.55.32; Sun, 11 Mar 2018 15:55:33 -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=E6BNnh+y; 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 55C0368A10B; Mon, 12 Mar 2018 00:55:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A503D689F57 for ; Mon, 12 Mar 2018 00:55:13 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id 68so3558631pfx.3 for ; Sun, 11 Mar 2018 15:55:24 -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; bh=grqcGbtmFbSic8leKdcfm+GJVuGlAxVc7dOq2mm8DbI=; b=E6BNnh+yMH0PKQqA3tvzmAC0Dtx0M+mahIppRwc4OsoxJymofPw+f/gjmJjfaEgcL8 EMZZ0bKUznN8+j/JIGHD6WqrVxhHdaQ6ta1p60cO6l23cfxrbXqlYzEB+7TEEHHOixWx f6qCr5jYx8PJg2Pkth38pg/27Ft8AlBtzySrnQKXMcD1MwPZTDxqlkcABvVdDh7L7Tfu mCmvYE4Ngkc26u17dFWl8hPY8Bn3sh4OwWHOjsnedZMCZH2DMNbcMx0T6IiCzfgDUBZz KqnintARYDVuouQMmldVv0KjD2s/30SWotlqZt5x7/ttJ+UabRfJemzUtRNdihx24bFk ez+Q== 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; bh=grqcGbtmFbSic8leKdcfm+GJVuGlAxVc7dOq2mm8DbI=; b=bsGwTDI/Rn0wfVUrogKxBCHGvp+JF4Opjk/Ihjz86oEMhqzj37Pm+1mNLUohRDuAMv 0F2/pJfiRdpESs75M6tP5v3BiZRlUXHzzgizfj54ifxxgrC82P5e42tvo4/rzila9MMe xre0ddfcESERENhdRwuP/XkLovSRb58zZn9+j/JfmDmPqrwc1+A0sLdsP7KDn5iK/V2s 8hah4HXmSs1rvlX6rhBpMDnlYFvSyy2dsGVAFjjKjfHPkVRydvilEjyCVIQDXyqLuFu7 FiqrBoO/civ4bSAfn2SuaBSaD9DXkYAQ15+0yIr9Z9uJqGb1nsG+td9tS2Ps5L5DliN1 VbVQ== X-Gm-Message-State: AElRT7FaZb9Mkh5DUnot4qWFF3aPZRaqe1R2y+cN0lZTkqo0VIhBS3k0 8iEG7t5m+BLT9ABXjTSWfQTjQJxd X-Received: by 10.98.159.85 with SMTP id g82mr5881969pfe.15.1520808603808; Sun, 11 Mar 2018 15:50:03 -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 v14sm14437285pfi.8.2018.03.11.15.50.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Mar 2018 15:50:03 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 15:49:58 -0700 Message-Id: <20180311224958.11642-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_slice: fix access to atomic 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: 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 90e05ed8f1..d0f38783ee 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; + atomic_init(&sl->er.error_count, 0); } /* make sure none of those slices overlap */ @@ -2786,7 +2786,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) {