From patchwork Thu Nov 26 10:20:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 24045 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 C359E44A323 for ; Thu, 26 Nov 2020 12:21:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA8A168B971; Thu, 26 Nov 2020 12:21:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F113168B95C for ; Thu, 26 Nov 2020 12:21:08 +0200 (EET) IronPort-SDR: B98L6pFFVPBWnYpswi8V3nuaOxB58jvG2Wi8ff9hGxhe4pkwTtAEsaKyVBmSR2B7Q9dH/+VDLD DjjDOwD+xD5w== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="171487038" X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="171487038" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 02:21:03 -0800 IronPort-SDR: SojAmrfs2k3h1C0FTXC7c3n9UYuUN9PyvgPJ0vQK8eQAHHttn12Njuj/GPzK7hg0fdFY+kYYDu cT3+x+sA8Png== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,371,1599548400"; d="scan'208";a="362756202" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga004.fm.intel.com with ESMTP; 26 Nov 2020 02:21:02 -0800 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Nov 2020 18:20:26 +0800 Message-Id: <20201126102026.27202-5-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126102026.27202-1-guangxin.xu@intel.com> References: <20201126102026.27202-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/qsvdec: refact, remove duplicate code for plugin loading 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/qsvdec.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index ed40e2f4c2..8da367079a 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -681,21 +681,12 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx) { QSVDecContext *s = avctx->priv_data; int ret; + const char *uid = NULL; if (avctx->codec_id == AV_CODEC_ID_VP8) { - static const char *uid_vp8dec_hw = "f622394d8d87452f878c51f2fc9b4131"; - - av_freep(&s->qsv.load_plugins); - s->qsv.load_plugins = av_strdup(uid_vp8dec_hw); - if (!s->qsv.load_plugins) - return AVERROR(ENOMEM); + uid = "f622394d8d87452f878c51f2fc9b4131"; } else if (avctx->codec_id == AV_CODEC_ID_VP9) { - static const char *uid_vp9dec_hw = "a922394d8d87452f878c51f2fc9b4131"; - - av_freep(&s->qsv.load_plugins); - s->qsv.load_plugins = av_strdup(uid_vp9dec_hw); - if (!s->qsv.load_plugins) - return AVERROR(ENOMEM); + uid = "a922394d8d87452f878c51f2fc9b4131"; } else if (avctx->codec_id == AV_CODEC_ID_HEVC && s->load_plugin != LOAD_PLUGIN_NONE) { static const char * const uid_hevcdec_sw = "15dd936825ad475ea34e35f3f54217a6"; @@ -706,16 +697,18 @@ static av_cold int qsv_decode_init(AVCodecContext *avctx) "load_plugins is not empty, but load_plugin is not set to 'none'." "The load_plugin value will be ignored.\n"); } else { - av_freep(&s->qsv.load_plugins); - if (s->load_plugin == LOAD_PLUGIN_HEVC_SW) - s->qsv.load_plugins = av_strdup(uid_hevcdec_sw); + uid = uid_hevcdec_sw; else - s->qsv.load_plugins = av_strdup(uid_hevcdec_hw); - if (!s->qsv.load_plugins) - return AVERROR(ENOMEM); + uid = uid_hevcdec_hw; } } + if (uid) { + av_freep(&s->qsv.load_plugins); + s->qsv.load_plugins = av_strdup(uid); + if (!s->qsv.load_plugins) + return AVERROR(ENOMEM); + } s->qsv.orig_pix_fmt = AV_PIX_FMT_NV12; s->packet_fifo = av_fifo_alloc(sizeof(AVPacket));