From patchwork Sat Jul 22 11:50:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 4424 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2055224vsb; Sat, 22 Jul 2017 04:50:48 -0700 (PDT) X-Received: by 10.223.136.155 with SMTP id f27mr7929006wrf.291.1500724248639; Sat, 22 Jul 2017 04:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500724248; cv=none; d=google.com; s=arc-20160816; b=otQHNkgxZ19SlGy1axR01wOG2WQ6L7ftDVUxdw3ZY7f79n5B19Yz19cLKZeosF7Vrl 9uRAk5DvnP/vEbBlo+iHpN5XIR6/HGmCAUgtMcQmVByplhbS1Y5fBntR2InlxcuML5xd SaCsaE5sYFryg4xsUoVUmBhk3ksnSDvbg0VCyCwkWcTYLSKGSWGnAPzrqnVRUZzwwSF+ NvIyTtd26TpwP4kK8MrNx5tUj+rF+FTOeoEinUaFqJYQSdcvz2X118vQI0ohBdocn81H cbBdXmQdvVlULuc3bVruMq39Fhgc4x7hZ8/L+yTsYCCknA3gAe5KTikKYTDSdGFte1Bq FKGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=Bp0KshEYNTCR1OYVK6MnPTmDL+glARGLYGDkEh9QPM4=; b=tnZc8GjijsTZaKoZmSSh6kKYd+FseDPSS1DBq0i8s0FwZIe7cZCf07Fs5sqflCK7lv eo2Fv7l7IHG9RiqQN8+MWe5AThvlreP63eh0JAHIMnvo1JiapBvU4FoLcspJJfbZo1Sg URdxwIo1dQFhSeQSajew8rkptzC8i4G+b1tNXfpsZz8+ihXqMxx4jMK4I8Z8AK5O0EPU oqotWhkq3mXUa5pFydtQIkbpCjqJsO7G+j6wpWDNr/XoG0kc7p1ELAMtKJRuQm692SMs PD/FEjZOLOFV09w0jWe2zOvdZ1GUOmIjFKoKPtmij+8b7h4jUyRb1gRBKXjuzbyukqYY T1rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=Rf9NOj7+; 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 o130si1033407wmg.195.2017.07.22.04.50.47; Sat, 22 Jul 2017 04:50:48 -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 header.b=Rf9NOj7+; 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 72017689AC3; Sat, 22 Jul 2017 14:50:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9635A68994A for ; Sat, 22 Jul 2017 14:50:30 +0300 (EEST) Received: by mail-pf0-f195.google.com with SMTP id q85so6726689pfq.2 for ; Sat, 22 Jul 2017 04:50:39 -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:mime-version :content-transfer-encoding; bh=0ki9MNlJWETZnt/ifjHKP6uzk7CzOSwcILIbFcKZv8I=; b=Rf9NOj7+KoHvgP8qYQZVEFHrAV9jzx1M6tbL6y3tbJG+rXU8Q73Z5sevBmupyfhvgg fevTjN2VTCCdWr+ckM4u/YBuSRkBoOEv8yeL+0saa2a+b/to5f9ZRlck4xWfQtvmzoir jczCpWrf+Ufrxj+06qQ8bJ9iPmIlA4bcBiq2Dktfq3Kz4RVdmqWcHhl26suSoF/Zt2FF Wtpu9lGTzdDZDhUX7hgkDG6NYgqGLWLVsezjCtKVv3nUXB10ImuGzEQ46zHIkgEIt07F OMl9EbKShIKI6ky2UDZktOLQmMsrAXZxpW+wMMSEoWINUBLHqc3Nw4PRpqQnESL0ISwC cewg== 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:mime-version :content-transfer-encoding; bh=0ki9MNlJWETZnt/ifjHKP6uzk7CzOSwcILIbFcKZv8I=; b=oIbqQgxqcK1NcAC5rtjLRKp1UxqkHPU/DxEKuF/Tnx/rzTH1+J7+3d/Vc2Js2pR/to 3QxOwzmaZpn1HaMkvvNieNRXRSWqDqnNYjzBzNi8FKxSfwprp9pStQUB1ZRNRClvhKJZ 32q+fHnCbzfle881Fmm3W/LvN4m5kDEx9gIl3qNX2dDK9WlNrxNu64gt7R+bIKwGYikY xPc0IqhP/Ur948BkVEB/V4VPs1ium1zi+s5ciHCgtpdLXn677A0Fq6UgO/kF81yBv5x7 QTCYFUa1jIx5tlqncuOMN9n9pbpsd0wqfaM4huwqgzD9c6mFjPWUEAqvbF0V5JhhSv8Y 94AQ== X-Gm-Message-State: AIVw112wAj5PyOkJHu4tlRcCwMZIeyJxw5Xd/GT9RgfZLuAg1tJzzVii vU64TunvZcTZvsIV X-Received: by 10.84.234.9 with SMTP id m9mr11409057plk.15.1500724237379; Sat, 22 Jul 2017 04:50:37 -0700 (PDT) Received: from localhost.localdomain ([114.124.144.96]) by smtp.gmail.com with ESMTPSA id 74sm13639501pfh.49.2017.07.22.04.50.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jul 2017 04:50:36 -0700 (PDT) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jul 2017 18:50:13 +0700 Message-Id: <20170722115013.7879-1-mfcc64@gmail.com> X-Mailer: git-send-email 2.13.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/w3fdif: do not write to line before start line 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: Muhammad Faiz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" That line has been written by previous job. Fix tsan warning. Signed-off-by: Muhammad Faiz --- libavfilter/vf_w3fdif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index b7872db341..c6a6550778 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -366,7 +366,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_ int j, y_in, y_out; /* copy unchanged the lines of the field */ - y_out = start + (s->field == cur->top_field_first) - (start & 1); + y_out = start + ((s->field == cur->top_field_first) ^ (start & 1)); in_line = cur_data + (y_out * cur_line_stride); out_line = dst_data + (y_out * dst_line_stride); @@ -379,7 +379,7 @@ static int deinterlace_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_ } /* interpolate other lines of the field */ - y_out = start + (s->field != cur->top_field_first) - (start & 1); + y_out = start + ((s->field != cur->top_field_first) ^ (start & 1)); out_line = dst_data + (y_out * dst_line_stride);