From patchwork Mon Oct 9 07:50:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5497 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2370214jah; Mon, 9 Oct 2017 00:50:31 -0700 (PDT) X-Received: by 10.223.151.9 with SMTP id r9mr9411277wrb.238.1507535431782; Mon, 09 Oct 2017 00:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507535431; cv=none; d=google.com; s=arc-20160816; b=Wu52FP4k4GVZMlNMJKRjq5WII82kCw67J3xUuxslLlX384rb48T58IJBsKQxTBRX/x qE1CjH754Fc4Yw90MmR7unuOdci7YyoXRMxcSVlIcPFa7vrArQctex/u4emFRV4ZIavW nAlBVMU9GCpExzAhlNEnsBq/BJfEQY+pIodlJVYktiDpjJOjYqkz8WjNBGwEKgiseTwk sQVjOGYbxupsz1UeGlY6Uz1EikHCJUytF8JaKtt1IFfKigvEUkrFFpaRZp07v1jErJCl 3ZhWJTYwPZ7eqhfcIcwsmiind7sTa6FqrdUrrdP7pO0TE9sXEFu/dNwlxTEf4gmNTSCw SoRg== 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=4pP72inNttSSXixf+PRfXmVnI1SQQwwzXwm6DHA6tKM=; b=Ocr6saeOOq0jLjjYtXC+YpBAFPDC5NJeHe01pZB8oDOjINoeRCE2NO9Re9JrYaZkuz 94JdBHNfJ4J+YH5iKsiNfPZBGqaarYtabUZ31rCGl+yCZ4Gqx2tIuLmekkK4JXXszEq7 g1AvwX0UVBNSeg529kxKNCLjrvIi+LrfmOBvKYN2cPQy+qlsITDLffZ4VPuclvBiZeU6 uIh+bQqiou716D7Cxl3SG9Mt9BHFrx7zh4Vo414om1wQm/8imXcdjbLzTnjjZiqN7pEK MPJPmWmbOEdq71nQvaf+gWnINNIio0meGSV8rUQya6Y1O+2acJQ4ny17HPyDilrx9UZ+ Wn0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bhnNrNC4; 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 q205si5990951wme.150.2017.10.09.00.50.31; Mon, 09 Oct 2017 00:50:31 -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=bhnNrNC4; 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 B5EAA680D26; Mon, 9 Oct 2017 10:50:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FF0C68067F for ; Mon, 9 Oct 2017 10:50:22 +0300 (EEST) Received: by mail-pf0-f178.google.com with SMTP id b79so699246pfk.5 for ; Mon, 09 Oct 2017 00:50:24 -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=D1y8IKL5P9Qktvwu8SNJtGZ8v8MC2mW89FHAlQ4prUg=; b=bhnNrNC4l7SllPAZLLFtfzzs9TYiNsbfMorNsxLpRy3nkzfrTF3bsLBqhjqBHXzJzP Dj1re/ANDqKAEFOJYodfviYy35PjPdOHaN9plQgTJZDjO+nCOM3479XoHLl88451SnlC uci9PHF03ZO6Bp1nYHlp7eN6AdgzJueRl7Se779FMLOWHGCh0OrZp5BqT+6gjwQ0h8vB o8aJLd2NaY+J+QGGrvpG8ABab/hHwuaZl1gssshJIbyqcxuB9Ha0J/s4XqXYSrSeHaf9 fZe+ZgCDiE67vzq4douUUZ4cj+IheyqDomQfNLpqsEZwyEktTID7sX9AEJElum62eeqA Bxaw== 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=D1y8IKL5P9Qktvwu8SNJtGZ8v8MC2mW89FHAlQ4prUg=; b=EvLRspsLlLlczu4yd6WJU1xwqMn0bUV3Hoceb2andwebD3iuIH1gAevYHVFCY4ZMok 8o3YUy69KhPcn1P3LUoWrU6ryGjI9oNX0fWlrdUWttR0fbJ7wuQXlfubTt/55MRcjlwO on51LrwRvocbWGrBVPyUeyfejWmi9z+Rwth2mNU+vOHZvw5PLHnVRC10k60MOUKrx2o5 9qRe8ltHzt3iKsfIvMngD9izCTjPD96Wom6Nu9v1XpoTUNyi/TcsrSBIcDMmOeGGxoCs 9uqUKdz9sr3ueJ6uV1v2s1Y4dZob0zoSniJWrafnB/Kk7ogiL0ZMHOK0KWDG3LMr1r9g KBXg== X-Gm-Message-State: AMCzsaUW64X82xdidiIUg+lez+sSChDKQ2PbuQwGV492zNjARWJsSDbE 1LZw2jjKvUg9CtQVLEMKces= X-Google-Smtp-Source: AOwi7QBahCUQR78EGbZrxFV522o4MNBMVtrY6my+GO9MEh1DxT5CNDO+5MWUwotsb6F0N58yVaC2bQ== X-Received: by 10.84.214.16 with SMTP id h16mr8376170pli.371.1507535422894; Mon, 09 Oct 2017 00:50:22 -0700 (PDT) Received: from [10.67.68.47] (fmdmzpr04-ext.fm.intel.com. [192.55.54.39]) by smtp.gmail.com with ESMTPSA id z65sm10752892pgb.50.2017.10.09.00.50.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 00:50:22 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <874cc5fa-806e-9542-0909-bf25f1bbdb16@gmail.com> Date: Mon, 9 Oct 2017 15:50:19 +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] [V3 4/4] 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 ef75f07943ff51c63bf7735a90c38a11559cad33 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 21 Sep 2017 02:44:42 -0400 Subject: [V3 4/4] lavc/vaapi_decode: fix profile search when disable exact profile match. when disable exact profile, use the alt_profile for VAAPI HWAccel decoder. Signed-off-by: Jun Zhao --- libavcodec/vaapi_decode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 5a555b2bd3..27ef33837c 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -281,7 +281,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx) VAStatus vas; int err, i, j; const AVCodecDescriptor *codec_desc; - VAProfile profile, *profile_list = NULL; + VAProfile profile, va_profile, *profile_list = NULL; int profile_count, exact_match, alt_profile; const AVPixFmtDescriptor *sw_desc, *desc; @@ -328,6 +328,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx) if (exact_match) break; alt_profile = vaapi_profile_map[i].codec_profile; + va_profile = vaapi_profile_map[i].va_profile; } } av_freep(&profile_list); @@ -347,6 +348,7 @@ static int vaapi_decode_make_config(AVCodecContext *avctx) av_log(avctx, AV_LOG_WARNING, "Using possibly-" "incompatible profile %d instead.\n", alt_profile); + profile = va_profile; } else { av_log(avctx, AV_LOG_VERBOSE, "Codec %s profile %d not " "supported for hardware decode.\n",