From patchwork Mon Jun 12 22:40:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3943 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp78053vsw; Mon, 12 Jun 2017 15:42:50 -0700 (PDT) X-Received: by 10.223.133.167 with SMTP id 36mr753470wrt.86.1497307370882; Mon, 12 Jun 2017 15:42:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497307370; cv=none; d=google.com; s=arc-20160816; b=HI/ppiVanr0iVqVwFLkm9E8fLDvToSOj0uabftkY74qcz9d7xJzTV2etex84F3fDD/ nBBAANLJhwQ33HXTrkQ/cMtMU8jCfZh5U0Jugu4N7g3cOKmntBbY/jXDivjnGRKJ3Kpx TJ2K7i6iNlEgGEhyVzTOdMxmnnrHVPUJTWx7vBUPh0ZFOh5kZfWvgPjhuLQgXGAKeCA2 +7sh/G6VaZL5xBVip4WnX5TRBxsd+uz69y03Vgp3nJkT6ec+3ZxUkBeDrgkZ1/XQSAn5 v7b/klrjHehYiY86gjH/PRVGEWEyxSg3S28GuW5CQZt6V/fmiwAHkkKIHVBwqW2o+z9w nyeQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EWly+RQ2Fikb08txSnmvAHeRfCxn7eq/VVmkKWDU9hA=; b=TpSbt+80eBn0+cXmUz4idcdV19HXj/dbAFpiDrgI0mUlAcWgVVkL8OyTaeiVJSK4J+ YlPMxvA5AKGZFGUpdufHR+ImIdqvvCppOCQncqDywJIh4fNYBbDziRROtw9lLJq9m8M1 JeN3in4xRt7XoA9Qgud2sEFD+Ii5E8UVjOTFaApQPuSj/9VIPyJL8MHzQQtoQNMO1zG2 H4i+gDu0oNZi7R97TCaGYKU2s1KS/BDklBTmM3JMCO9MSRvVL7HkURnxbLbvItEdnRY1 7ONV9Ehe7vSPPZ9f95D1GxEOM25X26WzrdTxbpdu2ID+fcqzsuUMHjZ5LcfFgirZC+c0 wjOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h9si6616275wmf.100.2017.06.12.15.42.50; Mon, 12 Jun 2017 15:42:50 -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=@jkqxz-net.20150623.gappssmtp.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61EB368A074; Tue, 13 Jun 2017 01:41:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7261B68A036 for ; Tue, 13 Jun 2017 01:41:09 +0300 (EEST) Received: by mail-wr0-f174.google.com with SMTP id q97so116891134wrb.2 for ; Mon, 12 Jun 2017 15:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=y6wOzM05GO78EuVmS2Z17tGGzwfm52yqHlWk3ndx/Uo=; b=BAV4dH8A4jSux37vQnk2+vNXkMj4J9JDwvoPiSjTkOyxD3m6atFpJZMzsi2/cTWowe qbqfsVgx+SqDinhVzvxOipcqNQ1YHxiiknT0j1hXY+KDse/EA/fMvOsWGhnHFWs2ZzcK 2jxern5/5AhwpgbQqXDP8EE7Jv+6sWGJ76XhUCQFymKXNBucG6Tu5t6s17yfdUH5DeiD uFVElFXJDAPfpGVkpMm9apyotPOnRcTY/BpglrLUb8Dn5qJc9GR304JkUC5Ft2yOo0tw gkjodA5GLRW7NCqcww9C3yYAitfWy69CdctEjKpOP5BHJzXWuz0iTklYrWnEJR5k2jl2 HeIw== 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; bh=y6wOzM05GO78EuVmS2Z17tGGzwfm52yqHlWk3ndx/Uo=; b=SjMGMJWFG0HIh3Vu4oDyY+ZEQWgD5rcFM8tHNVEoZ75DjhUwrntluibcevH0PdSEYQ WeJNeE2+7rLUd+5iFbIeAG2Cmn56q90vIvDD4W4hljjK+R4Nu+mGKjWZFAS7b4FioUfC Oo/zYO/9TTubvbGKD7qjSRUvN0wmz6IBjsWf2uwHbypPtjFwnoT0mOSEEVj4BbVAwI0/ Sf9t8e/4MjNwqzgD6DUIgu1K/6nYOAtl/D5b9Bu20TSp56SVHxsvbVKSZ1qw89lEIUYj T9YGbQ4KCfRcRlTKk8Fzrl9Jttj+I+GuabS/4yaIFEION3EbL9aPRF7qFL2Utj1Uoxzz fjIA== X-Gm-Message-State: AKS2vOzNL9kWszEcVnkEIWbR3S2ljACbd/Ntj1hUXtGIjzXmLMXp7XQT zmwIe78IGWBJEvHMFv0= X-Received: by 10.28.199.75 with SMTP id x72mr653003wmf.17.1497307270989; Mon, 12 Jun 2017 15:41:10 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m191sm13098233wmg.30.2017.06.12.15.41.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 15:41:10 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2017 23:40:31 +0100 Message-Id: <20170612224041.6750-15-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170612224041.6750-1-sw@jkqxz.net> References: <20170612224041.6750-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 14/24] lavc: Add flag to allow profile mismatch with hardware decoding 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" (cherry picked from commit 64a5260c695dd8051509d3270295fd64eac56587) --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 14 ++++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 5b2203f2b4..12c4877b9b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-06-xx - xxxxxxx - lavc 57.99.100 - avcodec.h + Add AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH. + 2017-06-xx - xxxxxxx - lavu 55.65.100 - hwcontext.h Add AV_HWDEVICE_TYPE_NONE, av_hwdevice_find_type_by_name(), av_hwdevice_get_type_name() and av_hwdevice_iterate_types(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dcdcfe00ae..39be8cf717 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4002,6 +4002,20 @@ typedef struct AVHWAccel { #define AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH (1 << 1) /** + * Hardware acceleration should still be attempted for decoding when the + * codec profile does not match the reported capabilities of the hardware. + * + * For example, this can be used to try to decode baseline profile H.264 + * streams in hardware - it will often succeed, because many streams marked + * as baseline profile actually conform to constrained baseline profile. + * + * @warning If the stream is actually not supported then the behaviour is + * undefined, and may include returning entirely incorrect output + * while indicating success. + */ +#define AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH (1 << 2) + +/** * @} */ diff --git a/libavcodec/version.h b/libavcodec/version.h index c93487273a..a44a88832d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 98 +#define LIBAVCODEC_VERSION_MINOR 99 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \