From patchwork Mon Feb 20 15:33:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 2614 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.22 with SMTP id n22csp12378vsb; Mon, 20 Feb 2017 07:41:59 -0800 (PST) X-Received: by 10.28.111.220 with SMTP id c89mr10908298wmi.102.1487605319849; Mon, 20 Feb 2017 07:41:59 -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 g126si12777508wmg.6.2017.02.20.07.41.59; Mon, 20 Feb 2017 07:41:59 -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 DE651689C73; Mon, 20 Feb 2017 17:41:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57E4A689C23 for ; Mon, 20 Feb 2017 17:41:43 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id v77so15036608wmv.0 for ; Mon, 20 Feb 2017 07:41:51 -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=iVSWCof7b6UfyrfOoAaJQsAQFppJyxn5XcOQ9ZY/gSQ=; b=LgfTF32YVFsc1f6sq69JCqTADUb4WbvecjppwyiFAuNzCYV4VrtSWO3yerS4y8CRmM xAZ145CQFzCydKMv0zF7pWEQ/MsoumAkzRE0gf4mrKVAkBDIEinyLSug3OQKOtxhHEVY aNsq6dJAToLZsKIK3gaWgHB1nEp+UMTNWRB01LQXkCQAUxPhkzvDBm/b0U8FVEvSMpns OyL6gtVNQzZSUcSkfJiLyS4UJ1cmsNgvLK+FPq5yudIVR0IpdlrJOp6RwvcLjNHgpOcI INdnfklwSEEqDh9sRDG6+NV5fp7cwIHw85pqjF9PX++himVRZHekrsRZVjkz3/b6305h 3HFg== 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=iVSWCof7b6UfyrfOoAaJQsAQFppJyxn5XcOQ9ZY/gSQ=; b=PKVpNdLRSFUYShNMZHKZPDJoLB+MBZ34Kz6DbgMdM2f2i0Z9EHc/lJsNidNsG5h2JH Hu+YHxRNhALblLylToI4FLRRWF/5qVlLST3M1aUMdas+YHsG87dYI49mjwradX9z+6CY TNmw2X7z9ujxkn3/KOkP5KCxWQL5dQstXJle0A7CGH3/ysGifrVpnALNfqs34OJEEi4P EJUgq8oPogE8ZtRrh4tCr8A1a7sopHVH6Siz/u23//Att17hutQT/GOqSq9FwjPe4bzY pWIsjHcTXnRRlzY4MImVujsiD9l9eFvIPPy26pY4cIw9VgtM3H/9VTtvJnfxk9+yj8jP r0rw== X-Gm-Message-State: AMke39n+Xf7slDm89AylJx2bK9ZdjpO2TBEkerlwKSnYmo99r5lGVGB+S810zcRWRwgYrQ== X-Received: by 10.28.189.195 with SMTP id n186mr18806794wmf.77.1487604832703; Mon, 20 Feb 2017 07:33:52 -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.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 07:33:52 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 20 Feb 2017 16:33:19 +0100 Message-Id: <20170220153324.1732-2-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 1/6] avcodec/h264: add avx 8-bit chroma v 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.24x faster (101 vs. 81 cycles) compared with mmxext function --- libavcodec/x86/h264_deblock.asm | 38 ++++++++++++++++++++++++++++++++++++++ libavcodec/x86/h264dsp_init.c | 2 ++ 2 files changed, 40 insertions(+) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 93caa67..2e84ca3 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -1059,6 +1059,44 @@ ff_chroma_intra_body_mmxext: paddb m2, m6 ret +%macro CHROMA_INTER_BODY_XMM 1 + LOAD_MASK alpha_d, beta_d + movd m6, [tc0_q] + %rep %1 + punpcklbw m6, m6 + %endrep + pand m7, m6 + DEBLOCK_P0_Q0 +%endmacro + +%macro CHROMA_V_START_XMM 1 + movsxdifnidn stride_q, stride_d + dec alpha_d + dec beta_d + mov %1, pix_q + sub %1, stride_q + sub %1, stride_q +%endmacro + +%macro DEBLOCK_CHROMA_XMM 1 + +INIT_XMM %1 + +cglobal deblock_v_chroma_8, 5, 6, 8, pix_, stride_, alpha_, beta_, tc0_ + CHROMA_V_START_XMM r5 + movq m0, [r5] + movq m1, [r5 + stride_q] + movq m2, [pix_q] + movq m3, [pix_q + stride_q] + CHROMA_INTER_BODY_XMM 1 + movq [r5 + stride_q], m1 + movq [pix_q], m2 +RET + +%endmacro ; DEBLOCK_CHROMA_XMM + +DEBLOCK_CHROMA_XMM avx + ;----------------------------------------------------------------------------- ; void ff_h264_loop_filter_strength(int16_t bs[2][4][4], uint8_t nnz[40], ; int8_t ref[2][40], int16_t mv[2][40][2], diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index 10f1940..6794aa5 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -317,6 +317,8 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, #if ARCH_X86_64 c->h264_h_loop_filter_luma_mbaff = ff_deblock_h_luma_mbaff_8_avx; #endif + + c->h264_v_loop_filter_chroma = ff_deblock_v_chroma_8_avx; } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) {