From patchwork Mon Oct 9 07:49:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5494 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2369885jah; Mon, 9 Oct 2017 00:50:03 -0700 (PDT) X-Received: by 10.28.97.194 with SMTP id v185mr7977757wmb.117.1507535403499; Mon, 09 Oct 2017 00:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507535403; cv=none; d=google.com; s=arc-20160816; b=OAZ2Q5JlhERqwYWJRUPYNl3UwvVR/BcvmpzFxCDV1qLln2dvZPNbwrtl4MiOB5zv2P Ml5N30TPanKMHaEnMQY5Yewx3sfnNQoZqq3ujAhUL+mYCLzSs+fwpHrKaV65nBzO7Rwn OnDQdjeQVKMg+RtACtyShX5sQpVqW/NCjocjGwlC7Q7RZ6X96tCXui9yNYjK0iqwGsHf BqYY4701hQktKGMwwuIFRTl3QreykDtPi5rm8+LbLWl1lxQdeCgfgkiORsI58nnZ2qn9 cPPllzymbFD50DZKnLVkCfMm83svXF4E29J5exY/iW9klTb/4DFy6l1HakLjYK/ENu5f T/0A== 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=UrjF4KIPL6olhMXyEa9c3M6PVclqYkaRaBG4GVrFujo=; b=FTGFwnAqUuvtzAR+2FpqgdQT7FbmCo4RuH29Jq9/huYGyQClZsZgb0EpuDEAV4p7gS vmZm6SRBz2oUHbZQXKOyODV3B4JPXpO8BORmGXi38e1+81h95Whp6CcaowVfbyWREQl2 4Crw1aKikBwfYCoXcC/KlDb1MxN8TlVzN6HbF93d/N2vXGt8D3jWLxSeq+JPkWcgO3Pz r8IsKMqTMA4nWzzrS5Gd0ewOvXVofj7fZKoR1U0sDrBc5536jIvDUup4kiXPFERCvY0E ylKGh2GW7uDlmugKL5/trOXn/5dhKLrWfAtw9ZHiqaKdwIWw9zXZ9I8tk3kbOinOEjVP qsmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vbQczWXt; 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 p9si3120432wrg.56.2017.10.09.00.50.02; Mon, 09 Oct 2017 00:50:03 -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=vbQczWXt; 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 805A76808CC; Mon, 9 Oct 2017 10:49:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EBE668067F for ; Mon, 9 Oct 2017 10:49:51 +0300 (EEST) Received: by mail-pf0-f173.google.com with SMTP id n73so6311102pfg.10 for ; Mon, 09 Oct 2017 00:49:53 -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=s4fNAGtjvhFUIy2rhUye1OjltubRCcTQpJhAo7Ycgi0=; b=vbQczWXteiCHdm0woD0dvsTEwFarZQEUTc1vksuTbP9+UXs0Xs852nCD3hz4ACGM6k R2RBVHVzylTjrnvlqV9pn9KCg/KtDm3pIRvvy8wE0iJWL5sxdCFaBpxpbIzY+FYI860e +IczZb5FKB79qCzSuePTgdTiYiPipv3mzKmSQAaUcDp7NI9ex8uwtlwsADuRacrWfjq7 wSA2GjslHCN0LQDYwHS1T8KWpkCI8yhKOcn71a0GmLwb8Jrfsj8+jQKdI71uVdbqziXF 9wNgfSek2WQ76hG561LYioMaE0EtGD/NiXrnkg53bxxH4+/V/MfVgB+Q1wkTfTqne9qR ID9Q== 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=s4fNAGtjvhFUIy2rhUye1OjltubRCcTQpJhAo7Ycgi0=; b=bMnK7DrpitGOwz9RIRIn1Sg0z1rq7ZNSBb/ssX23ud+nXDbuzRF+oRLfT+g1firrMz 56U0unct8R8zlLAzhxPNm4bgam/3Ckl3ccAfPCpwl05vUi4F+M5xsc3H5WphJfsWrMWJ jpJbrTKpo8rDv0ogUNreFj4PxEtzlbc2zQbfyhPusfbwj8tJrcxRb3xD41zEoyM4HZg0 X0O+Yh0kHREskv310HLJll+LtvD3RUtq+KIXE56n95PorVB6AAXhYiLg7RPPzzMaENmk z+QeZ/PtQTYQDj3qSyrd8HNA+8LCmTEpTPpk6FM+LL+fgsgr1V8/yEgimjDF2AsZNXvY dRjg== X-Gm-Message-State: AMCzsaVtGsY7fK2xw64lKTzp++e9noym3fJGBvxOngSlDSku3xkIef1V a3PWMPOtE1hD7OhIALKfmSAjJB5W X-Google-Smtp-Source: AOwi7QDju/k+P/5TVYu/jC1tI/Xs8TnGmRZNC2HaXO+EGOIbXIXY0NtPkGA7aqwEFQzetKQTKyCLcA== X-Received: by 10.84.247.16 with SMTP id n16mr8518485pll.180.1507535391868; Mon, 09 Oct 2017 00:49:51 -0700 (PDT) Received: from [10.67.68.47] (fmdmzpr04-ext.fm.intel.com. [192.55.54.39]) by smtp.gmail.com with ESMTPSA id w12sm15440469pfk.83.2017.10.09.00.49.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 00:49:51 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <1fcc1bb8-b7cc-2a19-45c9-7f56961069c7@gmail.com> Date: Mon, 9 Oct 2017 15:49:48 +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 1/4] ffmpeg: remove hwaccel_lax_profile_check opt. 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" V3: Remove hwaccel_lax_profile_check opt, and add new pre-stream hwaccel_flags option From 2b1585fd6e6e68c81761ace0a8503385067086e0 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 9 Oct 2017 02:13:14 -0400 Subject: [V3 1/4] ffmpeg: remove hwaccel_lax_profile_check opt. remove hwaccel_lax_profile_check, will use pre-stream hwaccel_flags option. Signed-off-by: Jun Zhao --- fftools/ffmpeg.h | 1 - fftools/ffmpeg_opt.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index f6c76bcc55..888f77223a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -624,7 +624,6 @@ extern const AVIOInterruptCB int_cb; extern const OptionDef options[]; extern const HWAccel hwaccels[]; -extern int hwaccel_lax_profile_check; extern AVBufferRef *hw_device_ctx; #if CONFIG_QSV extern char *qsv_device; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 100fa76e46..500920326b 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -100,7 +100,6 @@ const HWAccel hwaccels[] = { #endif { 0 }, }; -int hwaccel_lax_profile_check = 0; AVBufferRef *hw_device_ctx; HWDevice *filter_hw_device; @@ -3640,8 +3639,6 @@ const OptionDef options[] = { { "autorotate", HAS_ARG | OPT_BOOL | OPT_SPEC | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" }, - { "hwaccel_lax_profile_check", OPT_BOOL | OPT_EXPERT, { &hwaccel_lax_profile_check}, - "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream" }, /* audio options */ { "aframes", OPT_AUDIO | HAS_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_audio_frames },