From patchwork Wed Nov 16 11:15:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1443 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp115427vsb; Wed, 16 Nov 2016 03:15:40 -0800 (PST) X-Received: by 10.28.109.2 with SMTP id i2mr8813763wmc.41.1479294940694; Wed, 16 Nov 2016 03:15: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 sw3si32800273wjb.110.2016.11.16.03.15.39; Wed, 16 Nov 2016 03:15: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 98225689EB1; Wed, 16 Nov 2016 13:15:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EB62689E68 for ; Wed, 16 Nov 2016 13:15:30 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c6yBe-0002oh-62 for ffmpeg-devel@ffmpeg.org; Wed, 16 Nov 2016 12:15:30 +0100 Received: from [192.168.1.3] ([80.110.104.113]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 8bFU1u0212SofGY01bFWnr; Wed, 16 Nov 2016 12:15:30 +0100 X-SourceIP: 80.110.104.113 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Wed, 16 Nov 2016 12:15:28 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201611161215.28889.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [RFC]lavc/ffv1dec: Scale msb-packed output to full 16bit 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" Hi! Attached patch improves output for some ffv1 files imo. Current slowdown for the existing decode-line timer is 2%, I wonder if this can be improved through refactoring. Please comment, Carl Eugen From e4e8277d4f0daeb9f61c2da9ebb167a084b1b93c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 16 Nov 2016 12:03:17 +0100 Subject: [PATCH] lavc/ffv1dec: Scale output for msb-packed compression to full 16bit. 2% slowdown for existing decode-line timer. --- libavcodec/ffv1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d8f35c3..0719e28 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -142,7 +142,7 @@ static void decode_plane(FFV1Context *s, uint8_t *src, } } else { for (x = 0; x < w; x++) { - ((uint16_t*)(src + stride*y))[x*pixel_stride] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample); + ((uint16_t*)(src + stride*y))[x*pixel_stride] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample) | ((uint16_t **)sample)[1][x] >> (2 * s->avctx->bits_per_raw_sample - 16); } } }