From patchwork Sun Feb 19 17:23:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2606 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.22 with SMTP id n22csp520063vsb; Sun, 19 Feb 2017 09:23:57 -0800 (PST) X-Received: by 10.223.171.149 with SMTP id s21mr13372253wrc.64.1487525037137; Sun, 19 Feb 2017 09:23:57 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 59si20941778wrd.118.2017.02.19.09.23.56; Sun, 19 Feb 2017 09:23:57 -0800 (PST) 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 438F2689A22; Sun, 19 Feb 2017 19:23:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CB0D680CA2 for ; Sun, 19 Feb 2017 19:23:17 +0200 (EET) Received: by mail-wr0-f179.google.com with SMTP id z61so52583224wrc.1 for ; Sun, 19 Feb 2017 09:23:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EAp5AtPX1WuoNHHDw/cPFTIIFnTKFs3fbZ4OMIe5Omo=; b=oaIbUvR/C98NqYmDSkOdY8q3R7vNwPYFjh+mmmbz1FSBUKYs/iPBvkWOqW8Ha0glsr knSjNt9RU6B4TOtkueecBlhYBan3EcVOdTKa86yonwvhkDTbLGHTNEvjTiRoFXzkwgId yGbnUgOJvXn9SH02Bi1vj5p9ItXETcbmYYNh9MnFzKlJJDYbxPs82xxX7jyFfZLgwcFP pDeuzJxoLPOk1M8oxfyUmj9ROnLxRMI+s+M2ixGqMdwYAhs4mqx0w1tdtYPhaFHV0U2L E0raLxhvY8twuJqJFHmnZh9rx+Jgt0g9/NS/+x5KsBEp8v/GNQVZzDnSxAnAzeR9EoJ4 IOKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EAp5AtPX1WuoNHHDw/cPFTIIFnTKFs3fbZ4OMIe5Omo=; b=n6rWP4j2Ocj2nDpaY4rVyPCIyQV9D6kQl35E4aeRoySe9MW3S+j7N4+iDTAe7A+9UT ta0QsZ588jHTNxxFrbs1go32ErWyzmgLNWa7KdcV1x2asjl4NOdoiqOCWLRE893alVhX bd7qizpq3UZMVVGPuFvsTJBnmAIG2wExLJ2C5EeCpi8meTGxajI1IEpDtn7H47GZvA6a qULkD5plOlFuMVeNp7w60X0UCl3tywyJhQW7kdGbL6h1Dge2akFApVv6itywBmvOe0Xs AqGyxF6fPjtTiIyUJEuKudjnQbcWQ5kXRl4Xu/fc4RNXmx+ilWI1wpdPvYfWuzsYkn2J SMAQ== X-Gm-Message-State: AMke39naFQ476fBfP0SIwzA/Pbiu2tK9VthJQ9M1yLy4/G23PdKig4IYztaWyiBV0Yl8lA== X-Received: by 10.223.141.148 with SMTP id o20mr12928792wrb.191.1487525004272; Sun, 19 Feb 2017 09:23:24 -0800 (PST) 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 36sm21480626wrz.8.2017.02.19.09.23.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Feb 2017 09:23:23 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Feb 2017 17:23:06 +0000 Message-Id: <20170219172307.27012-4-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170219172307.27012-1-sw@jkqxz.net> References: <20170219172307.27012-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/4] vaapi_decode: Ignore the profile when not useful 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 Cc: Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Enables VP8 decoding - the decoder places the the bitstream version in the profile field, which we want to ignore. (cherry picked from commit 11c191b52ce0768370e38a2726132f9223e701f6) --- libavcodec/vaapi_decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index da9e4aedde..388764c6ef 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -322,7 +322,8 @@ static int vaapi_decode_make_config(AVCodecContext *avctx) int profile_match = 0; if (avctx->codec_id != vaapi_profile_map[i].codec_id) continue; - if (avctx->profile == vaapi_profile_map[i].codec_profile) + if (avctx->profile == vaapi_profile_map[i].codec_profile || + vaapi_profile_map[i].codec_profile == FF_PROFILE_UNKNOWN) profile_match = 1; profile = vaapi_profile_map[i].va_profile; for (j = 0; j < profile_count; j++) {