From patchwork Wed May 24 16:15:05 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: 3728 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp392117vsk; Wed, 24 May 2017 09:21:45 -0700 (PDT) X-Received: by 10.223.162.158 with SMTP id s30mr24569744wra.34.1495642904959; Wed, 24 May 2017 09:21:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495642904; cv=none; d=google.com; s=arc-20160816; b=Wjub9L07k0G1ZtfkJu7wFP4Qiu0oQWTGudQCfD/JYwR9j09Fy/3m8uQvaKKdtRzwjq 5HpUMec1Yrc2vxXGoZFcZqFTe7siEVn2PesqY7hB3PmiU+EoobQQfM2X9XSvxZE5rBJm ySRDnYYqUt5QdTwHvggq/cqEXZOMinlvanBay7X/kemBKy5IjM1Fj+qE4bSJCuEnbsZ2 EHk++W1qCDt9+aULlIfQQLq14S/gHMSqjuWMgHCPqn8YACqj3X4wWh9EKUQdrotJ88+p Wu3qVrSf7KkDhRObMM0Q2u85VSyCnV0YoN/93nu+GKr2AXIHzov5/2/FPns8KaJe3kaS y3Og== 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=u2dm64qBuwVRveKwl62QpJ1lfyApv0AO5CXDg4w0P0c=; b=yPRxTEOWA6gkAwwTWNrX+3ut6h9sDCZTyhDac3ewmTgpfG3QPRXdF/nt62/mZFAoLF gWFqOqzUg6urhP6cqF1exn9nDmWf8vbZxR2BKtFcIOnhez4X0JD2x0PQpyalTC5fAF7L cgeZnMEfNwhCMfaijkY055DD7jBNf9XFXxPLRzZlQqn8FVxoV8t2yGtRSFK5zFyUkYg2 FzfjknwgF/THxdW6qfFNKP/3e4F8HR7ZDcLE3VldXBKukMU4jpBt8Cr9Xs+F9iTDtdiu 8bTD0Lrb1wY+p/G5yB1cbnEOpiZKH67uhFqY+Umhc2NvDxoiVJahZ/EWIzAOny0mW1KB 2b2Q== 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 h6si7103443wma.42.2017.05.24.09.21.43; Wed, 24 May 2017 09:21:44 -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 C25E6689B6E; Wed, 24 May 2017 19:21:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69885689B4F for ; Wed, 24 May 2017 19:21:27 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id k74so27143629qke.2 for ; Wed, 24 May 2017 09:21:29 -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; bh=chgLV4JH/5el4TQ65/sx4qqnz0HE8CBPN03FWrdQAzw=; b=jkcPycnlmLyKutTjm/oChlpDlPNgo889QULEep1ylCmFlTnpAmoo2IMlXUVwiz/dtX HZn0GskiTrJVN+pl/YQyn0eZqKpV7+AhNoo6/033DKLYnVzdq5enysZP0PcRIwxPFgcH U72xiOFs7FtQy2qn0RSqvNbCldYpNUpRyYYulCDbO68uauAnE/EBY7lZH3JQY3+b3oxD eJtf4KvwqrOs4ZEGj5dvqIQFn6HSk1vmrDMFH7Jgr9JHgAcuA/TzvQoJ+k3k1wwDS7sq DfrDMOBCWuSHxJFYLy2lHPeTLkEjqK/53UAPPxlDtAjuV4cwJ/OfiWY39ow2JqK6I0ac Grpw== 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; bh=chgLV4JH/5el4TQ65/sx4qqnz0HE8CBPN03FWrdQAzw=; b=EgisFPP4aAbCrzFrbbee9YdXMFaxDUJ2sowm9iSBCQp41rHzRIeuN0iDLS8wSe0jac HBprpu6/Bfr4ixcFQ8x5+q/TDa4PXI72xsEvWzCNqK+5xxSvRoyfaZ1p27ElCnqLMHsa 3pgGgTtHg/lxzOsvNs+0mkx7zAuWnegcr5aJhzfzeg1uRKf+vbEFA6ectBR9tlAhuPq5 O41yPZ5czQ7JHVH/jIING0CVtjdLl8DL9/ZEUHHC6rCamrSDeeqdqhLJNmpn4LBwHftb cTISjidlHurUZdboHQvHr7vw+Haq+2xmDYBvX3RwkrfCwomK3O9nafswzTQTAopWmL6D BS3Q== X-Gm-Message-State: AODbwcDja4eyeRhQgf4ZgEO4dgBDD8m6XwQHBPiDJkPefUTu17HLAern XBbkJGk2JxZQDw== X-Received: by 10.55.111.198 with SMTP id k189mr34238686qkc.160.1495642508138; Wed, 24 May 2017 09:15:08 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id k36sm2738372qte.65.2017.05.24.09.15.07 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 May 2017 09:15:07 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 May 2017 12:15:05 -0400 Message-Id: <1495642505-39672-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 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, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 27ae356..2746964 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -273,14 +273,21 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVF 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) + pthread_mutex_lock(&c->finished_task_mutex); + if(!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; + } + } else { + pthread_mutex_lock(&c->finished_task_mutex); } - if(c->task_index == c->finished_task_index) + if(c->task_index == c->finished_task_index) { + pthread_mutex_unlock(&c->finished_task_mutex); return 0; + } - pthread_mutex_lock(&c->finished_task_mutex); while (!c->finished_tasks[c->finished_task_index].outdata) { pthread_cond_wait(&c->finished_task_cond, &c->finished_task_mutex); }