From patchwork Fri Nov 24 00:51:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 6318 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1465230jah; Thu, 23 Nov 2017 16:53:42 -0800 (PST) X-Google-Smtp-Source: AGs4zMZsWSb0Bas98uxW9E8Pz6ZO+v+UExBy2kViZVhGwXZ8lH28kYOKlKBgOvgnipWy8Z+85ged X-Received: by 10.223.167.3 with SMTP id c3mr13253346wrd.127.1511484822765; Thu, 23 Nov 2017 16:53:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511484822; cv=none; d=google.com; s=arc-20160816; b=nwt+IjxnSPouCly+ZqJmVWOeXFv0mrPQiNj324/XkImZ7ClAFTzsBCI8C7p0AXQ9JU LSl4Vdgb6SVWxJNSecl2ltDx9tP0N6uSKtUkRelYn19gTBbAjg/bTNAUA8+eL58bgs2D m6Sc6j8nQIsTr+F2erm/gfsb+4Xu4mg8FM41VKYUgVUhrmAIFrQKkAIfg61cxLA9MufT jmkdHZn39EF87vuRmJevb/eC6/kCNuBbc5NPBCERVdUV137PPA28fN2GPjxhvhYoDNBw gcB5XKls7p1czT3i0k+6OSZ43ch8sEXlBi7Q+0dSP5Rzx7qm3b3Zn2JUVlZLz4rndzgY 8paA== 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=7pMhjZqOjulWkGY4LRkxcik3q2Q/0QHgiEdOtifYejI=; b=Py7CI3luolxYV0YgmqV85tzcEajGbGFD2Uzatyor05wrzQPmuFsJYjMi2Zt24AbQD4 70P1qAO8uZ5VJTIf2ifEV3KDHkmsrLrMfCVqupOXLy/cF05qvOrrPMVLqC4uPe2uVvhf CNjgjYxTzZkgReAx7yFaEb8hnfajTO0/4JOTFBXJPQ5c5VbxCD2yy56YMSF65T/v4WjO MBMctQ924G408PtKPpYKn2VXgZsNGoU5T9QmMrAYgL72gJN4mZkp06a1bkF3LYtFKS4T TcgmMaNy7F86iUT9Le3Gk1kBfLjK8pmsoP5MpdwPT7qxOT5bWo7v+KsEXXD99UJthsje ZDng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=zDzaMWca; 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 c70si5573707wmd.260.2017.11.23.16.53.42; Thu, 23 Nov 2017 16:53:42 -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 header.s=20150623 header.b=zDzaMWca; 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 2907768A278; Fri, 24 Nov 2017 02:51:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C647C68A1B0 for ; Fri, 24 Nov 2017 02:51:47 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id o14so18954209wrf.9 for ; Thu, 23 Nov 2017 16:51:48 -0800 (PST) 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=WPufq/NbQjK82edgHQoWBG9P/4Ep+zgmCHCxCe1CJ1Q=; b=zDzaMWcaPzW8fjWR/ymqkAMzPamnVj8J+eIp4XL7vMR6wRZS7j0W0sni6Mvc/fV4Bv hKYNyDjlsRHtQYtjrxZ7OIqUABXQxSdU2TaFdMNho/WDXIzPUNiFXO2pV8ASSK3fCG4G weDg2YXrBUZdNBI7ypJEe73RKVfA4pMGZ7aGKGksGuVyYEHZXfzjZ0LdOGeEkD6xFRjK 73b+n0Sd1SdxRXcg9FhiQGoZtHn7oxlpbVpJP33Q3/CdQ55r8sbP2Jm/81Co5SvVuYf1 jhhtnUxFMqYyex2iyYJJM/eJrG31tbvkJaYFFv7hlAWCW1iVK8IOo8Ioi2/RZiaVu98U I3ew== 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=WPufq/NbQjK82edgHQoWBG9P/4Ep+zgmCHCxCe1CJ1Q=; b=V50IOt0qWz22cvbVZ1OypQ3JNXNUoFk+qCbV+X1a3hbrWt5IgxPDUbAKSLh6Dc3Wth TQVC22V+SV05ZKSnPiev5+WecdQb8i3YxWM/rPzztFF8Kh5BCnxfa/42gKdoIlOlOoXx xa6v+XLR+axrcRLJH9odlq+5i3c/2kY98WdNS9g16T/mKEDGdHE7vXyn+Mjkqwv3HkFI mk5oldNGs4wBYH7zyKJ/LCJgd46gpvqkS24/i0knEhvm0Rr++v/0xR1WAopZkzFnAsic uZbjXrVD2H2zi3uF/Iy10OaGGmFwZ9HMNHM+qL20y4YJQCvOoLesqrmZzK9fLZHkYQgy vT5w== X-Gm-Message-State: AJaThX638qOsQU4uJ6Zp4i3qvgfzvt+lorRow0iSLkK3JwUz6oCoTCRP aUyIQgKcAVlB6cTRY/88OXebiz55 X-Received: by 10.223.150.163 with SMTP id u32mr22209663wrb.157.1511484707920; Thu, 23 Nov 2017 16:51:47 -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 h7sm4489655wrb.35.2017.11.23.16.51.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 16:51:47 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2017 00:51:26 +0000 Message-Id: <20171124005134.5683-9-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171124005134.5683-1-sw@jkqxz.net> References: <20171124005134.5683-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 09/17] vaapi: Make the decode profile matching more explicit 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" Also fixes a bug where it could attempt to decode with an unsupported codec if allow-profile-mismatch was set. --- libavcodec/vaapi_decode.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index d467bed874..d36ef906a2 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -287,8 +287,8 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, VAStatus vas; int err, i, j; const AVCodecDescriptor *codec_desc; - VAProfile profile, va_profile, *profile_list = NULL; - int profile_count, exact_match, alt_profile; + VAProfile *profile_list = NULL, matched_va_profile; + int profile_count, exact_match, matched_ff_profile; const AVPixFmtDescriptor *sw_desc, *desc; AVHWDeviceContext *device = (AVHWDeviceContext*)device_ref->data; @@ -317,7 +317,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, goto fail; } - profile = VAProfileNone; + matched_va_profile = VAProfileNone; exact_match = 0; for (i = 0; i < FF_ARRAY_ELEMS(vaapi_profile_map); i++) { @@ -326,23 +326,22 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, continue; if (avctx->profile == vaapi_profile_map[i].codec_profile) profile_match = 1; - profile = vaapi_profile_map[i].va_profile; for (j = 0; j < profile_count; j++) { - if (profile == profile_list[j]) { + if (vaapi_profile_map[i].va_profile == profile_list[j]) { exact_match = profile_match; break; } } if (j < profile_count) { + matched_va_profile = vaapi_profile_map[i].va_profile; + matched_ff_profile = vaapi_profile_map[i].codec_profile; if (exact_match) break; - alt_profile = vaapi_profile_map[i].codec_profile; - va_profile = vaapi_profile_map[i].va_profile; } } av_freep(&profile_list); - if (profile == VAProfileNone) { + if (matched_va_profile == VAProfileNone) { av_log(avctx, AV_LOG_ERROR, "No support for codec %s " "profile %d.\n", codec_desc->name, avctx->profile); err = AVERROR(ENOSYS); @@ -356,8 +355,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, codec_desc->name, avctx->profile); av_log(avctx, AV_LOG_WARNING, "Using possibly-" "incompatible profile %d instead.\n", - alt_profile); - profile = va_profile; + matched_ff_profile); } else { av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not " "supported for hardware decode.\n", @@ -367,7 +365,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx, } } - vas = vaCreateConfig(hwctx->display, profile, + vas = vaCreateConfig(hwctx->display, matched_va_profile, VAEntrypointVLD, NULL, 0, va_config); if (vas != VA_STATUS_SUCCESS) {