From patchwork Wed Jan 18 21:45:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 2254 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1222303vsb; Wed, 18 Jan 2017 13:52:36 -0800 (PST) X-Received: by 10.223.135.8 with SMTP id a8mr5527357wra.162.1484776356474; Wed, 18 Jan 2017 13:52:36 -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 b62si1821220wrd.98.2017.01.18.13.52.36; Wed, 18 Jan 2017 13:52:36 -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=@martin-st.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 4E28068A4D0; Wed, 18 Jan 2017 23:52:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E016868A4C2 for ; Wed, 18 Jan 2017 23:52:08 +0200 (EET) Received: by mail-lf0-f65.google.com with SMTP id q89so3413454lfi.1 for ; Wed, 18 Jan 2017 13:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=PDO7dP4fnPW1drxyqfxOW+mcNzUducHr5Z9gDTrPBzM=; b=FV8pKLFRngzxnz3Yzjkpso8tOv33rhv+TZUMHScwyGy3ypqri19PtqdjW+Dx4gAn6+ kwG6mOmbOEWPr15SsV80SxkbHaGfMeNv6ekkk5fZ0RtFmlEs5LLlvNJNTKXQGii+F+a/ IbdjaN3cpH1ofPT6wDSYaHuxiqLOq1puWPpEbg9NhmuEBdtqK1LKaaAjFcwCrDp/zRW3 1gtrn6zNMXfbMlsDLwpguCrZ43J8SMe3+rO3Fivz0fR8Rthe6bPktjmqWA5cjClUGvli 7d7gmko4YQRQCfGanDswuqGmNEKmlap+SlEMczYYMcodOlAEpzot3fiHm/pFtyrBHS1L u6CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=PDO7dP4fnPW1drxyqfxOW+mcNzUducHr5Z9gDTrPBzM=; b=FjMLJU1dEk774ePMjARKlUsUCgZjWjfACceX8yNNCWdWSNY+xxrqnQiYBRFj0AF3ja Jxawmd23X4LJsUHSj0XTcKg/LOTw9kMdJAQbb975IRMXoJryLxTCcAV3Srd1axRTnH8F yuO7E1JlmNRxVrx97WNUV4u+44VCpL3zjawRUXCBVlzfKI4AAphK8B3G+lwxg7X9hD5q mm8zL3a6bJmDT3XXXm8Bwz7Hag8KdcFs9vMY7UAkZeiNCG6LEDzPsa9fgsRbRqNx+WyX Nfc0ucisUPAj+y/bassO0jo6n6J3v8S76ADYrW6//UcDEd31brw6ARqxSKp8if9livwG hD7A== X-Gm-Message-State: AIkVDXKvSeXn3uf18qb2MIB/D0l1r+yH2JLkWXqYT9Dro1yxXP6otl11E2SYU3Oy2BkpNw== X-Received: by 10.25.199.66 with SMTP id x63mr2218907lff.161.1484775917582; Wed, 18 Jan 2017 13:45:17 -0800 (PST) Received: from localhost.localdomain ([2001:470:28:852:3048:584b:aaef:61c1]) by smtp.gmail.com with ESMTPSA id s28sm852125ljd.20.2017.01.18.13.45.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jan 2017 13:45:17 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jan 2017 23:45:08 +0200 Message-Id: <1484775915-25188-1-git-send-email-martin@martin.st> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/8] arm: vp9dsp: Restructure the bpp checks 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" This work is sponsored by, and copyright, Google. This is more in line with how it will be extended for more bitdepths. --- libavcodec/arm/vp9dsp_init_arm.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/libavcodec/arm/vp9dsp_init_arm.c b/libavcodec/arm/vp9dsp_init_arm.c index 05e50d7..0b76eb1 100644 --- a/libavcodec/arm/vp9dsp_init_arm.c +++ b/libavcodec/arm/vp9dsp_init_arm.c @@ -94,13 +94,10 @@ define_8tap_2d_funcs(8) define_8tap_2d_funcs(4) -static av_cold void vp9dsp_mc_init_arm(VP9DSPContext *dsp, int bpp) +static av_cold void vp9dsp_mc_init_arm(VP9DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (bpp != 8) - return; - if (have_neon(cpu_flags)) { #define init_fpel(idx1, idx2, sz, type) \ dsp->mc[idx1][FILTER_8TAP_SMOOTH ][idx2][0][0] = \ @@ -160,13 +157,10 @@ define_itxfm(idct, idct, 32); define_itxfm(iwht, iwht, 4); -static av_cold void vp9dsp_itxfm_init_arm(VP9DSPContext *dsp, int bpp) +static av_cold void vp9dsp_itxfm_init_arm(VP9DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (bpp != 8) - return; - if (have_neon(cpu_flags)) { #define init_itxfm(tx, sz) \ dsp->itxfm_add[tx][DCT_DCT] = ff_vp9_idct_idct_##sz##_add_neon; \ @@ -218,13 +212,10 @@ lf_mix_fns(4, 8) lf_mix_fns(8, 4) lf_mix_fns(8, 8) -static av_cold void vp9dsp_loopfilter_init_arm(VP9DSPContext *dsp, int bpp) +static av_cold void vp9dsp_loopfilter_init_arm(VP9DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (bpp != 8) - return; - if (have_neon(cpu_flags)) { dsp->loop_filter_8[0][1] = ff_vp9_loop_filter_v_4_8_neon; dsp->loop_filter_8[0][0] = ff_vp9_loop_filter_h_4_8_neon; @@ -249,7 +240,10 @@ static av_cold void vp9dsp_loopfilter_init_arm(VP9DSPContext *dsp, int bpp) av_cold void ff_vp9dsp_init_arm(VP9DSPContext *dsp, int bpp) { - vp9dsp_mc_init_arm(dsp, bpp); - vp9dsp_loopfilter_init_arm(dsp, bpp); - vp9dsp_itxfm_init_arm(dsp, bpp); + if (bpp != 8) + return; + + vp9dsp_mc_init_arm(dsp); + vp9dsp_loopfilter_init_arm(dsp); + vp9dsp_itxfm_init_arm(dsp); }