From patchwork Thu Sep 21 07:22:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5214 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1629236jaa; Thu, 21 Sep 2017 00:22:41 -0700 (PDT) X-Received: by 10.28.147.8 with SMTP id v8mr96658wmd.104.1505978561185; Thu, 21 Sep 2017 00:22:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505978561; cv=none; d=google.com; s=arc-20160816; b=B/Fws7SgzKA30U+Dtw3+TSc4wlHgpjEy+yWMby8wJF7hoUzBCK3DF4Zj3S6/lVU3ZG ZXHDJWzrfWZC8Bgc+rvWP4iDpg/atKlak/Jc2n24XP+sqfx2XAiy7pZFHc6BCnAG7tsq 0RcR7Yr/Nn1ljpUa6yKRZxulnSG947qi4GW6JMfp3kLnWUNVUz7heBzFQkPm3saknIYV u1sMFPVC0Zb17oUz6SeP+8n/b1/VwuN4mVhVKvYS9DiTX4pxb85V2jT7HsnEwZMVkdUs Z+Wb4mCZmr4RqO+KBsopfRs32lk2f+NzRElQ9fImDK99rdoe6MhJdPZpvc1ic4exND5V oaCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=1KYHK3J2UfRFvYXlYdGlqiWB5TWvmT1iz1cCtIMrR+0=; b=RhbvJrmYSS6jkfzc6/84eb+gHFftd14pGGnfgF/yUS/BO6atMD03oVg0jhU5zIxY4a bu/NDyvj//0seKbEInxypB2so0miNjxkuyIOK9qUPhmTsJ/sL6oQTJE2cRLrocNil+Ro P2CB3Yh2rS/Nm3g1N2Fk560n0gHgTO0NPGPV7KzGpmpFfCtPjyrdxktHETxSQSmqPBzK ATn4S6gkROD8nocrB2MygcoBLbWYTbNb3fGVqIBiakIdQSWzx7bNgyGMbm0ZJcSsZt5v jC3WanvXFeBzv+9BaDLoMbdjsIMESGsu7bajINQ6+6fyUNrZjJ+OkuTP6/Zs9pxxubZ/ epAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=F8YFRpTj; 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 y82si815048wmb.36.2017.09.21.00.22.40; Thu, 21 Sep 2017 00:22:41 -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=F8YFRpTj; 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 21D6D680354; Thu, 21 Sep 2017 10:22:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 327B1680051 for ; Thu, 21 Sep 2017 10:22:23 +0300 (EEST) Received: by mail-pg0-f49.google.com with SMTP id u18so3094931pgo.0 for ; Thu, 21 Sep 2017 00:22:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=sXzhGkoA9Qjv8I80kai/BMcIfqF1YZdwgdRDeiWDPK4=; b=F8YFRpTjueYS5aM4dDrTBbSmsETPnHRil6VpbY8i01R0iiru2VVaLjuGG/+/cm5Uj2 jf/GENSqc43QB+tDdQpR0/9rttU0pE7RiYGIVHmT43AX4ZFG/V45ODtN1rZkRPaX5c/A 2U43DY0SjLT6pH63jzhIUBYG1B79uU/SddkOBwgpXuZFezwc/eoucaq0fQaa0vP1mI74 TAkDvW2U8+rZxkg3950Z2lrEtuaQ7tXpYRYe9cWsfsr3mPaPk3lr3wwnWm2QRrYGi3/W 1mgPx2Kyp2YG2Cd0FE8jPd5n+o/bWtFAEgB0GrHzxslKoAvUW6HX5CNJ9PXV3eB3ycv8 6Ktw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=sXzhGkoA9Qjv8I80kai/BMcIfqF1YZdwgdRDeiWDPK4=; b=Kiphb+8diID215D6Bh5a7nEbIY8G8n1n0Pkuxq375Jgb0Wr7hj9mywUfXGYk/EfHa2 6BbaLK8eYF/xaWLVZ2crk50i71VArqMgVmx0Nx4Z/hWY+YeimEg0RtZlFZSMr1yRsh/O mWzYU+penf/nYgaPAIviDYRgdfnZKzD0vRoQlVFqY/GtZZT0mclmBS6qbfLRSuCvw7rc gQp1fhm9N04JS2zhCxZqqO52R692faN/rvMiVtj/r7M1GYKKDX/ruAnKnLz/AzpJ4Tot GeBIpgpvaZy2Cx0fHjs6vDoJtXyAi3sYthrlP+A85kYL+RPTha6f19Q5TnnwD7C7p1Me hGEw== X-Gm-Message-State: AHPjjUi6svcfeqzYlpPK9pAX4aB2l1W2bpOB73OLr5JI6AKKnSuHO+pP OCm56lLZUq1/YG8a1+KEcPU= X-Google-Smtp-Source: AOwi7QBE5xm7vR7NWxgVd/aZXRpkpk2VIt6psjZl/E9EeCY1QD0KNUHiB3614BDFFtnRUcW+Mp4x6w== X-Received: by 10.84.137.169 with SMTP id 38mr4688294pln.429.1505978551626; Thu, 21 Sep 2017 00:22:31 -0700 (PDT) Received: from [10.67.68.23] ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id i12sm1217711pgr.21.2017.09.21.00.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 00:22:30 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <84970e84-28f0-f5bd-ef1e-7ffff4304981@gmail.com> Date: Thu, 21 Sep 2017 15:22:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/2] lavc/vaapi_decode: fix profile search when disable exact profile match. 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" From d7dc5c00692302e810412dea44ae3d2f122fb9a4 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 21 Sep 2017 02:44:42 -0400 Subject: [PATCH 2/2] lavc/vaapi_decode: fix profile search when disable exact profile match. When disable exact profile match, alway use the profile found by codecid. Signed-off-by: Jun Zhao --- libavcodec/vaapi_decode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index cf58aae4c6..98b00e3637 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -329,6 +329,10 @@ static int vaapi_decode_make_config(AVCodecContext *avctx) if (exact_match) break; alt_profile = vaapi_profile_map[i].codec_profile; + + if (avctx->hwaccel_flags & + AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH) + break; } } av_freep(&profile_list);