From patchwork Mon Mar 27 14:49:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3128 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp199789vss; Mon, 27 Mar 2017 07:49:23 -0700 (PDT) X-Received: by 10.223.154.11 with SMTP id z11mr20550843wrb.76.1490626163347; Mon, 27 Mar 2017 07:49:23 -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 w26si1061658wra.69.2017.03.27.07.49.23; Mon, 27 Mar 2017 07:49:23 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DDDE688377; Mon, 27 Mar 2017 17:48:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3385D6882F2 for ; Mon, 27 Mar 2017 17:48:52 +0300 (EEST) Received: from mfilter28-d.gandi.net (mfilter28-d.gandi.net [217.70.178.159]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id CE0A441C0D5 for ; Mon, 27 Mar 2017 16:49:13 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter28-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter28-d.gandi.net (mfilter28-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id NPhXpqjwAabW for ; Mon, 27 Mar 2017 16:49:12 +0200 (CEST) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 49EB141C0C7 for ; Mon, 27 Mar 2017 16:49:11 +0200 (CEST) Date: Mon, 27 Mar 2017 16:49:03 +0200 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170327144903.GP4714@nb4> References: <1490621972-38782-1-git-send-email-rsbultje@gmail.com> MIME-Version: 1.0 In-Reply-To: <1490621972-38782-1-git-send-email-rsbultje@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] h264: revert 1189af429211ac650aac730368a6cf5b23756605. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Mon, Mar 27, 2017 at 09:39:32AM -0400, Ronald S. Bultje wrote: > The patch introduces race conditions. > --- > libavcodec/h264_slice.c | 3 --- > libavcodec/h264dec.c | 20 -------------------- > libavcodec/h264dec.h | 8 -------- > 3 files changed, 31 deletions(-) This seems to break "make fate" Test h264-reinit-small_422_9-to-small_420_9 failed. Look at tests/data/fate/h264-reinit-small_422_9-to-small_420_9.err for details. make: *** [fate-h264-reinit-small_422_9-to-small_420_9] Error 1 [...] --- ./tests/ref/fate/h264-reinit-small_422_9-to-small_420_9 2017-03-20 19:25:54.149895387 +0100 +++ tests/data/fate/h264-reinit-small_422_9-to-small_420_9 2017-03-27 16:47:09.426559237 +0200 @@ -54,28 +54,28 @@ 0, 48, 48, 1, 608256, 0x84b4b1f1 0, 49, 49, 1, 608256, 0xf0d4949b 0, 50, 50, 1, 608256, 0xee06377f -0, 51, 51, 1, 608256, 0x9c22c5ee -0, 52, 52, 1, 608256, 0x322abee2 -0, 53, 53, 1, 608256, 0x82745ed3 -0, 54, 54, 1, 608256, 0xe7b9248b -0, 55, 55, 1, 608256, 0xc8c1ce0e -0, 56, 56, 1, 608256, 0x8451eba9 -0, 57, 57, 1, 608256, 0xece9412d -0, 58, 58, 1, 608256, 0xffbc2c24 -0, 59, 59, 1, 608256, 0xf58c117e -0, 60, 60, 1, 608256, 0x7853f334 -0, 61, 61, 1, 608256, 0x1acd6465 -0, 62, 62, 1, 608256, 0xb668856c -0, 63, 63, 1, 608256, 0x3f52c230 -0, 64, 64, 1, 608256, 0xd7e8b5b6 -0, 65, 65, 1, 608256, 0xf663681d -0, 66, 66, 1, 608256, 0x07ef670c -0, 67, 67, 1, 608256, 0x1d5084f4 -0, 68, 68, 1, 608256, 0x0ea3fe04 -0, 69, 69, 1, 608256, 0xf095d1e0 -0, 70, 70, 1, 608256, 0xbdac37fb -0, 71, 71, 1, 608256, 0x2cbfdf91 -0, 72, 72, 1, 608256, 0x8da7190f +0, 51, 51, 1, 608256, 0x18b81c3c +0, 52, 52, 1, 608256, 0x1a217e1b +0, 53, 53, 1, 608256, 0x7caf4a52 +0, 54, 54, 1, 608256, 0x9a15c16d +0, 55, 55, 1, 608256, 0xd95ad1d4 +0, 56, 56, 1, 608256, 0xe89b7ae1 +0, 57, 57, 1, 608256, 0x724e06a5 +0, 58, 58, 1, 608256, 0xa0ae5785 +0, 59, 59, 1, 608256, 0xe8710309 +0, 60, 60, 1, 608256, 0x182d3b2f +0, 61, 61, 1, 608256, 0x087b2a54 +0, 62, 62, 1, 608256, 0x8669afba +0, 63, 63, 1, 608256, 0x3aedae4c +0, 64, 64, 1, 608256, 0x8af01aeb +0, 65, 65, 1, 608256, 0xc0711005 +0, 66, 66, 1, 608256, 0x10ddce7a +0, 67, 67, 1, 608256, 0x7f42afc7 +0, 68, 68, 1, 608256, 0xb8d34b42 +0, 69, 69, 1, 608256, 0x663f7b32 +0, 70, 70, 1, 608256, 0x9607cdc7 +0, 71, 71, 1, 608256, 0x346e7aa9 +0, 72, 72, 1, 608256, 0x7ffdd25f 0, 73, 73, 1, 608256, 0x08bf6fc9 0, 74, 74, 1, 608256, 0xa2368e5c 0, 75, 75, 1, 608256, 0x36d38f81