From patchwork Mon Feb 20 15:33:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2611 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.22 with SMTP id n22csp11307vsb; Mon, 20 Feb 2017 07:39:21 -0800 (PST) X-Received: by 10.28.214.137 with SMTP id n131mr10425638wmg.120.1487605161433; Mon, 20 Feb 2017 07:39:21 -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 c5si10539003wrb.34.2017.02.20.07.39.20; Mon, 20 Feb 2017 07:39:21 -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; 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 91D62689C4A; Mon, 20 Feb 2017 17:39:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25F1C689B87 for ; Mon, 20 Feb 2017 17:39:02 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id r18so15026280wmd.3 for ; Mon, 20 Feb 2017 07:39:10 -0800 (PST) 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=UcamUjlDqnhojP7Lr4/NMg9SyHFLzFHBy2fCsk9H7Bc=; b=AuA0Fbnq+Q4JGygnP54r+8Ra+TzydFw53aPFa7DrHLMTBozAHHq9DPA9TZSvcLePoo vCJKYeCmS3Lo4RvyXoorIFI1NFerdmbD+sPgjmIrGU2hB8Oc4IXhmA3LdQeyF7mjLsnK 6rT7Gqi2vLm7neP7WzDw23e56bHQU0CnqyOcUjXbZyoudZ3F41+9xAv0xU6O0E2kFtHH yu0YNY+7WPyoykCrpVerpOLGejjNEi96DKXIJ68x1k1Vl7B6JNeqk5NI7RHqGU8DmifI eR/eTrFSse9Yx3o+/rpIJHIfKPWa3Z2eLUK+lGoXXhrdieg8PPZ7sc/75/Sv6i0qKS2C vi2A== 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=UcamUjlDqnhojP7Lr4/NMg9SyHFLzFHBy2fCsk9H7Bc=; b=YVA8ZWdwCZ+n9XwhVWLovhD4UDmzgBt5IQ316iR3z30yn4wOsrZzew6rnvIHCaAbwz KG8GxFymUZqWYF9ITEx1EFrlLkEroUuQs5SAgyfdmijD64kTLhhTuHlIb5XyvcchKroD x095hv43m6xR4KejSzhLmm+3T0hYBL+6t5WOZsG6g3FgunvWe6Xk17FILo/M4FohKQoy SsoWFnkiPyoHWyqKc7cIbrlU+6pUWAKt6tPs4aKUrZyRu6nIhjzsTbyjor3XPgFaUU0y nFPo+pYbFL5CmN61pkyeZR4NqNjRqYp1QZztgfuZdWPhS5jw7oFI4tPLEHdwbs88jJBT W2pw== X-Gm-Message-State: AMke39mZmrHE3UJ+soP5edll5SdKv5e/1KYVaTtjIwB2ZXp4dDKCgRwmKNOjEYt61hNscw== X-Received: by 10.28.216.14 with SMTP id p14mr18808404wmg.56.1487604834986; Mon, 20 Feb 2017 07:33:54 -0800 (PST) Received: from localhost.localdomain (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id c133sm13865977wmd.13.2017.02.20.07.33.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 07:33:54 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 20 Feb 2017 16:33:22 +0100 Message-Id: <20170220153324.1732-5-jdarnley@obe.tv> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20170220153324.1732-1-jdarnley@obe.tv> References: <20170220153324.1732-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/h264: add avx 8-bit chroma v intra deblock/loop filter 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" ~1.14x faster (90 vs 78 cycles) compared with mmxext --- libavcodec/x86/h264_deblock.asm | 33 +++++++++++++++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 1 + 2 files changed, 34 insertions(+) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index e2eb002..1e6d822 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -1117,6 +1117,28 @@ ff_chroma_intra_body_mmxext: DEBLOCK_P0_Q0 %endmacro +%macro CHROMA_INTRA_BODY_XMM 0 + LOAD_MASK alpha_d, beta_d + mova m5, m1 + mova m6, m2 + pxor m4, m1, m3 + pand m4, [pb_1] + pavgb m1, m3 + psubusb m1, m4 + pavgb m1, m0 + pxor m4, m2, m0 + pand m4, [pb_1] + pavgb m2, m0 + psubusb m2, m4 + pavgb m2, m3 + psubb m1, m5 + psubb m2, m6 + pand m1, m7 + pand m2, m7 + paddb m1, m5 + paddb m2, m6 +%endmacro + %macro CHROMA_V_START_XMM 1 movsxdifnidn stride_q, stride_d dec alpha_d @@ -1190,6 +1212,17 @@ cglobal deblock_h_chroma422_8, 5, 7, 8, 0-16, pix_, stride_, alpha_, beta_, tc0_ STORE_8_ROWS PASS8ROWS(pix_q - 2, r5 - 2, stride_q, r6) RET +cglobal deblock_v_chroma_intra_8, 4, 5, 8, pix_, stride_, alpha_, beta_ + CHROMA_V_START_XMM r4 + movq m0, [r4] + movq m1, [r4 + stride_q] + movq m2, [pix_q] + movq m3, [pix_q + stride_q] + CHROMA_INTRA_BODY_XMM + movq [r4 + stride_q], m1 + movq [pix_q], m2 +RET + %endmacro ; DEBLOCK_CHROMA_XMM DEBLOCK_CHROMA_XMM avx diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 6073932..cc86664 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -319,6 +319,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, #endif c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_8_avx; + c->h264_v_loop_filter_chroma_intra = ff_deblock_v_chroma_intra_8_avx; if (chroma_format_idc <= 1) { c->h264_h_loop_filter_chroma = ff_deblock_h_chroma_8_avx; } else {