From patchwork Tue Apr 30 09:03:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 12946 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 2A957447982 for ; Tue, 30 Apr 2019 12:03:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17DD668A6F3; Tue, 30 Apr 2019 12:03:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5FD5687994 for ; Tue, 30 Apr 2019 12:03:44 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Apr 2019 02:03:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,413,1549958400"; d="scan'208";a="138664913" Received: from blue-kbl.sh.intel.com ([10.239.13.16]) by orsmga008.jf.intel.com with ESMTP; 30 Apr 2019 02:03:42 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Apr 2019 17:03:43 +0800 Message-Id: <20190430090343.11452-3-zhong.li@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190430090343.11452-1-zhong.li@intel.com> References: <20190430090343.11452-1-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavc/qsv: extactly map profile 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently profile mapping is hard-coded, and not flexible to do extactly map (E.g: libmfx treats H264 constrained baseline to be baseline profile). vaapi profile mapping funtion provides a better soultion than current qsv mapping. Signed-off-by: Zhong Li --- libavcodec/qsv.c | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 4d3fbafe04..986d4f6022 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -67,19 +67,55 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) return AVERROR(ENOSYS); } + +static const struct { + enum AVCodecID codec_id; + int codec_profile; + int mfx_profile; +} qsv_profile_map[] = { +#define MAP(c, p, v) { AV_CODEC_ID_ ## c, FF_PROFILE_ ## p, MFX_PROFILE_ ## v } + MAP(MPEG2VIDEO, MPEG2_SIMPLE, MPEG2_SIMPLE ), + MAP(MPEG2VIDEO, MPEG2_MAIN, MPEG2_MAIN ), + MAP(MPEG2VIDEO, MPEG2_HIGH, MPEG2_HIGH ), + + MAP(H264, H264_BASELINE, AVC_BASELINE ), + MAP(H264, H264_CONSTRAINED_BASELINE, AVC_BASELINE), +#if QSV_VERSION_ATLEAST(1, 3) + MAP(H264, H264_EXTENDED, AVC_EXTENDED ), +#endif + MAP(H264, H264_MAIN, AVC_MAIN ), + MAP(H264, H264_HIGH, AVC_HIGH ), + MAP(H264, H264_HIGH_422, AVC_HIGH_422 ), + +#if QSV_VERSION_ATLEAST(1, 8) + MAP(HEVC, HEVC_MAIN, HEVC_MAIN ), + MAP(HEVC, HEVC_MAIN_10, HEVC_MAIN10 ), + MAP(HEVC, HEVC_MAIN_STILL_PICTURE, HEVC_MAINSP ), +#endif +#if QSV_VERSION_ATLEAST(1, 16) + MAP(HEVC, HEVC_REXT, HEVC_REXT ), +#endif + + MAP(VC1, VC1_SIMPLE, VC1_SIMPLE ), + MAP(VC1, VC1_MAIN, VC1_MAIN ), + MAP(VC1, VC1_COMPLEX, VC1_ADVANCED ), + MAP(VC1, VC1_ADVANCED, VC1_ADVANCED ), +#undef MAP +}; + int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile) { + int i; if (profile == FF_PROFILE_UNKNOWN) return MFX_PROFILE_UNKNOWN; - switch (codec_id) { - case AV_CODEC_ID_H264: - case AV_CODEC_ID_HEVC: - return profile; - case AV_CODEC_ID_VC1: - return 4 * profile + 1; - case AV_CODEC_ID_MPEG2VIDEO: - return 0x10 * profile; + + for (i = 0; i < FF_ARRAY_ELEMS(qsv_profile_map); i++) { + if (qsv_profile_map[i].codec_id != codec_id) + continue; + if (qsv_profile_map[i].codec_profile == profile) + return qsv_profile_map[i].mfx_profile; } + return MFX_PROFILE_UNKNOWN; }