From patchwork Tue Nov 29 11:52:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 1602 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp2394363vsb; Tue, 29 Nov 2016 04:07:27 -0800 (PST) X-Received: by 10.28.48.145 with SMTP id w139mr24594300wmw.113.1480421247532; Tue, 29 Nov 2016 04:07:27 -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 g83si2189084wme.37.2016.11.29.04.07.26; Tue, 29 Nov 2016 04:07:27 -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 04BE7689E46; Tue, 29 Nov 2016 14:07:18 +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 4604D689E3D for ; Tue, 29 Nov 2016 14:07:11 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id g23so24020413wme.1 for ; Tue, 29 Nov 2016 04:07:17 -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:cc:subject:date:message-id:in-reply-to:references; bh=G1O3RDaYP4RVndGq0toH975GUnjJJXIGXO3PoO1lnFs=; b=Dw084OsacQeT6dstmZxJyWOD3OBkqhiPC8SfkAy5kQoshsiCZFjsRgWPrKiurVpgjU 5wUyRiVioKN4Zdfa9H0/4+GIntNJwmBlxAm7ja63DPdkv/LPBW+AhXmTggmXvsVZiwlG XHwmEOxdPYpIsCRAqOsNZQCM42GrkFfcxh1JiKDAQM5w2kR2bRqsXsWMIEEavKPP+Sxd AthbqGmCuEW5OrKEwvxR55qM238ZsM0/gdSuUa+cTbIVlnwa5TLo5CdbIy0nvWdH7ZeK OT+pAlLxRhL8No8HyYkuejE8jFc/sfe4m2qyUAPpNkyr83Ms6vVS9tI80GCIV3Frqq72 J3Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=G1O3RDaYP4RVndGq0toH975GUnjJJXIGXO3PoO1lnFs=; b=J2EY5jp7PAgVn2D28Ihcl3a40Qmx7/0o5urYYjQxlZYdy9mChxGYcb6UkBP3LnEAXm MxVJ9IztQ2YNcgtHbcD3TT3xTCDF7fvl8/rk9dInsOncRsMueHwQPp+UR/ULRK6kEZqK Pq1+yqAKfFU/pQyp/hnCjnS4IK4hzvlFL5siXVC/hwRQcSWXavyJN7VnHeq1nLuGHVs3 VucLnhC/kTYjkAtIPSB2vOi+0lQf/UYykRu11q0t8H0oVJ1hGbGZzjAtPdZcpsyozudq 9MKKNUdnnuhPBRV0f7z1KqQG+bhycn/vL7/95sdaZb6le9Wkd8Kb71Eus0jh3cYfepLu BI/Q== X-Gm-Message-State: AKaTC02XL1JNhTpB/8KYV92g0aQXAlhLXYk3eWYUUAY/fuOTNDh3CzZDI7ZLcrgLvzzpcw== X-Received: by 10.28.156.87 with SMTP id f84mr22476214wme.57.1480420480850; Tue, 29 Nov 2016 03:54:40 -0800 (PST) Received: from Ifrit.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 63sm2445688wmg.2.2016.11.29.03.54.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2016 03:54:40 -0800 (PST) From: James Darnley To: FFmpeg development discussions and patches Date: Tue, 29 Nov 2016 12:52:33 +0100 Message-Id: <20161129115235.8937-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161129115235.8937-1-jdarnley@obe.tv> References: <20161129115235.8937-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h264: mmxext 4:2:2 chroma 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 Cc: James Darnley MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2.1 times faster (401 vs. 194 cycles) --- libavcodec/x86/h264_deblock.asm | 14 ++++++++++++++ libavcodec/x86/h264dsp_init.c | 2 ++ 2 files changed, 16 insertions(+) diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index 4aabbc0..fe0ab20 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -946,6 +946,20 @@ cglobal deblock_h_chroma_intra_8, 4,6 TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) RET +cglobal deblock_h_chroma422_intra_8, 4, 6 + CHROMA_H_START + TRANSPOSE4x8_LOAD bw, wd, dq, PASS8ROWS(t5, r0, r1, t6) + call ff_chroma_intra_body_mmxext + TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) + + lea r0, [r0+r1*8] + lea t5, [t5+r1*8] + + TRANSPOSE4x8_LOAD bw, wd, dq, PASS8ROWS(t5, r0, r1, t6) + call ff_chroma_intra_body_mmxext + TRANSPOSE8x4B_STORE PASS8ROWS(t5, r0, r1, t6) +RET + ALIGN 16 ff_chroma_intra_body_mmxext: LOAD_MASK r2d, r3d diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index d2452c7..027c1ae 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -130,6 +130,7 @@ LF_FUNCS(uint8_t, 8) LF_FUNCS(uint16_t, 10) void ff_deblock_h_chroma422_8_mmxext(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); +LF_IFUNC(h, chroma422_intra, 8, mmxext) #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL LF_FUNC(v8, luma, 8, mmxext) @@ -249,6 +250,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmxext; } else { c->h264_h_loop_filter_chroma = ff_deblock_h_chroma422_8_mmxext; + c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma422_intra_8_mmxext; } #if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL c->h264_v_loop_filter_luma = deblock_v_luma_8_mmxext;