From patchwork Thu May 25 12:20:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 3733 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp770594vsk; Thu, 25 May 2017 05:21:02 -0700 (PDT) X-Received: by 10.223.161.144 with SMTP id u16mr22653316wru.145.1495714862150; Thu, 25 May 2017 05:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495714862; cv=none; d=google.com; s=arc-20160816; b=y7XrZ3BRYgAfBSw3Q4rsqefKyFhVE/+bzOWYUDSUYgQFk5jrcP79LZkavK/2OkBVVM uqoS5PaL9KCseXH+tH1nKWckm48UBEmijBiKQUcgdnHgc0Z5YxB9DIToPrdPNdUfb4nx zctsb2fui8iMt/P3AqZB5wPdaap8hC+HKi1webBlIBV3rYrF8Gdrj3kyk/2j9Lnz9U0m bArAfLChrZBf+cxFFjGrJM3JaNUPdu0Llvkot0tl8Z5qfi3VYisyWnQcvzJdF57Kn+Vm Plg5iVp9Roqf2T94yctmbeuUlR6aUlVkUTdH2o4NffBsp87gcWtnJrOM4DpPbUqkZra7 /a1A== 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=0ELQLWCOFUUSgjkNHWb7ZUwu8Zs/0lTMctvDYBZ7I9Q=; b=Ed4fEoRqK/qL4NrgI10/7FRGviu4iWqqhXJ2rrOwPuy/76eqQCkPTiPQMoHJCWNVOR 2Uwriav9nGAF/X24ZXIBTf5yQN9onbrxkRsexkKklBTXMVwVYkrkCoJzmTcSQIlUuRkS 1hn3f4qpQW/ZafUp6+FiTk0/9kFN3L/ifI+179hkrlC9ZMAnxF3QSxYmrCGdvue6jFeN J9PfQJywaDyzIiLKj5UoyMm+pqT9S4HAB1EYOaQNOAo69+IU37G3khgisNCLy9Agc1LB 4VlqocohdulNLxEI+kM0ZX5RBxuVhHZlBCeRhFm/po4zSeSaU6N4iwM02RY2ga68so/9 YQFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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 g66si23167568wrd.178.2017.05.25.05.21.01; Thu, 25 May 2017 05:21:02 -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=@gmail.com; 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 AD52E689882; Thu, 25 May 2017 15:20:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDCA66883C6 for ; Thu, 25 May 2017 15:20:48 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id k74so29963141qke.2 for ; Thu, 25 May 2017 05:20:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fRiJxdmv/jBBB/CsyDeK1YZTHJzQYBU51BwtBOZOC2k=; b=BU54nEDid2qnfQGwAq5B6O8XLiWpbIcU4OjR22n1aZsbISfJpkBUbaTX/7nBCqsNIh uWERK+ZmNjxbu8aQLQRH1gDNa5C+5NuCmT0a0KC3/SPR0vskx1gOLf+KdA0wLH+iEYOO Xw94OxnLUg18CXINHDHi2LQV6o3mvsd3WtxTLoairon2OnnMO5C7JMKSghIg+/3hynAZ MwrCdj0JmZnishlZmv54BAT6hIzYWCDSpUbGrD2kyippb38Aj4kjrO1HV6ARSeloYwda WoIbYnztq711G2eGJ1d0y+L6f/xheYn3arEGCPFSSB3Ck/oi6NL16umud9NwNd1hQdXQ BIsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fRiJxdmv/jBBB/CsyDeK1YZTHJzQYBU51BwtBOZOC2k=; b=hfRlgmzPWADNlJJ/DreM11668anQ/JJqZb0U9tX29lq0LWvhMjjVnhT+zS8EoBcqEM 9eYOWHX2QQ7QYtQzRnNLZqwWZHym7PZFj4U/yrpkKWjMs7d6IrQzJ/Cn1IohmKWCGv2+ FJ8mmVzG99PPzABbjBjlE8LFVN3yN1tCHOndzJM6NawpRMbM4yJA/jJEEUp8CDzeA3DM iNc8fiPwN2WT7YcyeCo4eiCSI/8ErMKlJYkU6EHDUwDbKWOlxjRK/DNO88KOS6G6+ckE ZogmILT8gvcF6sePaNQDmQvdTXcewHA1IDyvTIrSFBrLnVocfb2ZTVSy8gFWOhFNqHZu DG6A== X-Gm-Message-State: AODbwcCJZhv6L2uHZ0kyJif6uiHvRwd0gSx7ShWjNq+eAsfVSphvnvFx fYLawljrTMxxlQ== X-Received: by 10.55.165.85 with SMTP id o82mr34672177qke.82.1495714850100; Thu, 25 May 2017 05:20:50 -0700 (PDT) Received: from Macintosh-7.home (pool-173-77-200-147.nycmny.fios.verizon.net. [173.77.200.147]) by smtp.gmail.com with ESMTPSA id m11sm4500327qke.8.2017.05.25.05.20.48 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 May 2017 05:20:48 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 May 2017 08:20:46 -0400 Message-Id: <1495714846-65456-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <20170524165126.GE5698@golem.pkh.me> References: <20170524165126.GE5698@golem.pkh.me> Subject: [FFmpeg-devel] [PATCH] frame_thread_encoder: extend critical code covered by finished_task_mutex. 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: "Ronald S. Bultje" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Should fix tsan errors in utvideoenc_rgb_left and related tests. --- libavcodec/frame_thread_encoder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 27ae356..6cf1a68 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -272,15 +272,16 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF pthread_mutex_unlock(&c->task_fifo_mutex); c->task_index = (c->task_index+1) % BUFFER_SIZE; - - if(!c->finished_tasks[c->finished_task_index].outdata && (c->task_index - c->finished_task_index) % BUFFER_SIZE <= avctx->thread_count) - return 0; } - if(c->task_index == c->finished_task_index) - return 0; - pthread_mutex_lock(&c->finished_task_mutex); + if (c->task_index == c->finished_task_index || + (frame && !c->finished_tasks[c->finished_task_index].outdata && + (c->task_index - c->finished_task_index) % BUFFER_SIZE <= avctx->thread_count)) { + pthread_mutex_unlock(&c->finished_task_mutex); + return 0; + } + while (!c->finished_tasks[c->finished_task_index].outdata) { pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex); }