From patchwork Tue Nov 20 01:51:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 11081 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 13E2444CEA6 for ; Tue, 20 Nov 2018 04:23:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DC10689E95; Tue, 20 Nov 2018 04:23:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m50-112.126.com (m50-112.126.com [123.125.50.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61213689BC4 for ; Tue, 20 Nov 2018 04:23:09 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=O6BPPu55MWeXqc/rUe LPp+U6q40IHmrnkWqsodcew18=; b=R9j61Sr+SDVh1jgo1sdbBbjVzhi6WVoNQk +rg6a36huJ4gK/uDj8I2tDkngFfL8Ovb84gS4wncAXd5yarHGi9TypCC6Avau/GF UZkvhoRFHs1Fy/5K3NIB//T9MQGQc/AZQ7fcp6OfCOl3daInicXctPJcrQHWx+27 Ml/HgM9xw= Received: from localhost.localdomain (unknown [114.242.249.221]) by smtp6 (Coremail) with SMTP id j9KowAC3UTK3aPNbcAGqAQ--.138S3; Tue, 20 Nov 2018 09:51:52 +0800 (CST) From: hwrenx To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Nov 2018 09:51:49 +0800 Message-Id: <1542678711-16289-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: j9KowAC3UTK3aPNbcAGqAQ--.138S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZFWkKF1DurW3uFyxGry5CFg_yoW8Aw13pr ZrJrn8JryUJa4FkFs7try0kay8GrWqga1rJwn3WF18G34av34j9w1kJF43ZF1IvFWkZ345 Za4vkF1UKr18Gr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jcqXQUUUUU= X-Originating-IP: [114.242.249.221] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi2woF6VpD7CmciwAAs2 Subject: [FFmpeg-devel] [PATCH 1/3] libdavs2: update api version and enable avx option 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" Signed-off-by: hwrenx --- configure | 2 +- libavcodec/libdavs2.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b4f944c..1a9f874 100755 --- a/configure +++ b/configure @@ -6076,7 +6076,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.0.1" "dav1d/dav1d.h" dav1d_version -enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.5.115" davs2.h davs2_decoder_open +enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 874f2f0..9a905b8 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -40,11 +40,14 @@ typedef struct DAVS2Context { static av_cold int davs2_init(AVCodecContext *avctx) { DAVS2Context *cad = avctx->priv_data; + int cpu_flags = av_get_cpu_flags(); /* init the decoder */ cad->param.threads = avctx->thread_count; cad->param.info_level = 0; cad->decoder = davs2_decoder_open(&cad->param); + cad->param.disable_avx = !(cpu_flags & AV_CPU_FLAG_AVX && + cpu_flags & AV_CPU_FLAG_AVX2); if (!cad->decoder) { av_log(avctx, AV_LOG_ERROR, "decoder created error.");