From patchwork Wed Apr 10 12:47:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 12692 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 BB7E14494CA for ; Wed, 10 Apr 2019 15:54:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 95D5268AEF2; Wed, 10 Apr 2019 15:54:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEE0868ADD7 for ; Wed, 10 Apr 2019 15:54:48 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k17so2794295wrx.10 for ; Wed, 10 Apr 2019 05:54:48 -0700 (PDT) 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=cfCdzIOtQc8vkSYqxtHFm2CaFlHkGVO5eoWiYFT5Nhs=; b=cK+PInMAwuE/kpkcieR8KICPUL+6Dw3eSSBCE9qUusO7MEWJsH+jLCBmcx9cJR8c52 6vYgA3BzKmivdCZ5fohXJAiXVl9IC1joj1MjtkDOFOb47ScA8/a1FuDQZ8jppaoPO11D T9ir6yHCnUULGz6956/Kvx4CWTENv5SZFi49VCSLs72IQ9kOs1CoHb2KcmLR3vaif22S FPQpT3Mg589C8ryNtBJN72MIUp/ltnqHEx8QFa8abVJYm9YvdP3VOZwCabmHVp0IBkAK AfsRQWUOEg9d1ysaBCvqSqAhSNSb0c6AO1cZtcET3eLhyg1eXQw7xrVCj17JYlad0grn iOqg== 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=cfCdzIOtQc8vkSYqxtHFm2CaFlHkGVO5eoWiYFT5Nhs=; b=g4TWaWNAoxRcFnu1bzXsWwu224wAWzTYa8HoSClU8tBexcpbFIJphPEzj2lW5EBNyp IV1QPGj8o+ypEkTUepE097po5PNePqcQ2Ntm8ygqU2w2AbjBMd8EIYSjDomtwHLo73ZS NFyxOisytZd2Ket3g/KDLxIJgRHklelueW3aPXrV7f70Ma8ezNe2blaKsBYe/2hIvhKe PNwyWaNyTouW18t4QNthV/TePcBsMtSC60TU8RkfvRFN8UKD9kK8cA3i/cKDD33vBtAt 7Juvzy1/mBwBXncVOBhoHfk0BDQsl2YtE9KAxz0FHTXHuEa0HnkQxhNqYfsAW4sh0Ge2 yVIg== X-Gm-Message-State: APjAAAX7C7KOCmcScBQhkMftAIUhSKoi5l26Fe8ELHGEDsBP8PohJmWr aLGA4iPgMsDYidOW3lrne+2YHFOOAK8= X-Google-Smtp-Source: APXvYqyUHG3UdxZfio9nTZUCW3fcvcmDzjyD4DuGnQFnrHIrYKShrF24U16LHg2Vbs4KcUc6MUHelQ== X-Received: by 2002:adf:d848:: with SMTP id k8mr27802507wrl.185.1554900487883; Wed, 10 Apr 2019 05:48:07 -0700 (PDT) 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 61sm119323070wre.50.2019.04.10.05.48.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 05:48:07 -0700 (PDT) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Apr 2019 14:47:47 +0200 Message-Id: <20190410124749.9362-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190410124749.9362-1-jdarnley@obe.tv> References: <20190410124749.9362-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] 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 */