From patchwork Thu Jul 19 14:52:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 9761 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1784971jad; Thu, 19 Jul 2018 07:53:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeNmUzSuverLyujjdhMStyXSh6epyqc3pqQ7mkyHroe99m0P01H8rFToqTe7uu268Lq8FOP X-Received: by 2002:a1c:1182:: with SMTP id 124-v6mr4553086wmr.75.1532012032935; Thu, 19 Jul 2018 07:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532012032; cv=none; d=google.com; s=arc-20160816; b=Msc0SMpqwqq0XisWXX+ACm/WkQg4Tcs/j6yG8gR5upbsxgd2n3MXfGqNc4Tyge4wXL DEZNNYkSnArEoeJWIcEIBZwTDlbA5etOTe8M7yVbssMG62gRtiy4gRreoas6fr11fXV3 cBV2gZCDTKjeicmNIw4CgNzfy4xllc2rZfOb6PPbw9C3FS3Q3ya7P1UlGU/P9ZZRkyBU JOXgNYALM6dc6M9m/caALXDEJWQK1QXvGYuOK/sagxmO4FXw9Kd62/yUSQt+JUYoEu3d q0II8E4baoeCui1+Ye42E7yNc/Voiv4Pri9TOaqUatQK6Iw1opHZD3kcr7q71V86HuNU 5v1g== 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=ZsmCx61P33Gm9EGpuJGUiMEWBIbHz1WGHKJwCZAojko=; b=ptFrNyPy8DJjDXxHTRW01NoI9wPAf16EPNm3CqS5o7I/3EuKm+X2Y821ISq9WHCu8X InYtz9vUrZGIf/hrDU0zyN88i0qd+/dUxC01MjC2lBM4j15XiZaklLOhlz8YXIFcQH+y 6ad2DJcqB8j8tbcMLnK3OUo3GoS6XxOLl3MnDWyQFJ3oJcUvpc2OSO/QGMT1RJLy0EPp smlKZT26wtkagnaRWfM3jeGIR1epzJZmI6DuGUWjMuWYbiaO6XQqw5a9rK4LvrUZhyFI NCjXs2MRjkTucw8G5P+Tj7rmmpqBDEEh+lpJsDUM2fmkfgmjpg4WL3aYTtotLmKCOKI0 lCNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b="S41Dj8f/"; 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 b128-v6si3285772wme.91.2018.07.19.07.53.52; Thu, 19 Jul 2018 07:53:52 -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 header.s=20150623 header.b="S41Dj8f/"; 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 3F2CF689F09; Thu, 19 Jul 2018 17:53:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94C32689E1D for ; Thu, 19 Jul 2018 17:52:57 +0300 (EEST) Received: by mail-ed1-f44.google.com with SMTP id b20-v6so7298440edt.10 for ; Thu, 19 Jul 2018 07:53:09 -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=8gCm0EJEZO5TaMdKG6JzDkiIVqhN94idXjMMkLmWGnY=; b=S41Dj8f/KdtMhQqsG+vTRkvKlWj9wP3zZ5LCDhg7Ksf0xNz/g14eyEPuGIrgayaTgA yiWR+5GZObtGAPNaMZhwqdf73HAm63DOVB70/1HH++Fn5zapd3vHsCBQ+gyjqdVsog9b BJzYhwsG6hw+BTzeyDNZJbPLQYlB+lJ+4sUc7nuBdHTmYI/V0YaPQQj3w8nwVIsV7P2e BtAo+SFby4/obvkzGBWqnXti+AI9I/fu3/kKIPp1ykgsvx2dVdvZiqgsY7JZRmRt4XyW z60wwUg5d2Lvyccr9Y+c5LFBCNiR49CiWB5pEe5clFbPtVAt51hFUg3gNJVLqd0q9hb9 H6Ug== 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=8gCm0EJEZO5TaMdKG6JzDkiIVqhN94idXjMMkLmWGnY=; b=UYLbaUyChFIapCEBMwwO3+rOJ2/91gLgpRPeOpSr7KTlCFEmmxXTKjodTtFLxiNbXh QcDhzTHMIcH2UQ7FGGpBR3XVJnTzsjyLCfGPhPm16z7z2h9JCs5rXX4YHFDNR3UOJIhF XbnsCdH7XJ2vvkR8muwZsKp1PnE2YARUxyWYfDcCPAVkih2Xb7yQfBPBRqpOhc59anXv rAs/R2JtkgCRvvty5PRTJqn6O0UkOn2FJ6viXzGc18qNcjdSHnEH8/2nFIbFst0dKVx5 qRtRoaT8bBUr6pBZrZedo5x5PP3Czdxl8xFyl2e1zQZq7hUowtfkb5PHUd6r+bjafBWP f+SA== X-Gm-Message-State: AOUpUlEHi6WkbuqwQj+DFFI58KW5xeUgz5+IHy0zEQscjE9rEv7i3zKq tnlP99tpG5SPyWJ0n17RKFq6g/JA27o= X-Received: by 2002:a50:a962:: with SMTP id m31-v6mr11463503edc.180.1532011988300; Thu, 19 Jul 2018 07:53:08 -0700 (PDT) Received: from Highwind.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id y10-v6sm3620960ede.38.2018.07.19.07.53.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jul 2018 07:53:07 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Jul 2018 16:52:50 +0200 Message-Id: <20180719145252.30613-5-jdarnley@obe.tv> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180719145252.30613-1-jdarnley@obe.tv> References: <20180719145252.30613-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 4/6] diracdec: avx2 legall 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/dirac_dwt_10bit.asm | 4 +++- libavcodec/x86/dirac_dwt_init_10bit.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/dirac_dwt_10bit.asm b/libavcodec/x86/dirac_dwt_10bit.asm index 681de5e1df..ae110d2945 100644 --- a/libavcodec/x86/dirac_dwt_10bit.asm +++ b/libavcodec/x86/dirac_dwt_10bit.asm @@ -24,7 +24,7 @@ SECTION_RODATA cextern pd_1 -pd_2: times 4 dd 2 +pd_2: times 8 dd 2 pd_8: times 4 dd 8 SECTION .text @@ -204,3 +204,5 @@ HAAR_VERTICAL INIT_YMM avx2 HAAR_HORIZONTAL HAAR_VERTICAL +LEGALL53_VERTICAL_HI +LEGALL53_VERTICAL_LO diff --git a/libavcodec/x86/dirac_dwt_init_10bit.c b/libavcodec/x86/dirac_dwt_init_10bit.c index e7e7534050..51d6eeae93 100644 --- a/libavcodec/x86/dirac_dwt_init_10bit.c +++ b/libavcodec/x86/dirac_dwt_init_10bit.c @@ -27,6 +27,8 @@ void ff_dd97_vertical_hi_sse2(int32_t *b0, int32_t *b1, int32_t *b2, int32_t *b3 void ff_legall53_vertical_hi_sse2(int32_t *b0, int32_t *b1, int32_t *b2, int width); void ff_legall53_vertical_lo_sse2(int32_t *b0, int32_t *b1, int32_t *b2, int width); +void ff_legall53_vertical_hi_avx2(int32_t *b0, int32_t *b1, int32_t *b2, int width); +void ff_legall53_vertical_lo_avx2(int32_t *b0, int32_t *b1, int32_t *b2, int width); void ff_horizontal_compose_haar_10bit_sse2(int32_t *b0, int32_t *b1, int width_align); void ff_horizontal_compose_haar_10bit_avx(int32_t *b0, int32_t *b1, int width_align); @@ -112,6 +114,22 @@ static void legall53_vertical_hi_sse2(int32_t *b0, int32_t *b1, int32_t *b2, int b1[i] = COMPOSE_DIRAC53iH0(b0[i], b1[i], b2[i]); } +static void legall53_vertical_lo_avx2(int32_t *b0, int32_t *b1, int32_t *b2, int width) +{ + int i = width & ~7; + ff_legall53_vertical_lo_avx2(b0, b1, b2, i); + for(; ivertical_compose_h0 = (void*)legall53_vertical_hi_avx2; + d->vertical_compose_l0 = (void*)legall53_vertical_lo_avx2; + break; case DWT_DIRAC_HAAR0: d->vertical_compose = (void*)vertical_compose_haar_avx2; break;