From patchwork Wed Mar 6 19:35:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 12224 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 9F9CC446349 for ; Wed, 6 Mar 2019 21:35:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89096689BFC; Wed, 6 Mar 2019 21:35:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E14A6680376 for ; Wed, 6 Mar 2019 21:35:44 +0200 (EET) Received: by mail-lj1-f196.google.com with SMTP id v10so11986521lji.3 for ; Wed, 06 Mar 2019 11:35:44 -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=R7OEROAbbbZ72g3WzzLHdhc2v3uv7N25VTn9C6OdGfs=; b=u/wNJPzVKxRnJOqSmnuW+1dVGIthj2AwCofXTGz8M4w4LrUN/kmEoTyZRH6RwTJfeR Tufuth/dFw+CXimW7GsBdDoafvlefGv133MPMWXdujyResqI07On2mv1PEP30Jy2MtV9 eXNeqL7fOWCxvVaGIVLUM1yi6Gpw/3ZlU5XP7L5gu2DtVFI/gNJT7B7kuVQfxB18mQHA hj2ogiTN1gX39EOUJQqYcodWVeHddyo2dWW2ekirM74tDGRFC72RdIHNGlYnbFkKzz5H wuSVlPRv/DCyB7ieXbC7XBF0uHHjBOPdpmg3KYxJZ9xEoOcnrn+x1PxmRyNL9Z/8YVcX aAKQ== 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=R7OEROAbbbZ72g3WzzLHdhc2v3uv7N25VTn9C6OdGfs=; b=NdljPUGBGikxnjR+J/WC+FhMCDYt9Luo/WvFKXtvGrsV4AUFGb0wUaCDpiIRpf/kwt CtVwW23lNAAO7gwseZ4vyVx75UIS42yFlK4atnh+RIM2urPNroZUPtJQCsXNn9dN4z8i I66uYp2gNbc6wwvsprVc2QCv+3Vt+IqpAZAjPKePdRLzq++IdgpQzkgqXpqzWjI1mRUk T1R+8zonjo2gUgNuDWTqP22uhqWP1uQIUnLQIBcG8CRE2w+3wNk+Xts20sTOR7DyzxLM l8MBm3feHlQShh7mtFivpraOFxAdfrV15Nxf3t0BTZJsdQ4BR+haq47elfE9PkKzZ2K7 Qzow== X-Gm-Message-State: APjAAAUM4LGsjNXYW/tAWQms6dy70h6Chhv1lV/aTgAKNv0DVx5Cc0eF IsOzj+ztnDEqAr4LslsJTtABXYIT/HI= X-Google-Smtp-Source: APXvYqxPo3QVW+AyJMIvQ1wd2KNpnExCElv9IASZ/4GdE9oQJPBFLP5ZgDXYBbRmIEU+YYwbEA0yfg== X-Received: by 2002:a2e:9cc7:: with SMTP id g7mr3421203ljj.33.1551900943894; Wed, 06 Mar 2019 11:35:43 -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 h12sm529192lji.63.2019.03.06.11.35.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 11:35:43 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2019 20:35:39 +0100 Message-Id: <20190306193539.22333-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] 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..6db662538e 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -50,6 +50,14 @@ 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; + s->aligned_input = 0; + if (ARCH_X86) + ff_v210_x86_init(s); +} + static av_cold int decode_init(AVCodecContext *avctx) { V210DecContext *s = avctx->priv_data; @@ -57,10 +65,7 @@ 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); + 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 */