From patchwork Thu Sep 21 07:21:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5215 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1634048jaa; Thu, 21 Sep 2017 00:29:39 -0700 (PDT) X-Received: by 10.28.151.200 with SMTP id z191mr96620wmd.115.1505978979413; Thu, 21 Sep 2017 00:29:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505978979; cv=none; d=google.com; s=arc-20160816; b=ygePIraVGm+E0+pZ8uw8QfOnMiNFE47ImMb2uydrUvWQhL9iXWqOfiu5t+syDpcApP sNEPPT0abCKfsJ/8XrksV4PntpkFUTDSCpUz86gxkXGNCdVPkxMBYJPRpCdx2V612Cmd 3u39eObFnCxqeWKQxLEzwyVG+wFGzuTU/skNUQEzFLVbY3Tg8sEcMM1Xf/EEadOtpTAV 7U9k+547ecR1nUIWVci5R62A4TCGnofQRnaidM4ovkXHBb9eE/C9ZctjWo3x+hgZR44b gocFkcB8nxRge29EgWFpKAYcnXBPZLu7xskGqeQm6mkA2vUtBLucmjlmN+N2ZCB+hN/p OAkQ== 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=wWSkK9oDv7QJbu3pG++1twKhoXHlXyencz4Je7gnMKU=; b=qVO8xv4bkwsbtz6yR/+NJgELHluUDxflA6HA7+ySGhmc/BngH5uxPQmJ9r3G8A8Yb/ JfEh+9ISMI4BuJiIFsKHSWqHwyVL7khr9QXKFx31I+yYZ9/0kXpMnJFsWnEaXOSMZ3h4 HPjbbaTu3SjYbv+GzyZk6PrWMphfyU5W5l3wXEgcw4FIBc3wJi0IqUqWUPd3bPOyPsOd 3rtSjz4I5eBoy0ztT87V7TKX4ECUnahLBK83v7PaBF1n8MeEye/sXGQMpsuLzFNepnr1 GvYaM21tiBn8O+01EgxufFA7gl8fN8WiiHjv5xekyGioG7qknSHQzmtGCCICGU0iDo8P CJkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Q4mQS5Da; 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 204si843386wml.71.2017.09.21.00.29.39; Thu, 21 Sep 2017 00:29:39 -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=Q4mQS5Da; 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 8D9A9688356; Thu, 21 Sep 2017 10:29:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 157A6680350 for ; Thu, 21 Sep 2017 10:29:22 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id g65so2177154pfe.1 for ; Thu, 21 Sep 2017 00:29:31 -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=kOAtJ3qt4CG/dKZV9EJmAYseCLgJBqRHcr+o43CoB40=; b=Q4mQS5Dawx7sCsfPFUYx4QTD33PKKPAa1JTikaBHnEH5K/kIGXyIV3jnEBafUYAyqD gHUAqDxR+a5uVZm+lKsfWESpeoeH6QbJ1LM5VPhroBxZRkyiZoQoeScyAj0HBgeJ6GRr vYQVYqggxu4HHXIfElvPd8rAeivuSUdq+PPDX5WT8rFBerd2YWet35YOnMZgt7yZOx0g zxxK4SHfBesnwCrO1I48WTW+SPoRu0DZkF6AXCe77ydb9sgtZtpM7PDm4xvLnyS5rWEa Rqlx6Ac9fLPzUZHIMLdJKXdq4g/tLuD4EUSE/Rk5ouno/jZegdNpxEQLgtSHF+5rlbMS Nk+w== 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=kOAtJ3qt4CG/dKZV9EJmAYseCLgJBqRHcr+o43CoB40=; b=jAQF86YXSVBCbScRRGohDFSpqujmJSA7xLMMHXXDzPOUikZulx5zzbk/5nx68ncctb ASM7OEMO7yS2PhmPEHwclN3bLNeCS55i1ezCu4uv0pDxbhOzQ5UfNhJbBZ5QECXWp6uT h9s5pqyPVmWRVQBjrOh3epCjMIWd8BiYIJ+J7UP1I71WWONrklqJ8Kx9kJo46HzDN+jS OJ/Bqm8dJt67/IePGcGZ5XHJuZy+tAN2/kT6RckQnV2Obl9rONo+ky+mrmlDEWspqV1b NJirBB9LHHiiK/JwybXs0UPW2LuU0g0jx4moVUZJ2RnF5RENe9IbAYlCxee2mM/5zBvX f7aQ== X-Gm-Message-State: AHPjjUgOIBZ9Kk1w1uSWBFFFaWj3yG7bIazVogHweAcxtIbF335Bzajz 5qfqLkRFrV+wJmRqnhMGCSA= X-Google-Smtp-Source: AOwi7QCVjron+/Tl/RI71jZUDCUiv3fQE8aDVnb8tE7C6/UlexlCIf/Z6GaZx0RxvLsKNkCrifoF3w== X-Received: by 10.99.47.68 with SMTP id v65mr4779108pgv.452.1505978497427; Thu, 21 Sep 2017 00:21:37 -0700 (PDT) Received: from [10.67.68.23] ([192.55.54.45]) by smtp.gmail.com with ESMTPSA id e13sm1514760pgt.14.2017.09.21.00.21.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 00:21:36 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson , nfxjfg@googlemail.com From: Jun Zhao Message-ID: <6fe0532f-2d91-4bd6-772c-652ca69acaf0@gmail.com> Date: Thu, 21 Sep 2017 15:21:33 +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 1/2] ffmpeg: re-enable hwaccel_lax_profile_check use hwaccel_flags. 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 742a7fb25d36543a7c2092103001278bd707d9ea Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Thu, 21 Sep 2017 02:41:29 -0400 Subject: [PATCH 1/2] ffmpeg: re-enable hwaccel_lax_profile_check use hwaccel_flags. re-enable hwaccel_lax_profile_check option use hwaccel_flags. Signed-off-by: Jun Zhao --- ffmpeg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index 1d248bc269..4f2b9d69d9 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2859,6 +2859,9 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat ist->active_hwaccel_id = hwaccel->id; ist->hwaccel_pix_fmt = *p; + + if (hwaccel_lax_profile_check) + s->hwaccel_flags |= AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH; break; }