From patchwork Wed Mar 29 14:12:23 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: 3174 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1111454vss; Wed, 29 Mar 2017 07:13:15 -0700 (PDT) X-Received: by 10.223.163.28 with SMTP id c28mr683741wrb.186.1490796795579; Wed, 29 Mar 2017 07:13:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e144si7343177wme.138.2017.03.29.07.13.14; Wed, 29 Mar 2017 07:13:15 -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 1CA34689B20; Wed, 29 Mar 2017 17:12:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B23E4689A72 for ; Wed, 29 Mar 2017 17:12:09 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id x35so2136098qtc.1 for ; Wed, 29 Mar 2017 07:12:32 -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=kAdBCfwHQGVy3JhXIStbq0+msCl5U9s7Tte0VY2Qda8=; b=t0188y6o/TvXdWjoddISJLJddgCJsDt2FBgqI5ZiNUAFp9Apw+Hp2CbcAVd708wwLO 6/a0vXL1Xm3qF+NbsBGluJ8bhGWQPaLVz5WpajMJdsNAdRyy8HbSNQr68P+ny2e7dboN FEjkveGvelHESY1lpBc4sUkBAjIsJR4cumXO2wu6QM9cxddv5C/871g5Oq39lyr80a4o D+IASfnPUheIu8Ajt8AhYya6Nl1pCU1iR1wPLwYvDEdsyPGlfvAhJl49fKccKwGUwEMP OME88LbKgpJp6aPmaWcYrMcigLIutFr9pOkDLTmatDuqhEdNYNZAwSTPweUQWmso6UiN O20Q== 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=kAdBCfwHQGVy3JhXIStbq0+msCl5U9s7Tte0VY2Qda8=; b=VZNcftBKuWPTcKZ/FMil8RJDNq/PV4uMOid8oum27kqPDTrpZqUe7SwIDLN1EDkbdW tcQ10CH57+5fN8dYJMqzvv+I5NZeCfe3FDuXk2d8hEdKax6w4fivxRAWX5XUX7eV6MX5 iG6saXa3a46DqW3fzEL2CKKagdZCk0FvRwjZ1NuI+9nHB+/CUmf7egFz3gglPRNfNH8s S1ImlVJXFzjEHEI9PqtEeknCGeFhAQGOIRiTsYJ23W80uM5dVnMKX/eoIKd5daV06JvT 8sewl80OMwJag5+EMckmY5/xD5N/6sqB/yNv1uX9QS/jXPVX5HtISl0uUBuNZvqLWdL2 S3kQ== X-Gm-Message-State: AFeK/H21URNZtB/tm4FIOO4NwIj9jxOwKgsh7vIKIV+IDiGz/tU/dfFqQKj1N7z28ezxRg== X-Received: by 10.237.47.71 with SMTP id l65mr759081qtd.177.1490796751140; Wed, 29 Mar 2017 07:12:31 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id u63sm4976197qkh.45.2017.03.29.07.12.30 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 29 Mar 2017 07:12:30 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2017 10:12:23 -0400 Message-Id: <1490796744-76454-5-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1490796744-76454-1-git-send-email-rsbultje@gmail.com> References: <1490796744-76454-1-git-send-email-rsbultje@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/6] h264: don't sync pic_id between threads. 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" This is how the ref list manager links bitstream IDs to H264Picture/Ref objects, and is local to the producer thread. There is no need for the consumer thread to know the bitstream IDs of its references in their respective producer threads. In practice, this fixes the last tsan warnigns when running fate-h264. --- libavcodec/h264_picture.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index db96737..2dbe5ee 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -109,7 +109,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src) dst->poc = src->poc; dst->frame_num = src->frame_num; dst->mmco_reset = src->mmco_reset; - dst->pic_id = src->pic_id; dst->long_ref = src->long_ref; dst->mbaff = src->mbaff; dst->field_picture = src->field_picture;