From patchwork Fri Sep 1 18:00:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4945 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp871314jao; Fri, 1 Sep 2017 11:08:15 -0700 (PDT) X-Received: by 10.223.187.75 with SMTP id x11mr1657745wrg.103.1504289295171; Fri, 01 Sep 2017 11:08:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504289295; cv=none; d=google.com; s=arc-20160816; b=GWF3PwtEL112Gsu6doFh7VPxFsgMFqSGdJ4U4ai7k3gNQtNLZqoELCcaFreXXvHwJy VCX4ERVt46q6tQRuvFTlklLFjbJS/lc+pzXA1XBusAxLBp1oz3jz3Q3avuViiNqnlNEC IEqeudsJELMXls+aQ1LfvQUI2A7shA3RlkELpMiS/4LIi4F+INVVlvfFj/jKP5ePFnTu qQYtfCxBHMpMvess4tMk6EqBbpLc5RPtuVcpjsfdEvzwNyU34vdLzBBsYtnzb1nIur3G QCX+E5Ep21961zvmkc4ZYZWVfcYGyrHdnKCmB3mpCRTxWwAC426YQ0ehn2H6ThCx7o1R 1/9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=067SuMiwSkhROTins3tsMb4HZru2aLDlbE9cxky1BfQ=; b=V8c53ASj5GYP7rnRODGmtTiK8MKiD7zI2FlzndRpBYm4Cz2WA0/Q53J+PUWbwsKGKn 8O0Fu9ipAJZoCAYEwzdNfcBCIIZsdYf86SSXy+iI5rYTiMis1g+ZQleQcDKveQzNImD/ knanQ2JOPi40ZYHLfwq65byACarPBAH2zs+RULYdL/kCP0f7NclG3ZqjCZZBH+2iq30O BWNO1z6bSuhSMv0NvAEm0nsI4itXbSqIBR0ziAcbAwCXUoS31IRd7u0iKtYYHTPo5lAR 98cVdeE2cza/Jl4pxdvZrYyddmG09y3kxLuMx8WEGs8aPwO9SRycokXd9E8fPckTlIPh iRLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WF6ZKYph; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y19si521348wrg.364.2017.09.01.11.08.14; Fri, 01 Sep 2017 11:08:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WF6ZKYph; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3247E68A2C1; Fri, 1 Sep 2017 21:08:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBFEA68A2AD for ; Fri, 1 Sep 2017 21:08:05 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id e2so717481qta.3 for ; Fri, 01 Sep 2017 11:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=KhjZkg+OB4hXjJHHvshrBuYi+cEZjOYf+v9lSzmI/zM=; b=WF6ZKYphATYo/vui5xK7slvR2qVN3CBSsm6cpBPlCGSjYOqPIcEBAaAzuSV//jB7Z0 Fvint/CDsv5Kt+X8TM1P3sR63B6DlF+EUOZ6NOKzWM72dekhu10hQGgOsP4rK/cOrmKa WfwnoVWom1sHBG3qfWVHb/u/0h1U0vqccPHWYKDlqh7av7a7jiXTTIbWYWMhZqVnpufg tVAHaL4UrEmhD0eB0RrepqkETtdgSfWepb9sORGyihs/XRwGJeCHPrzyEnBmUWiN7DK1 2W6WfKpmxwu19CCLEu7ot4km/NZzqNi7mqAT1d1+T7J+NEpk7gVcQv98rEdmcGdX2e0Y Wamw== 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; bh=KhjZkg+OB4hXjJHHvshrBuYi+cEZjOYf+v9lSzmI/zM=; b=PMeRAhao9aTGtvslVaOmeny/Q8EuQ8nkBGYczZIPWDgwl78aroPnnlNoOg1Nzd9bAC 9YuuUCFGFh33dPqXlrhdOoKZd1el5W1Ozxxn07CvMi2/YoYfEy3ma/HKmTzVW02FPA3r mJyrXcYpRuCIFwULDmJ5/eBrgQLD53ExDpmvUiko/3y9HCZZYztKrBm8E5bAcOuSMbec dXxsuonL0CTyTzwjG3W2mWE9EvNvIbFkqYs25LSCfnJpU7cChETeivfBdlRl4c0QxNVn NF7jcn9s834J4+hEdcpSK7lQWWuCF3KJWSCq9UsMsTyiySa2gC6Yf8TdW1Ltrk5zbFl1 Gpog== X-Gm-Message-State: AHPjjUgAagc5/KoeHyifZzq4IYiX83fK7FBjTN+id9z//71XTa44MdXO Qt2NQ1K7Qf/Laz7g X-Google-Smtp-Source: ADKCNb5cm//6A2U8DLNeulmRiPHmpIxWmIzzf5Fq+KtI0jO53qMV5of/bBV6X6kg5RzoLbsg6tSq6w== X-Received: by 10.200.24.68 with SMTP id n4mr3860517qtk.248.1504288828325; Fri, 01 Sep 2017 11:00:28 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id y27sm547157qtc.10.2017.09.01.11.00.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Sep 2017 11:00:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2017 15:00:16 -0300 Message-Id: <20170901180016.704-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH][RFC] avcodec: add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL flag 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" This flag replaces the deprecated, non-prefixed HWACCEL_CODEC_CAP_EXPERIMENTAL one. Signed-off-by: James Almer --- No HWAccel uses HWACCEL_CODEC_CAP_EXPERIMENTAL at all. I wonder if we shouldn't instead just not bother replacing it and consider adding it once and if an hwaccel is ever committed in an unfinished way. doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 8 +++++++- libavcodec/decode.c | 2 +- libavcodec/version.h | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 4effbf9364..0d459ba8c0 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-09-xx - xxxxxxx - lavc 57.105.100 - avcodec.h + Add AV_HWACCEL_CODEC_CAP_EXPERIMENTAL, replacing the deprecated + HWACCEL_CODEC_CAP_EXPERIMENTAL flag. + 2017-09-01 - xxxxxxx - lavf 57.81.100 - avio.h Add avio_read_partial(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 513236a863..7708bb2adb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3879,7 +3879,7 @@ typedef struct AVHWAccel { /** * Hardware accelerated codec capabilities. - * see HWACCEL_CODEC_CAP_* + * see AV_HWACCEL_CODEC_CAP_* */ int capabilities; @@ -3988,6 +3988,12 @@ typedef struct AVHWAccel { } AVHWAccel; /** + * HWAccel is experimental and is thus avoided in favor of non experimental + * codecs + */ +#define AV_HWACCEL_CODEC_CAP_EXPERIMENTAL 0x0200 + +/** * Hardware acceleration should be used for decoding even if the codec level * used is unknown or higher than the maximum supported level reported by the * hardware driver. diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 9b57910842..892143c1d2 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1150,7 +1150,7 @@ static int setup_hwaccel(AVCodecContext *avctx, return AVERROR(ENOENT); } - if (hwa->capabilities & HWACCEL_CODEC_CAP_EXPERIMENTAL && + if (hwa->capabilities & AV_HWACCEL_CODEC_CAP_EXPERIMENTAL && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n", hwa->name); diff --git a/libavcodec/version.h b/libavcodec/version.h index 29cdb85589..55b8ddc13c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 104 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 105 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \