From patchwork Thu Jan 4 18:19:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7124 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp558781jaa; Thu, 4 Jan 2018 10:19:32 -0800 (PST) X-Google-Smtp-Source: ACJfBovLm4fjyTB3No1tserJ5nmGy3KnCpJsapkxBXYIQ5tV6ZnbGX671xO7kq3al2DqEcd3NTPQ X-Received: by 10.28.8.11 with SMTP id 11mr276533wmi.63.1515089971962; Thu, 04 Jan 2018 10:19:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515089971; cv=none; d=google.com; s=arc-20160816; b=Lv8EmWW9MtOPb2kVSyNJVVXwcsHk3rbCmXypFcQ3iaxbmR4ERu7SCfDKweGgh/w/fc w+fj3zqBDnVtL8+Zjt36GTaXDOaQUBpEroSKMetOJ7l+ByECgS9eR1LLLdXsZTW4D5DW ENl+qlvrnqs4d1o3UBVteJHCDGvKfeO7l1h+OSGD5ThJQYqX9nah6+HghF8gCdUwD5zW ahhPWY2XlbCJ1fgkHpo81/92GkGxR08MQTDgCPbAgzgLrdGSBrj8+DJvpgTxgBKrJF8z BVFtywSc78i9A4ZmeDOzF05Tz9eN5Gk1dJc9WEQevtQ17dnPPSpV4pEcKJ0zhCdjEAb0 3yGg== 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: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=n8apg3Rtq+aO0nAp09wuhrJlvGlsDXh5vHV2csOJ8Zo=; b=Ox95qO6X6P7zFrR87qT8CzK+OTibhIXYAY14+HcIPTKoZBqxd3HkhdnI8Lwm3jT2Q2 VViQqjYMDfTVMznWxgr3n+icnvonTNNARGL3tgByEXQcgOikAJSS/QlIj9Y/T6sSoxjK 0brp5gjqp6vnDSO6U9j+rJJnunavy2EUaN9tagOxbhg6DGA1zvFmQ2HeaxhQF9BfqD6r FLBEB08UH5WJOKSmbMIpYSxQK1L33CpXtF7FCdh4c6xMyaMmiRXEHL5qiKHDhaFL/wqe Slo5G32ip8AXJXyswa4rOQv6PLxPo50FAMqKsKxxk5zz06lxc0g5UxYUfG1TVDzH9NNc RwGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=agP8IpYe; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4si2961674wrw.154.2018.01.04.10.19.31; Thu, 04 Jan 2018 10:19:31 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=agP8IpYe; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC3E1689944; Thu, 4 Jan 2018 20:19:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9767F689811 for ; Thu, 4 Jan 2018 20:19:00 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id v188so2989780qkh.11 for ; Thu, 04 Jan 2018 10:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=xPua7FBKiKnxzYPEIZXn904zh7JYYfZ1YTGHftfx2WE=; b=agP8IpYeegAOouDdyb8Ki/ZRX7q/KIQxZ1vTPWdIOeYHoYwnPiM544OzS97IMtISmt Y6bz15Ma9OYQgkBjt6r7R5oHpZUqDc2QBoFzvUNdxeDlTh/XD7umciOdoRYaJU8FpSLk 4t1E9vf7tcI8zZWocvoWJm52/npQ7sOM49hzj6Hc025r+oQ1RypW0r6Q83873Np38VDu GvKIuPR/N9KzI2AiPWQQnj94Gt9bhGO4prLo34l+HFuMObgFRCYhJRMEed+SiFq37YzL 5JgfrNx3VS8DPD+NiyYiq8O9EjZXspV3fqDqoBKFK/so5F8gVNDMsZYPizINcF7gUc8z SfxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xPua7FBKiKnxzYPEIZXn904zh7JYYfZ1YTGHftfx2WE=; b=WdAy4NhEVV6zfGg7EGon06QCK/+M4UgVFKYJlu4lYNYioy2rZ8bjkbLtc0V3gfp/Oi 1AmYWhi9LeugKgp4TVPIiJ3w8wzKeRXLjnca2FjUEuJj0rOObkLS8RQ2dpBgGOq6bEZc KVvxlVEaeu2j8XkZlSenJgceo1sCIIW82k9MNPq7tWXNVfuHUtrqdwbPBwjy44FGLApw LcjfkbzT6CZqSAflUW8We9m9bv/RTjZeU4b7Gb6XvPJaDpKWhWQ+tibLV5yjvZZbBFLl 52GmLQaoqC7TIr75V/kwWTJxzWtRORWpDRYl5AsRnf2oU1YTtPJrVGb+3GceJUaY6gnR Ee0g== X-Gm-Message-State: AKwxytdcHpWhqyHBwbU7XVKMivzFbai8r7rkiNvccwQWVz6eGbEaDCr1 P2Y5IWl/ELqZmI63vxpLATdHMg== X-Received: by 10.55.86.194 with SMTP id k185mr597615qkb.352.1515089956419; Thu, 04 Jan 2018 10:19:16 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id n81sm2488321qki.87.2018.01.04.10.19.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Jan 2018 10:19:16 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jan 2018 15:19:02 -0300 Message-Id: <20180104181904.5816-2-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20180104181904.5816-1-jamrial@gmail.com> References: <20180104181904.5816-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/parser: use a mutex instead of atomics in av_register_codec_parser() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/parser.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 670680ea7c..747ea2ee8a 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -25,9 +25,9 @@ #include #include "libavutil/avassert.h" -#include "libavutil/atomic.h" #include "libavutil/internal.h" #include "libavutil/mem.h" +#include "libavutil/thread.h" #include "internal.h" #include "parser.h" @@ -42,11 +42,14 @@ AVCodecParser *av_parser_next(const AVCodecParser *p) return av_first_parser; } +static AVMutex parser_register_mutex = AV_MUTEX_INITIALIZER; + void av_register_codec_parser(AVCodecParser *parser) { - do { - parser->next = av_first_parser; - } while (parser->next != avpriv_atomic_ptr_cas((void * volatile *)&av_first_parser, parser->next, parser)); + ff_mutex_lock(&parser_register_mutex); + parser->next = av_first_parser; + av_first_parser = parser; + ff_mutex_unlock(&parser_register_mutex); } AVCodecParserContext *av_parser_init(int codec_id)