From patchwork Wed Aug 19 06:10:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 21727 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9F9D244A50F for ; Wed, 19 Aug 2020 09:10:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E89F6882B9; Wed, 19 Aug 2020 09:10:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56EA8687FF1 for ; Wed, 19 Aug 2020 09:10:38 +0300 (EEST) IronPort-SDR: DEyW4HObY/BcnHHtoj1s7N7tVzdxpbJpulAknZHWAg2HFTg9c6sdu8J/vlr7aeNeqom1MBkL23 /yycFtIqbYPA== X-IronPort-AV: E=McAfee;i="6000,8403,9717"; a="216578653" X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="216578653" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2020 23:10:36 -0700 IronPort-SDR: WfSZqh9lCwF3uuwUKeROKNJMw0rHj6TD6VDuPB268Ez+V53UGP1HylF2MNnD1kPhXT8LQsAQY2 tCJBp3Mea/Xg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="497629505" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga005.fm.intel.com with ESMTP; 18 Aug 2020 23:10:31 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 14:10:22 +0800 Message-Id: <20200819061023.443304-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] qsv: needn't load user plugin since libmfx 1.28 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" MFXVideoUSER_Load call is redundant since libmfx 1.28 --- libavcodec/qsv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 55184e075a..faa424bb68 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -19,7 +19,6 @@ */ #include -#include #include #include @@ -36,6 +35,10 @@ #include "avcodec.h" #include "qsv_internal.h" +#if !QSV_VERSION_ATLEAST(1, 28) +#include +#endif + #if QSV_VERSION_ATLEAST(1, 12) #include "mfxvp8.h" #endif @@ -295,6 +298,9 @@ enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type) static int qsv_load_plugins(mfxSession session, const char *load_plugins, void *logctx) { +#if QSV_VERSION_ATLEAST(1, 28) + return 0; +#else if (!load_plugins || !*load_plugins) return 0; @@ -340,6 +346,7 @@ load_plugin_fail: } return 0; +#endif } From patchwork Wed Aug 19 06:10:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 21728 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 81F3144A50F for ; Wed, 19 Aug 2020 09:10:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BEED6883AD; Wed, 19 Aug 2020 09:10:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B7AE680932 for ; Wed, 19 Aug 2020 09:10:44 +0300 (EEST) IronPort-SDR: BHW3hMRUechEw/tL4UfWnSQsj4w1Llb4Y5FoXz1d3cJyKUkTNCerk97MXZyNgNfojQKeWfua0/ pXgrEOtECG9g== X-IronPort-AV: E=McAfee;i="6000,8403,9717"; a="216578654" X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="216578654" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2020 23:10:36 -0700 IronPort-SDR: CwbOyQeH66ktFZbJltncvz2fwSkccUJQdwI/+HQDaJ/qxBvldaFUgFZf50L58kO8betBS8N4cP NII89iklqBIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,330,1592895600"; d="scan'208";a="497629510" Received: from xhh-tgl64.sh.intel.com ([10.239.159.152]) by fmsmga005.fm.intel.com with ESMTP; 18 Aug 2020 23:10:32 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Aug 2020 14:10:23 +0800 Message-Id: <20200819061023.443304-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200819061023.443304-1-haihao.xiang@intel.com> References: <20200819061023.443304-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] qsv: remove audio error code 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index faa424bb68..6776b745b9 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -143,8 +143,6 @@ static const struct { { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" }, { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" }, { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" }, - { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" }, - { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" }, { MFX_WRN_IN_EXECUTION, 0, "operation in execution" }, { MFX_WRN_DEVICE_BUSY, 0, "device busy" }, @@ -154,7 +152,6 @@ static const struct { { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" }, { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" }, { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" }, - { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, }; int ff_qsv_map_error(mfxStatus mfx_err, const char **desc)