From patchwork Mon Jun 12 13:36:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3925 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp95838vsw; Mon, 12 Jun 2017 06:44:18 -0700 (PDT) X-Received: by 10.223.169.203 with SMTP id b69mr8267570wrd.1.1497275058734; Mon, 12 Jun 2017 06:44:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497275058; cv=none; d=google.com; s=arc-20160816; b=UW3644x0Jd1ra01++RLwuQtR52lNPY9jgqBQE3nmsDHWrlIC8vjQmz5VM73rQv/k9R 3WadPFmzpQ3B1eyjaotCqz8hCDyya9gtavmZf63P+aUdmfVnZkV7GFJ0iPMZBq2AqyXo iu3+kE1wS38EjPEERXNG2cvDJ4julSu66IiG81vsY0Tz8WsWkz5XWHto/FiAEF3DLFIe Zzz2Dl6iIKt9z5i+ecYRMLa3Vo7mAfmCaKNMh375lyA4EoavgWLJ/WmjKmqHvarvyOH4 dzZYrQ/mTZXUC6FU5ZIop6PGAY7Wi7+pXUs9umGeskNO9fx1G5A+dsNd8M0wUf1sbdv5 04vQ== 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=dvKuK9UjWSrS0OXYa79DK2Y1GZSn3rA0nFa6bdy9+kE=; b=Fxur6TxJjrcGwWfjQdeMMAfiCjmKG1NRGsBnVqVyfDt6pO+/dOQD5Gv5SpY4ZUBr7T rIOpe7ZFQ74YP49QADgdNynQ/duvmuOk3bsDo1UvYBFKLpv3t6J8LQdO4E+JYIX4aaTP G8qADqMDzJEkAaWAQqpPEwrnPp8ssINCB3RqjS64Y6n0r8eeHOxNMIKewRRKoJ99ttTm PS/Y/bWamWnhy3PEkUwHLlMQyr5NhDzNvY6GBbDMuE5vvS3EF4R3duA/K9F/3SGuCile ADXL1bDnZHkK0U1uoq1fZK323C/bnL1IjGFBxhze9JV/NmT81vsGXSiHnjNQkUvMnNYZ rUdg== 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 e32si8925871wre.332.2017.06.12.06.44.18; Mon, 12 Jun 2017 06:44:18 -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 1031E689FAA; Mon, 12 Jun 2017 16:44:05 +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 72847689FA4 for ; Mon, 12 Jun 2017 16:43:59 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id v104so22071057wrb.0 for ; Mon, 12 Jun 2017 06:44:01 -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=SrItWiwMdnLpL+f8u40ObJ8bA1O0ZscKk2BvovjHfJg=; b=dgA84ZfrLlBLJFDIALVwnQmtcj1fpS0p6oaMde8XbjiN27j2KsWWteQXPU6JH478Ex Gz8cYXn0FEOef19QxnYzzu3EC3VsomMQQR6qEwTUISBqcReUM3fLUjGCKXw0D/c5PMtP Cytich5zFqtcPcGPZlZTyY75QyNcQglhQUwFzx3SuJK2ZFlR1LcCQzCHCUqYZNT820zd 4R6a5Jhqr3/E8wK8FMmAKsOuh5LrQGKBrqeRSToN1TFVMszlQc+ShCHUHDhuEqjck720 RuAJa/lWlJ0A55FoRsW5ut9D7g6stwGc0iG9z7TKVpV1jrao7TBpr5BYpF6Un0nakJ4H b5QA== 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=SrItWiwMdnLpL+f8u40ObJ8bA1O0ZscKk2BvovjHfJg=; b=ocsT6/By3he9LYu9azDy5efJtAtKucClCYIEatRWs1wLK2JwOnfKLKfSVS2+aVvqhg 1j0n2HRtMcDhE6i5Do9a6UsxkWsaPPpUNM4lrH9u13HgsHR+RWHyKQUzilqcxMG/ibbY vpf7ec3SxsI5GBD67yZOc5pYZuCJpuYBPzIwMMiwr+hzFsEKVLHlC/hBRqZpAMsCtlA0 SPyyswcMcc9Pf0niAI5SgFFwbIv5cv2ZN7hu1uorjqFHs8zeegTDkQvcm37XWME8z2dO I2SXUKE8loAvp7zfQDBYDoHCDn0nPnM1J+V39sKKGMf28jxVwqiklK716Yw2ijkJrU43 Iknw== X-Gm-Message-State: AKS2vOx/witwT7cfOwsVhAQ/JdglQUXTQL0WPHrqkkUvFv3oGNF6PLYL W5Lbwc4T1Aliwc+z3Zc= X-Received: by 10.80.209.215 with SMTP id i23mr7706264edg.165.1497274583831; Mon, 12 Jun 2017 06:36:23 -0700 (PDT) Received: from Highwind.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id t27sm4691091edh.1.2017.06.12.06.36.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 06:36:23 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 12 Jun 2017 15:36:06 +0200 Message-Id: <20170612133609.24172-4-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170612133609.24172-1-jdarnley@obe.tv> References: <20170612133609.24172-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/x86: add x86-64 8-bit simple_idct 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" Rounding contributed by Ronald S. Bultje --- libavcodec/tests/x86/dct.c | 2 ++ libavcodec/x86/idctdsp_init.c | 19 +++++++++++++++++++ libavcodec/x86/simple_idct.h | 3 +++ libavcodec/x86/simple_idct10.asm | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index 34f5b8767b..317d973f9f 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -88,10 +88,12 @@ static const struct algo idct_tab_arch[] = { #if HAVE_YASM #if ARCH_X86_64 #if HAVE_SSE2_EXTERNAL + { "SIMPLE8-SSE2", ff_simple_idct8_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2}, { "SIMPLE10-SSE2", ff_simple_idct10_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2}, { "SIMPLE12-SSE2", ff_simple_idct12_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, #endif #if HAVE_AVX_EXTERNAL + { "SIMPLE8-AVX", ff_simple_idct8_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX}, { "SIMPLE10-AVX", ff_simple_idct10_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX}, { "SIMPLE12-AVX", ff_simple_idct12_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 }, #endif diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index f1c915aa00..4b2145e478 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -94,9 +94,28 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_add = ff_simple_idct_add_sse2; c->perm_type = FF_IDCT_PERM_SIMPLE; } + + if (ARCH_X86_64 && + !high_bit_depth && + avctx->lowres == 0 && + (avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_SIMPLEAUTO || + avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { + c->idct = ff_simple_idct8_sse2; + c->perm_type = FF_IDCT_PERM_TRANSPOSE; + } } if (ARCH_X86_64 && avctx->lowres == 0) { + if (EXTERNAL_AVX(cpu_flags) && + !high_bit_depth && + (avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_SIMPLEAUTO || + avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { + c->idct = ff_simple_idct8_avx; + c->perm_type = FF_IDCT_PERM_TRANSPOSE; + } + if (avctx->bits_per_raw_sample == 10 && (avctx->idct_algo == FF_IDCT_AUTO || avctx->idct_algo == FF_IDCT_SIMPLEAUTO || diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h index d17ef6a462..d17a855312 100644 --- a/libavcodec/x86/simple_idct.h +++ b/libavcodec/x86/simple_idct.h @@ -29,6 +29,9 @@ void ff_simple_idct_put_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_simple_idct_add_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); 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_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 1a5a2eae9b..168b6a08e0 100644 --- a/libavcodec/x86/simple_idct10.asm +++ b/libavcodec/x86/simple_idct10.asm @@ -33,9 +33,11 @@ cextern pw_2 cextern pw_16 cextern pw_1023 cextern pw_4095 +pd_round_11: times 4 dd 1<<(11-1) pd_round_12: times 4 dd 1<<(12-1) pd_round_15: times 4 dd 1<<(15-1) pd_round_19: times 4 dd 1<<(19-1) +pd_round_20: times 4 dd 1<<(20-1) %macro CONST_DEC 3 const %1 @@ -50,6 +52,8 @@ times 4 dw %2, %3 %define W6sh2 8867 ; W6 = 35468 = 8867<<2 %define W7sh2 4520 ; W7 = 18081 = 4520<<2 + 1 +pw_round_20_div_w4: times 8 dw ((1 << (20 - 1)) / W4sh2) + CONST_DEC w4_plus_w2, W4sh2, +W2sh2 CONST_DEC w4_min_w2, W4sh2, -W2sh2 CONST_DEC w4_plus_w6, W4sh2, +W6sh2 @@ -68,6 +72,10 @@ CONST_DEC w7_min_w5, W7sh2, -W5sh2 SECTION .text %macro idct_fn 0 +cglobal simple_idct8, 1, 1, 16, block + IDCT_FN "", 11, pw_round_20_div_w4, 20, "store" +RET + cglobal simple_idct10, 1, 1, 16, block IDCT_FN "", 12, "", 19, "store" RET