From patchwork Wed Mar 6 20:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 12226 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AAEDE448AEF for ; Wed, 6 Mar 2019 22:28:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94F0868A50D; Wed, 6 Mar 2019 22:28:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 325DF680A65 for ; Wed, 6 Mar 2019 22:28:35 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id g20so7097356wmh.5 for ; Wed, 06 Mar 2019 12:28:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obe-tv.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DP1s3YTMPhs9KueRvAFRd6CytN4U/16dlYJwAZvc5pM=; b=xTxdP3mwCKX6mPUoC/NguH1p7SEFhMT6LoDgXp9BMw7eCiZBfUknRF96UNt/xY+07V auxS7GbbcMTQlqjL3DCWOQMMLwrB4F5eevkJc6iFfhLGCnLLEykKFT9zu+G5tsq6nEWZ 3BMU6iwh5iJzOdwMFWBQm2BH/WZK+2vrBpX+S599PD/tBlNWpHu4Sz29WGzz2Pl4+7Qx AKwzdSbLHOvtDsTKTjfYGk4MXE3v+E8MAeJerk3ygAICQdTZxeggWOfSdNfrYitJkp38 au72BnY6t+3fOs43sUGChSCX9ZCfr/zPD8PVZ/8qITkwO7XMxw+D0E9teYB05BSMBzdw pZcg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=DP1s3YTMPhs9KueRvAFRd6CytN4U/16dlYJwAZvc5pM=; b=SjvscSI6f4k1poFOFK9NDs6ucPtwoB5wEw8b1z8d7iKtsJYF6is3OFLhWU3loeNY1f Ax3xELbO3MRbxZfW/tXboksGWuSDlUfPtSozBHNljeY+OwU1GREU6W+yAe0Tyd/JhlwY VIukk3HgNYD4Ri87VFobx1nhnyaWx43dz/euvlWmzi9Sua6iLrqAkvaw7Do8wCwKZZur F5D3Ja8TWwlzWNH1i26AfEQvad4h8nvRnj9JjNsaE1uM8GC59nMw9KgVLCIZQA5Fk+ZD n+EeOHBsNBiUpeh34VaOPGlhi6ySLI7lNRsEEWJ7EmB0Bjy5OJ4abNeXR79D5Lg9hM4w At8Q== X-Gm-Message-State: APjAAAWvEJl6FOsakOf4PNo9Z4oz6O3Xj4R2rUTcAYUoOPBenOEWckNo xKpBIUdLLbGrcKQdV523Ai+8Ab8CRPY= X-Google-Smtp-Source: APXvYqwQP7RUUrQa4pJpj7k0uoExI/haFriClmDcnW8qhaAaZ9mKV2WsEjns55yuOar6lEiXTvMkSg== X-Received: by 2002:a1c:7ec2:: with SMTP id z185mr3759362wmc.69.1551903618148; Wed, 06 Mar 2019 12:20:18 -0800 (PST) Received: from Highwind.systemlords.lan (ptr-7sz70r1cslylgf1u1t2.18120a2.ip6.access.telenet.be. [2a02:1811:41e:dc00:6dc8:1f8e:32c0:e1a6]) by smtp.gmail.com with ESMTPSA id x6sm5727043wmg.0.2019.03.06.12.20.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 12:20:15 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2019 21:20:06 +0100 Message-Id: <20190306202007.24760-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190304225851.17364-1-jdarnley@obe.tv> References: <20190304225851.17364-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/v210dec: move DSP function setting into dedicated 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Prepare for checkasm test. --- libavcodec/v210dec.c | 16 ++++++++++------ libavcodec/v210dec.h | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index ddc5dbe8be..fd8a6b0d78 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -50,6 +50,13 @@ static void v210_planar_unpack_c(const uint32_t *src, uint16_t *y, uint16_t *u, } } +av_cold void ff_v210dec_init(V210DecContext *s) +{ + s->unpack_frame = v210_planar_unpack_c; + if (ARCH_X86) + ff_v210_x86_init(s); +} + static av_cold int decode_init(AVCodecContext *avctx) { V210DecContext *s = avctx->priv_data; @@ -57,10 +64,8 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_YUV422P10; avctx->bits_per_raw_sample = 10; - s->unpack_frame = v210_planar_unpack_c; - - if (HAVE_MMX) - ff_v210_x86_init(s); + s->aligned_input = 0; + ff_v210dec_init(s); return 0; } @@ -102,8 +107,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, aligned_input = !((uintptr_t)psrc & 0xf) && !(stride & 0xf); if (aligned_input != s->aligned_input) { s->aligned_input = aligned_input; - if (HAVE_MMX) - ff_v210_x86_init(s); + ff_v210dec_init(s); } if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) diff --git a/libavcodec/v210dec.h b/libavcodec/v210dec.h index 533afc435c..cfdb29da09 100644 --- a/libavcodec/v210dec.h +++ b/libavcodec/v210dec.h @@ -31,6 +31,7 @@ typedef struct { void (*unpack_frame)(const uint32_t *src, uint16_t *y, uint16_t *u, uint16_t *v, int width); } V210DecContext; +void ff_v210dec_init(V210DecContext *s); void ff_v210_x86_init(V210DecContext *s); #endif /* AVCODEC_V210DEC_H */