From patchwork Sat Jun 10 11:46:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3901 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.195 with SMTP id 186csp133377vsk; Sat, 10 Jun 2017 04:54:59 -0700 (PDT) X-Received: by 10.223.160.1 with SMTP id k1mr2131868wrk.102.1497095699319; Sat, 10 Jun 2017 04:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497095699; cv=none; d=google.com; s=arc-20160816; b=vxIdPkdikZaVpvq1mQyibV6e9GnFOTOdWniD1/RH6C8PFEcUpv28ppIt8lQqdZGZnt +z+7wXNMrGFEzY6Xmi6UOekbpSOSZIa0hVyfA9m63/qLi6yDAQ82fnOJL3RQN0PCKLvK 6atNI9x/jVVX1SIUAr10UMe/x40WtlHqaGjrCP/HZ3x+nycrtDJ72jTkb/mggXRlhs3q 8JAnXnD437fvBN4TiDvEbmz6se/hel4MN95IN6ak8CvCRHpmaLpgVgmPXC5Ep4toURAe n6d5guMngSxFZv2Hdq9igP691wwmPqHyuV7IcrjZ1HFfxNfEJXxY6FQoZizUdW1iLYsp kCGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=5DfpEfsb603KiYRsfPMTCkxFYND9SCau1EfX1UPJAwc=; b=VW05gxu68IVPOg6UlXpPmlqanhcEig3PPo/T2Gko5FIHtGLeJFXTKz5tgZfQR1yYQu g4o2SKSNHZR3CnGyC7Z4pzGMQ3ZYuAy6cxViLVA8Xq5fGPm3PcRPZDnNZeVHtr5DM5n2 iHprUpGSPOOcb7eJvjcc9HO61mXzxZQgaMvhBPR/iCB1lnk5JcgtvzbDy6bzuyx7zwqX f70ih8asODtdlCY+Ziynd+U05ft841gGUG74SbRq2n8X8DtbqmsDdZGsuspoYoKW4hiv oVMvL+0PzmCyp8KUC+kEtBUMS7zNad+2zbRrciGo4jU6EazmVGFWi9bdfqMPD0sm/E1o u53A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p105si3953005wrc.206.2017.06.10.04.54.58; Sat, 10 Jun 2017 04:54:59 -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=@ob-encoder-com.20150623.gappssmtp.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 D1D44689F1F; Sat, 10 Jun 2017 14:54:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F039689B4F for ; Sat, 10 Jun 2017 14:54:49 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id v104so11914829wrb.0 for ; Sat, 10 Jun 2017 04:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=++v9rMR7PmHQSGEm3MwIYeoKRoT5LrAk901dE+VssjY=; b=Vf3O2J2M9ri/9mclVaPlFRbfFX53GpSo6yGRQbOGey/phPViHQhhgu3D+E0l4iFsFO TsvEpfdwoBFX0+vLmTZb7HMccKWIjSxKcSoqrO8JZjOYaahYM22lABImOWyLNCcql/5N dDkQ14CYpzQHuqRluu/UxmKtKYrKOToni+/gCsvDGDOw64bzSsTXqKsHiwBMeQPpyteO Z2A2tlNqrlVBcsmq5RQbvY2adYVoBZ2v039C94m3ew+qaSAU6yFHitQ8OYu0fpRVMHZj 4ajRyyW23tjMrAGo4WzASMaskCk/YpWmr0Ig27ToiXDxE4AvHwGEQhetz50png7/Zafm uhfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=++v9rMR7PmHQSGEm3MwIYeoKRoT5LrAk901dE+VssjY=; b=De/25RZXK1l9FKoRTjDpUCLMKwFpFQqXb5bux0qip6tbQjeOnMk3iocg6fW4dJYHle pJOZLgfouLEeIqcZ8wjbWGHv9zRdCwxuUwS1V9KtnN3S2ZvT9qgvW47wC6njBdHrunQ7 rZY0gtYU2yFXMaAIm3lIORdPTFyQ02rXp4C1s6t5WbBWfpmchBG0v3AfZoBTDly3VFr1 ux5zeXgTqzrKe9U5Itx6BB7GVHdalVBHa/DZWMBoywiwF5AroXAuRfxpTudX2ktwGoxr JwvLnlma5uacgqcz21KbXF3Uy0+Bo9+2Bx+FYnAskLarrcP0AX7XQZTjX5tstwYP393u qgUw== X-Gm-Message-State: AKS2vOwjXWno8T4FVy6LbT1u/J6D1w6Ay2H4xs/9bo76u1JbODJtT6oF AEDJ2J39r3i1nJh/es4= X-Received: by 10.28.137.20 with SMTP id l20mr1638423wmd.54.1497095223617; Sat, 10 Jun 2017 04:47:03 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id c71sm1575231wmh.21.2017.06.10.04.47.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Jun 2017 04:47:03 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Sat, 10 Jun 2017 13:46:43 +0200 Message-Id: <20170610114644.3138-5-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170610114644.3138-1-jdarnley@obe.tv> References: <20170610114644.3138-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/x86: add x86-64 8-bit simple_idct put function 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/x86/idctdsp_init.c | 2 ++ libavcodec/x86/simple_idct.h | 3 +++ libavcodec/x86/simple_idct10.asm | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index 4b2145e478..1826d01e0e 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -102,6 +102,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, avctx->idct_algo == FF_IDCT_SIMPLEAUTO || avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { c->idct = ff_simple_idct8_sse2; + c->idct_put = ff_simple_idct8_put_sse2; c->perm_type = FF_IDCT_PERM_TRANSPOSE; } } @@ -113,6 +114,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, avctx->idct_algo == FF_IDCT_SIMPLEAUTO || avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { c->idct = ff_simple_idct8_avx; + c->idct_put = ff_simple_idct8_put_avx; c->perm_type = FF_IDCT_PERM_TRANSPOSE; } diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h index d17a855312..b559f8527c 100644 --- a/libavcodec/x86/simple_idct.h +++ b/libavcodec/x86/simple_idct.h @@ -32,6 +32,9 @@ void ff_simple_idct_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block) void ff_simple_idct8_sse2(int16_t *block); void ff_simple_idct8_avx(int16_t *block); +void ff_simple_idct8_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct8_put_avx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); + void ff_simple_idct10_sse2(int16_t *block); void ff_simple_idct10_avx(int16_t *block); diff --git a/libavcodec/x86/simple_idct10.asm b/libavcodec/x86/simple_idct10.asm index 2807731b54..a247072121 100644 --- a/libavcodec/x86/simple_idct10.asm +++ b/libavcodec/x86/simple_idct10.asm @@ -71,11 +71,34 @@ CONST_DEC w7_min_w5, W7sh2, -W5sh2 SECTION .text +%macro STORE_HI_LO 12 + movq %1, %9 + movq %3, %10 + movq %5, %11 + movq %7, %12 + movhps %2, %9 + movhps %4, %10 + movhps %6, %11 + movhps %8, %12 +%endmacro + %macro idct_fn 0 cglobal simple_idct8, 1, 1, 16, block IDCT_FN "", 11, pw_round_20_div_w4, 20 RET +; TODO: optimise by not writing the final data to the block. +cglobal simple_idct8_put, 3, 4, 16, pixels, lsize, block + IDCT_FN "", 11, pw_round_20_div_w4, 20 + lea r3, [3*lsizeq] + lea r2, [pixelsq + r3] + packuswb m8, m0 + packuswb m1, m2 + packuswb m4, m11 + packuswb m9, m10 + STORE_HI_LO PASS8ROWS(pixelsq, r2, lsizeq, r3), m8, m1, m4, m9 +RET + cglobal simple_idct10, 1, 1, 16, block IDCT_FN "", 12, "", 19 RET