From patchwork Wed Mar 11 12:18:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18126 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 5C64C44A490 for ; Wed, 11 Mar 2020 14:19:04 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B4B968AD72; Wed, 11 Mar 2020 14:19:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DEC4868AD72 for ; Wed, 11 Mar 2020 14:18:56 +0200 (EET) Received: by mail-il1-f181.google.com with SMTP id a14so1764196ilk.6 for ; Wed, 11 Mar 2020 05:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=QoVduojUKUqescNEIVO9kv2CiMjw2IH9aMqX7lJ8/XI=; b=pkY/LaCgHcOGL5ERggbTZmiVrMsL+eEh+BdhVI2WriwDkYNOVxrmZ7C/FSwzNzoTD+ UVreVhpP8bx0Ga/qimbcG/uIi3DweVp6eyVnceXNnJ02NATKsNsfH2FcYCP9IUvOXRcS syUKOPX4THE/fpp5ZLieQ4utzKE3PsBccU1+mmEzXzXyUh+LTkdRdiQMyYnWHpBG/DY6 BzZJNJaUInuFcoo2HstIWNNszu1+YY8EioK57DComT2T3r2I8mGrdIdEeXLevGL40+GO bBsMzk8AQuThjCVKq9WfHkVhm0YV9r741jz002igx/j+hQYcAVh12ZsHRTD4R0MLir6g t+1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=QoVduojUKUqescNEIVO9kv2CiMjw2IH9aMqX7lJ8/XI=; b=EU2/uzN0X8NvQocBE+Ml3k3jnklGdDD+ZkkHZhzxS3H+x8sTmNxmfRJ0u9L7iU+m6/ O030uc0qhgFUkxWwF4l4JCvZp6srdF3fnnPiErlE/NzWq16hfUzKA4m7YGEWWnz8NlpJ nVgiDlFX6XgAGxCraPBNdEoccGNLp6uL8TQF5vAJ91B8fS0DzYZk/S5NQynsDkfBS26c O4bbcFOM1WgAq8kpkyM0rHjilRhVfhCIxndrjHM9N79ANiLJsTnjnOL0hqtR70tbjzc4 edN0KNXFrc6dXD1d7bwYLSHOJo6qzkOuR7zUQzhHLsQVcykz+VyVc/HcMv1CWm0drO/x 2Mmw== X-Gm-Message-State: ANhLgQ38P+TzI0Ts+s07Qh8wCzN48wxYppdIiFRJi/s/EqQ44DQyWvph kjqrAd03q8RhnEsHdOMMBQsOlcBAd3ySwU8/zfU95w== X-Google-Smtp-Source: ADFU+vsmU6AuEB2a7JtvVHYnOTbTNzijyWDpvpYgb+fCmr//5Bo4ciEzKH9CndTCouesEnYNu2IKK1qAnh+MahvgC9Y= X-Received: by 2002:a92:49d4:: with SMTP id k81mr2849586ilg.289.1583929135418; Wed, 11 Mar 2020 05:18:55 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Wed, 11 Mar 2020 13:18:44 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/aarch64: Fix compilation with --disable-neon 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" Hi! Attached patch fixes the remaining part of ticket #8565. Please comment, Carl Eugen From c6451d3e57eca639e0272609fd817bf22390111e Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 11 Mar 2020 13:16:47 +0100 Subject: [PATCH] lavc/aarch64: Fix compilation with --disable-neon Fixes ticket #8565. --- libavcodec/aarch64/Makefile | 4 ++-- libavcodec/aarch64/idctdsp_init_aarch64.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 00f93bf59f..aa0b6e5488 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -6,6 +6,7 @@ OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_init_aarch64.o OBJS-$(CONFIG_H264PRED) += aarch64/h264pred_init.o OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_init_aarch64.o OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_init_aarch64.o +OBJS-$(CONFIG_IDCTDSP) += aarch64/idctdsp_init_aarch64.o OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o @@ -41,8 +42,7 @@ NEON-OBJS-$(CONFIG_H264PRED) += aarch64/h264pred_neon.o NEON-OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_neon.o \ aarch64/hpeldsp_neon.o NEON-OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_neon.o -NEON-OBJS-$(CONFIG_IDCTDSP) += aarch64/idctdsp_init_aarch64.o \ - aarch64/simple_idct_neon.o +NEON-OBJS-$(CONFIG_IDCTDSP) += aarch64/simple_idct_neon.o NEON-OBJS-$(CONFIG_MDCT) += aarch64/mdct_neon.o NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o NEON-OBJS-$(CONFIG_VP8DSP) += aarch64/vp8dsp_neon.o diff --git a/libavcodec/aarch64/idctdsp_init_aarch64.c b/libavcodec/aarch64/idctdsp_init_aarch64.c index 0406e60830..742a3372e3 100644 --- a/libavcodec/aarch64/idctdsp_init_aarch64.c +++ b/libavcodec/aarch64/idctdsp_init_aarch64.c @@ -21,6 +21,8 @@ */ #include "libavutil/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/idctdsp.h" #include "idct.h" @@ -28,7 +30,9 @@ av_cold void ff_idctdsp_init_aarch64(IDCTDSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { - if (!avctx->lowres && !high_bit_depth) { + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags) && !avctx->lowres && !high_bit_depth) { if (avctx->idct_algo == FF_IDCT_AUTO || avctx->idct_algo == FF_IDCT_SIMPLEAUTO || avctx->idct_algo == FF_IDCT_SIMPLENEON) { -- 2.24.1