From patchwork Thu Feb 23 01:56: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: 2656 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp14337vsf; Wed, 22 Feb 2017 17:56:41 -0800 (PST) X-Received: by 10.28.216.14 with SMTP id p14mr1222524wmg.56.1487815000974; Wed, 22 Feb 2017 17:56:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j198si4834801wmd.157.2017.02.22.17.56.40; Wed, 22 Feb 2017 17:56:40 -0800 (PST) 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 63615688398; Thu, 23 Feb 2017 03:56:29 +0200 (EET) 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 45296688387 for ; Thu, 23 Feb 2017 03:56:22 +0200 (EET) Received: from mfilter10-d.gandi.net (mfilter10-d.gandi.net [217.70.178.139]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 0134741C04C for ; Thu, 23 Feb 2017 02:56:30 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter10-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter10-d.gandi.net (mfilter10-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Gi4KQe7BDlOX for ; Thu, 23 Feb 2017 02:56:28 +0100 (CET) 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 69DB941C08A for ; Thu, 23 Feb 2017 02:56:28 +0100 (CET) Date: Thu, 23 Feb 2017 02:56:03 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20170223015603.GK5776@nb4> References: <20170222224713.32591-1-atomnuker@gmail.com> MIME-Version: 1.0 In-Reply-To: <20170222224713.32591-1-atomnuker@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] mjpegenc: make optimal huffman coding the default 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 Wed, Feb 22, 2017 at 10:47:13PM +0000, Rostislav Pehlivanov wrote: > Its been extensively tested and it gives gain for practically free, so > make it enabled by default. > > Signed-off-by: Rostislav Pehlivanov > --- > libavcodec/mjpegenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c > index cc917edb7f..03c3d0ab13 100644 > --- a/libavcodec/mjpegenc.c > +++ b/libavcodec/mjpegenc.c > @@ -444,7 +444,7 @@ FF_MPV_COMMON_OPTS > { "left", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "pred" }, > { "plane", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "pred" }, > { "median", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "pred" }, > -{ "huffman", "Huffman table strategy", OFFSET(huffman), AV_OPT_TYPE_INT, { .i64 = HUFFMAN_TABLE_DEFAULT }, 0, NB_HUFFMAN_TABLE_OPTION - 1, VE, "huffman" }, > +{ "huffman", "Huffman table strategy", OFFSET(huffman), AV_OPT_TYPE_INT, { .i64 = HUFFMAN_TABLE_OPTIMAL }, 0, NB_HUFFMAN_TABLE_OPTION - 1, VE, "huffman" }, > { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_DEFAULT }, INT_MIN, INT_MAX, VE, "huffman" }, > { "optimal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_OPTIMAL }, INT_MIN, INT_MAX, VE, "huffman" }, > { NULL}, breaks fate Test vsynth1-amv failed. Look at tests/data/fate/vsynth1-amv.err for details. make: *** [fate-vsynth1-amv] Error 1 [...] --- ./tests/ref/vsynth/vsynth1-amv 2017-02-20 17:22:51.769108273 +0100 +++ tests/data/fate/vsynth1-amv 2017-02-23 02:54:42.983732697 +0100 @@ -1,4 +1,4 @@ -9e155fcedb3b853876e9ea4233971803 *tests/data/fate/vsynth1-amv.avi -1365500 tests/data/fate/vsynth1-amv.avi -e38681b9527b6d2531942f8a176a0265 *tests/data/fate/vsynth1-amv.out.rawvideo -stddev: 10.07 PSNR: 28.06 MAXDIFF: 98 bytes: 7603200/ 7603200 +1ab7232e1948a9ae92c745b6ed1dc0b4 *tests/data/fate/vsynth1-amv.avi +1283516 tests/data/fate/vsynth1-amv.avi +58b9ac246e9888c71a7b4e502abb898b *tests/data/fate/vsynth1-amv.out.rawvideo +stddev: 117.66 PSNR: 6.72 MAXDIFF: 239 bytes: 7603200/ 7603200