From patchwork Sun Jan 8 18:15:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 2118 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp6754504vsb; Sun, 8 Jan 2017 10:15:44 -0800 (PST) X-Received: by 10.223.146.3 with SMTP id 3mr10297723wrj.55.1483899344088; Sun, 08 Jan 2017 10:15:44 -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 y52si6134273wrc.102.2017.01.08.10.15.43; Sun, 08 Jan 2017 10:15:44 -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 3B5AE68A584; Sun, 8 Jan 2017 20:15:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 460A2689AF3 for ; Sun, 8 Jan 2017 20:15:28 +0200 (EET) Received: by mail-wm0-f43.google.com with SMTP id a197so78067569wmd.0 for ; Sun, 08 Jan 2017 10:15:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=EAp5AtPX1WuoNHHDw/cPFTIIFnTKFs3fbZ4OMIe5Omo=; b=P6vvM8mUXgLU+2HLPjnJIiiGDFCJIXW4AQVInTIpji4OeeNH7ajEa2ikP6MSAVTaKF wv7ciciADcs//2VeDY/Q1aZhbaKvNa5X9cvvE45rFCLSVeCiz6sif5H8UOSH/lkcxNEO DfWa/tgPdjsM/TjdKnCR44nPlqMBp97AScOakZGstYfE8j/GgXcJDgLo4IcOq/UamTuw tm89KN5Z8saIhj56rFbCxKbgDi4IaoxfzmJ4SpTm7FeG28cSYOwqIQEKg9Rh9mQ3bSji qxxVjZbxSmuFSgPsrVENa+ByUF7vAOttRedfrzjHKz0H67DN8p5wT8s8fHCgB6voz+hU c0vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=EAp5AtPX1WuoNHHDw/cPFTIIFnTKFs3fbZ4OMIe5Omo=; b=IJKh4pxkKRj2lOdWUo/cg7ea5XNuxkNpS2aX3netJOhGaGwyCedG5ieFJtB/agzVZE kUX1pshIuW5/SdAXn1/GwHG/bjlTGrSKQFdBh+hrFkxSjOUeY4pvko7LXbik8yPR4HY9 /oDfX2Vki9cQcnRGFTeqyYsw4O+ps87f+LU5Tknfpuw7Ac8dVXfUAUiQkCCDGyyTtMcn z+XEa7lPdl6M6kn5QhXCGs3AqU2KV3UyR4DI3sOJG5ArNxhTXqzfNnD0RQryIo24mCaO BMiD10ZmubtL6ni1B9i3pAWQeRDgJkxGfdsgkrdqvnxAOzMu3x8Y6+iHcv0ix20M1drc ApzQ== X-Gm-Message-State: AIkVDXKkhfNbeZ81lk5wykek92vefn07tG8yOgU2NUUv7/Trf71Ji7P7/Jx700u1EU3/ng== X-Received: by 10.223.160.172 with SMTP id m41mr9126220wrm.31.1483899334384; Sun, 08 Jan 2017 10:15:34 -0800 (PST) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id cl10sm119466237wjb.4.2017.01.08.10.15.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jan 2017 10:15:33 -0800 (PST) To: FFmpeg development discussions and patches References: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> From: Mark Thompson Message-ID: Date: Sun, 8 Jan 2017 18:15:33 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <320e2652-f3d9-5509-11ac-fbd84e22db6a@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 16/16] 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 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++) {