From patchwork Mon Dec 13 06:50:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 32397 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5048582iog; Sun, 12 Dec 2021 22:51:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTiaw7e4hB21IoKsr9aE1mBRMdEdtB1PzNFBvPgwRfcYMBGYXNFVpl4oEBvpvpRVEtr/mx X-Received: by 2002:a05:6402:35c5:: with SMTP id z5mr64502897edc.166.1639378303985; Sun, 12 Dec 2021 22:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639378303; cv=none; d=google.com; s=arc-20160816; b=Cwp+/d2QzcgbogWEwNRBWVvmuOfYbcKK+N1voMyAdI6GU+CdX001pC0g/QwfSztUoO Ok7F8pNRR+Qm0F13m9jXCP6M2eCNoG4z1zgipNWukLPdkmlUKU9ll7k/X/lsPaU5niqP WBZfNHeIUIdpQuym/GEtB4ENIbEqszTLls++GLeX0pCXYEbM80yVh4qvx4qpjmQM4hVQ 45Iymrj4mcR+oLDsmN/VoLqNs5lrH8jdXaQgVzbywktF6PdjmLRicsP6U09PTReGy5DT niNUs1iWUhubOHzsyDIHNq7TLKBQ41MdldEcpSj8u9CO/lqUooyloyM0wbQso29x66Cd gUDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=1+I0ynb/M+VgN71Xa5yIlaWQfGkPFVfmcoImGccxEVY=; b=lKbr/tcCAXt7gtiowkwNV+W4XGbo+ciIXGqQk7lDXzDE5uhM+ah2W1Cw2AdoqLMsPQ vhXiikNALEdnzai6vLbJ99ZqpmqgeDdR4pVM40Oe5ncPNM9YwmBWrtR1nFHwd4Pe6nli jW8cSj0hKbhAX41ss5+n8hJn7VJgzSx7MWnzaZJjegFq5UMcMR8S06FiEMJURxRqIwQ4 5HM66HJz29Nf067/ftplFukMM9YtCU3CIgR9UdkGBeb+6GC8LpqgwWx3X9QavECSEBAt F6jAONv4nQO4zUDhGdS+7yGF1wGsba/JU/AGt5pvk/E4vH6I/GWppuaryL5QyvmD4/AO T0DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NGYQuGV0; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt15si14830001ejc.104.2021.12.12.22.51.43; Sun, 12 Dec 2021 22:51:43 -0800 (PST) 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=@intel.com header.s=Intel header.b=NGYQuGV0; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49C5A680A47; Mon, 13 Dec 2021 08:51:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3698687F96 for ; Mon, 13 Dec 2021 08:51:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639378296; x=1670914296; h=from:to:cc:subject:date:message-id; bh=AUtq0vb4Slnj32Hs7xwGcT/TBeRu4jwfIdJvU9Djp1k=; b=NGYQuGV0d+lODo/Sd5JdUDfwji6Js52kDXwYHNPOsX+rI11DH7Gt0YHU oQg1h+9X2+dwzib5dX3hZzHE2gS5IYbxeJ1NSsYQXwIXFPAUqiape8uAU rGBlKujZaO27zFxQPZneYtC4ZYjzGg4Od2waBA9xvz8Wq/sT7aWzkyMLY hCWKbHV2Z1FQjovPgWeMqiAa/WHoTAipZzsu/lqGdPc6Hxqb7d0Md11UY Oa4gwPznxPfcqMC1P9qROhTyqZg3S73bH1QrpZSFz2fbtM5nEHlAhhXH/ oeY4jqvbJ+tOFfjwEf4GkUUWkeHoIaFFnqUL6zbal4H1MHdkAgJGJyWif w==; X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="218687384" X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="218687384" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:29 -0800 X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="660773439" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:28 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:50:34 +0800 Message-Id: <20211213065038.26898-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] lavc/qsvenc: remove VC1 profiles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1fxvga0meYXd The SDK doesn't support VC1 encoding. In addition, both MFX_PROFILE_VC1_SIMPLE and MFX_PROFILE_HEVC_MAIN are 1 in the SDK, HEVC main profile is recognized as simple profile in the verbose output if don't remove VC1 profiles. $ ffmpeg -v verbose -qsv_device /dev/dri/renderD129 -f lavfi -i yuvtestsrc -c:v hevc_qsv -f null - [hevc_qsv @ 0x55bdf7eb4eb0] profile: simple; level: 21 --- libavcodec/qsvenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 26a94cd419..dc0c45dc45 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -60,9 +60,6 @@ static const struct { { MFX_PROFILE_MPEG2_SIMPLE, "simple" }, { MFX_PROFILE_MPEG2_MAIN, "main" }, { MFX_PROFILE_MPEG2_HIGH, "high" }, - { MFX_PROFILE_VC1_SIMPLE, "simple" }, - { MFX_PROFILE_VC1_MAIN, "main" }, - { MFX_PROFILE_VC1_ADVANCED, "advanced" }, #if QSV_VERSION_ATLEAST(1, 8) { MFX_PROFILE_HEVC_MAIN, "main" }, { MFX_PROFILE_HEVC_MAIN10, "main10" }, From patchwork Mon Dec 13 06:50:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 32398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5048675iog; Sun, 12 Dec 2021 22:51:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTtrs6kDGSHik0C8EKnm4DCOyeF+lmUnufQ2rTW1wUAVsBmmdRmaYS64289wL7oJWxuMrd X-Received: by 2002:a05:6402:185:: with SMTP id r5mr60068012edv.259.1639378313318; Sun, 12 Dec 2021 22:51:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639378313; cv=none; d=google.com; s=arc-20160816; b=OALUjHF0v+SNixAFkcDiWp8bzj2LBCMyATinzzLU3Jws2hY0FaFIbAHjA6X/rSUKsJ zO2Ow9g8Qn/xEuMmrQZXu2NBZl+vFbU1TtpKM/4tqK38niQSoNMdqD8AVlqclWbuE7W2 WYWFCkympiwRmb6DiUbHGwZwD9bX8Y83KD9XUTz+1vG4eK2QeUOEE+iyk5ydKMao4SVc KpDG6FNnAVN7LJiNSreweY7gu/CNnii0qvkOrSghqZbT/e996oBInM6apSXFU8W2Bl9i NYi1XrBRhUczdquu3ekAxUi1z5rgGJJha59GAM+OgZ9R104hAi7WeNq7eCii9I0djCl6 uMRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Bxguo5mZGWFXJIUXXL/F7RL1Wj1n+kiileIGKlssw3U=; b=nBkTdfN54TKrwGFp482MNrFv1VXDNIyVZK4yta/i8yK73VdeX+gm+KRfqT+vxAhRaZ ymfymsO0FjTBYxM2kRVdrrUBMcOKZcqxy5AxJJIpjynMrq+QvjVgJeUuHUYdjkd/Od6O w6kRzyUWdsFxeZREoeUP5JwqGDafPoZVrzf+nfkAw8K4MiNYaS2ski5R5y+ZUKJvvvDa 8G+9ZDq08JIbEOxg+N9fesi33r13fC29KVEonk44GbPnLVBgksd3iByOigzTWvoT8htg QWzMcow8gojthAGmHX527SfuRyVLwwCBYi5xbohqywhuAF6LsfDdITDpt73KUu6CYnLF TXdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kTccnZhS; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eb14si20298920edb.134.2021.12.12.22.51.52; Sun, 12 Dec 2021 22:51:53 -0800 (PST) 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=@intel.com header.s=Intel header.b=kTccnZhS; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3ECA568AEB3; Mon, 13 Dec 2021 08:51:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70354680A47 for ; Mon, 13 Dec 2021 08:51:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639378298; x=1670914298; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=8HO1E7t/BQgPnXjdlBcKhN0JZm9wLlzQKEF+dC3W/SI=; b=kTccnZhSw8zyl+dq8ocenKCU6BX0Zl2hUXCZASyhTzaSldHrwTJQUIRJ zNEc4N4BjC5Er+fv5zhUg4/I8MEs62Pbp4lZmNNVk75VA+artG+Kh/1vL Z5HrPtL7lJduFvPL3NIuPnmR3lHMBQAboAR8U+rQFSdKo1E/qV3Pe2cOr xNEFLN5gwj/YvEDy9hA9Ln6d7h8B3jBLYscoSyuElazPj37RkNwo+/4hq JUKYSo4zrX0e4gUGOKufXCzPSVZLt/tn8B8NUllsIfBqyI9kwfDeS4Rwh 70K9QUwwCXng1A/T1XLdRSTDtI5sivwL5ICm33kSnma9XqQUuUcDBtWbQ w==; X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="218687385" X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="218687385" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:30 -0800 X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="660773448" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:29 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:50:35 +0800 Message-Id: <20211213065038.26898-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213065038.26898-1-haihao.xiang@intel.com> References: <20211213065038.26898-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 2/5] lavc/qsvenc: define profile array per codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XDSFVlIYCUyi The SDK defines HEVC, VP9 and AV1 profiles in the same values e.g. MFX_PROFILE_HEVC_MAIN =1, MFX_PROFILE_VP9_0 =1, MFX_PROFILE_AV1_MAIN =1, To avoid potential errors when adding VP9, AV1 profiles later, this patch defines profile array per codec. --- libavcodec/qsvenc.c | 47 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index dc0c45dc45..7dab8bab0f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -41,10 +41,12 @@ #include "qsv_internal.h" #include "qsvenc.h" -static const struct { +struct profile_names { mfxU16 profile; const char *name; -} profile_names[] = { +}; + +static const struct profile_names avc_profiles[] = { { MFX_PROFILE_AVC_BASELINE, "baseline" }, { MFX_PROFILE_AVC_MAIN, "main" }, { MFX_PROFILE_AVC_EXTENDED, "extended" }, @@ -57,9 +59,15 @@ static const struct { { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "constrained high" }, { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "progressive high" }, #endif +}; + +static const struct profile_names mpeg2_profiles[] = { { MFX_PROFILE_MPEG2_SIMPLE, "simple" }, { MFX_PROFILE_MPEG2_MAIN, "main" }, { MFX_PROFILE_MPEG2_HIGH, "high" }, +}; + +static const struct profile_names hevc_profiles[] = { #if QSV_VERSION_ATLEAST(1, 8) { MFX_PROFILE_HEVC_MAIN, "main" }, { MFX_PROFILE_HEVC_MAIN10, "main10" }, @@ -68,12 +76,35 @@ static const struct { #endif }; -static const char *print_profile(mfxU16 profile) +static const char *print_profile(enum AVCodecID codec_id, mfxU16 profile) { - int i; - for (i = 0; i < FF_ARRAY_ELEMS(profile_names); i++) - if (profile == profile_names[i].profile) - return profile_names[i].name; + const struct profile_names *profiles; + int i, num_profiles; + + switch (codec_id) { + case AV_CODEC_ID_H264: + profiles = avc_profiles; + num_profiles = FF_ARRAY_ELEMS(avc_profiles); + break; + + case AV_CODEC_ID_MPEG2VIDEO: + profiles = mpeg2_profiles; + num_profiles = FF_ARRAY_ELEMS(mpeg2_profiles); + break; + + case AV_CODEC_ID_HEVC: + profiles = hevc_profiles; + num_profiles = FF_ARRAY_ELEMS(hevc_profiles); + break; + + default: + return "unknown"; + } + + for (i = 0; i < num_profiles; i++) + if (profile == profiles[i].profile) + return profiles[i].name; + return "unknown"; } @@ -143,7 +174,7 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, #endif av_log(avctx, AV_LOG_VERBOSE, "profile: %s; level: %"PRIu16"\n", - print_profile(info->CodecProfile), info->CodecLevel); + print_profile(avctx->codec_id, info->CodecProfile), info->CodecLevel); av_log(avctx, AV_LOG_VERBOSE, "GopPicSize: %"PRIu16"; GopRefDist: %"PRIu16"; GopOptFlag: ", info->GopPicSize, info->GopRefDist); From patchwork Mon Dec 13 06:50:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 32399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5048800iog; Sun, 12 Dec 2021 22:52:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9pWla+QW4IptoG6oEbr5ays/SkFgf7yhrXkNuEJlG8Vd8Nk6mwg+GAOVOPr4lizGXDlhh X-Received: by 2002:a17:907:2d0e:: with SMTP id gs14mr42369656ejc.249.1639378322004; Sun, 12 Dec 2021 22:52:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639378322; cv=none; d=google.com; s=arc-20160816; b=X3+eIuKofd/dXxiQ4c+2VOylcMglG3EWEFXk5ECYyaZLj318MAWApysScBeiV8o5+L KTIaIFhRK1eUKXqNcaRFSy6VjPjMZejacw7aWJKC5bPHLyRXcgYIHLf4zgR430XCmiPo RMWJF/paWe9sc227CdQLPquZK+rG9Ue3/C7Cbm9Tu84AxKlVLclGRvHfJhoVr6W51OoS 79Q3MUBK17didTKEi+ybu29tIZR9UBdF8VPo3CiVlgVBHvUlHQb4O3u2nJM0d6gvHgqG iTjfkyYlI6FKeKIemoLGBKmXv2Wnh4YsdgW8jZ27317wUQ11XtmBgdakiZ3pd6o4Hl3H z6PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=03SX2w997Hl/eoH51WqTA2lC9XW1mZ0HfpRqpTDJT3g=; b=JLem2+7+PFhkT6pIaLlTYOuUn2IycHJV0jKVRJKBOUzDrMAdUbVSRJS5I29ecT0kPd Mc+NuImYufJ5a4Wagi4ru4w7SVucD+og9j1CzZY3vKVo9U6y4wc0LLoS/jdvkyNeieRj JsEiqiJgD962oldTx6dS9FjUOUtim5ndZ30FuJyz3QPknmdZdITm6d1elnWI0bfdzOHX B2OYA/rfmII5kHPrbLV/tl9hXaXtHDnowtlo6TqnQ4cpb9621+CzvgyyXJwNB5hF1/5/ 1QNTcc/PV5osHGJ+QDse095s42glgujQVyRQQoj0l/srPr5icA1DryBFr7q/zBAdUfGv xuSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="i/znqlbH"; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho38si17260745ejc.745.2021.12.12.22.52.01; Sun, 12 Dec 2021 22:52:01 -0800 (PST) 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=@intel.com header.s=Intel header.b="i/znqlbH"; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2008C68AE46; Mon, 13 Dec 2021 08:51:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9868A68AE8E for ; Mon, 13 Dec 2021 08:51:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639378299; x=1670914299; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WUZyeA9OQJA4V6Or3lnuPErXyhEyR86UZAceKj/erbM=; b=i/znqlbH32sw2v5B9l/FQZXTeN3OMs9DQm7UkpPBmGmFDblTdD//u2Xn 5wepreNdSY9qwJ8l4v2fiazKZtXGQy3PQmILTOw+ANsEj94jjg7Cxju8V tzkqBzbpNhbhrwOTWqZ6VF05Cab6IBCIqJKQ9hWXy/cNV3zBKWOOsd8Gi WV4X6B/ywLKI3sw5LH74EgNRw9yTzyn0ck6xv8FsQ4nuvHgENTAr4+iRr 4Kh4lcarXSe3tBEBMcOqkHH16rjc5IY2jw+l0xlAJxwXEbpUeqtFdliub B3ybixemRalERQVlhQpqh+e9OZZnmcJaj2TDIsnCjg97R4/aoJOnW+zg5 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="218687387" X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="218687387" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:31 -0800 X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="660773456" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:30 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:50:36 +0800 Message-Id: <20211213065038.26898-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213065038.26898-1-haihao.xiang@intel.com> References: <20211213065038.26898-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 3/5] lavc/qsvenc: add VP9 profiles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cnodb+SVJdNU --- libavcodec/qsvenc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 7dab8bab0f..a2a8a79189 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -76,6 +76,15 @@ static const struct profile_names hevc_profiles[] = { #endif }; +static const struct profile_names vp9_profiles[] = { +#if QSV_VERSION_ATLEAST(1, 19) + { MFX_PROFILE_VP9_0, "0" }, + { MFX_PROFILE_VP9_1, "1" }, + { MFX_PROFILE_VP9_2, "2" }, + { MFX_PROFILE_VP9_3, "3" }, +#endif +}; + static const char *print_profile(enum AVCodecID codec_id, mfxU16 profile) { const struct profile_names *profiles; @@ -97,6 +106,11 @@ static const char *print_profile(enum AVCodecID codec_id, mfxU16 profile) num_profiles = FF_ARRAY_ELEMS(hevc_profiles); break; + case AV_CODEC_ID_VP9: + profiles = vp9_profiles; + num_profiles = FF_ARRAY_ELEMS(vp9_profiles); + break; + default: return "unknown"; } From patchwork Mon Dec 13 06:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 32400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5048927iog; Sun, 12 Dec 2021 22:52:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMnGOi2Ow/MpZfUgWCtwSTr11/2UBSuHE8qsYFifQIt1PHKS77xuUO67GsYzWPZJGWUvEz X-Received: by 2002:a05:6402:d05:: with SMTP id eb5mr60519743edb.345.1639378331598; Sun, 12 Dec 2021 22:52:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639378331; cv=none; d=google.com; s=arc-20160816; b=kqcIYE9B3Dn4UnrRhk7xkkJrdiMVAq333NhcXm9NLFE++DLoNuCa1Ir74lzYCaoMJS 4bLuPWkGCdz0RW/zpe5zIjiy9bp2q9K0BU3islkEyl6+kbJXBx5x+3+QRcFrr7t5Y80W ufR4/h9+DlS8i/aYLct/QzcR9b7rfkp/69CcBGubAfmtDHVFTlTIZK5B8BDahSCl/zXt U+Kpxp321PJmu06MKyZIVyLTW6i8MIKrEl0pFxpQt14c7r7cjWq1+zCjk6yBqwcu/s2Z r7rSZTnwwc4M/V0e6g8/dDB0gevzklFBBxH7frZNvbVcJlsHiMLXn7z9ZZOJAgSZ3q21 0+lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=WglsYPOu2OG/p4AddS/OULT1DPKJEDZSes3hhElL1k0=; b=kQo1BwvmN2LlM2D3mU5QSJ3BOTkHdrtFzCHmo/kzPWqRKJrSs3/Fpbw05nXBzPuzzt BOCtjPZR0TIzqXDDESdYG+giyXM8zUW1SDBn90AiogKpyL+YHx0SpymtBgt8kqxENdaZ k1xyRb7Y+BWMXsiFoccPybqJKG9oIuLTvJ4zCR2mAf0FwHr9O2IT1OlHMSFHYGZwp7ed EhYao3uCAjD7mTXA63G86S6+v/3QXtHzUQT6CMS896Xzh960od7YhIE0rArr5mX3Nygj hpxZOFAhP21VyElxov+ocI9IdhUlT7nTQxb7QJkw7GYG54PaTOUBfHpwJGv/wNmPxket xslw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GT59A4BQ; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g16si17025953ejf.583.2021.12.12.22.52.11; Sun, 12 Dec 2021 22:52:11 -0800 (PST) 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=@intel.com header.s=Intel header.b=GT59A4BQ; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2299768AED6; Mon, 13 Dec 2021 08:51:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41FC268AEC9 for ; Mon, 13 Dec 2021 08:51:38 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639378303; x=1670914303; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=JnvypIvjVg6MKAkfc4i9WGWCxrnIlQ8nXSdCeURQlKo=; b=GT59A4BQoTXwaE4u6d4Z3mogR9Gp5iOsLFWBWDvoeYfIJlv1tgMVxqjV exuzQv8Ms5R/rE3VNWECWsuuIx5aUzSeQZQVhepnTOAOOBRCYqDdjgrAT kXhQNPD+hKZTKh+EjzrCTx6pyZmVsq2VJbrfgiBeZFEdQS0YOpscvjBOV G1uFsiCYokwakFvRHvwmeCELyE9rYNru3dN8PxegX0bK+j0k5WP2Cczjr IaJSQ60Y9/m1z07O9F1NGFKoDHkPqdIyIsRHhhasSx8nTQrbXmIrdwEV0 YQMpWSW5SrTCVZdIfaD8W1ilHNSd9XnRQI3wwgn3HY66z3Ef0/sDKP2FB w==; X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="218687388" X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="218687388" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:32 -0800 X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="660773459" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:32 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:50:37 +0800 Message-Id: <20211213065038.26898-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213065038.26898-1-haihao.xiang@intel.com> References: <20211213065038.26898-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 4/5] lavc/qsvenc: dump parameters for VP9 encoding in verbose mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TMJnP1Z/nZFc --- libavcodec/qsvenc.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index a2a8a79189..106438f227 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -343,6 +343,84 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, } +static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, + mfxExtBuffer **coding_opts) +{ + mfxInfoMFX *info = &q->param.mfx; +#if QSV_HAVE_EXT_VP9_PARAM + mfxExtVP9Param *vp9_param = (mfxExtVP9Param *)coding_opts[0]; +#endif +#if QSV_HAVE_CO2 + mfxExtCodingOption2 *co2 = (mfxExtCodingOption2*)coding_opts[1]; +#endif + + av_log(avctx, AV_LOG_VERBOSE, "profile: %s \n", + print_profile(avctx->codec_id, info->CodecProfile)); + + av_log(avctx, AV_LOG_VERBOSE, "GopPicSize: %"PRIu16"; GopRefDist: %"PRIu16"; GopOptFlag: ", + info->GopPicSize, info->GopRefDist); + if (info->GopOptFlag & MFX_GOP_CLOSED) + av_log(avctx, AV_LOG_VERBOSE, "closed "); + if (info->GopOptFlag & MFX_GOP_STRICT) + av_log(avctx, AV_LOG_VERBOSE, "strict "); + av_log(avctx, AV_LOG_VERBOSE, "; IdrInterval: %"PRIu16"\n", info->IdrInterval); + + av_log(avctx, AV_LOG_VERBOSE, "TargetUsage: %"PRIu16"; RateControlMethod: %s\n", + info->TargetUsage, print_ratecontrol(info->RateControlMethod)); + + if (info->RateControlMethod == MFX_RATECONTROL_CBR || + info->RateControlMethod == MFX_RATECONTROL_VBR) { + av_log(avctx, AV_LOG_VERBOSE, + "BufferSizeInKB: %"PRIu16"; InitialDelayInKB: %"PRIu16"; TargetKbps: %"PRIu16"; MaxKbps: %"PRIu16"; BRCParamMultiplier: %"PRIu16"\n", + info->BufferSizeInKB, info->InitialDelayInKB, info->TargetKbps, info->MaxKbps, info->BRCParamMultiplier); + } else if (info->RateControlMethod == MFX_RATECONTROL_CQP) { + av_log(avctx, AV_LOG_VERBOSE, "QPI: %"PRIu16"; QPP: %"PRIu16"; QPB: %"PRIu16"\n", + info->QPI, info->QPP, info->QPB); + } +#if QSV_HAVE_ICQ + else if (info->RateControlMethod == MFX_RATECONTROL_ICQ) { + av_log(avctx, AV_LOG_VERBOSE, "ICQQuality: %"PRIu16"\n", info->ICQQuality); + } +#endif + else { + av_log(avctx, AV_LOG_VERBOSE, "Unsupported ratecontrol method: %d \n", info->RateControlMethod); + } + + av_log(avctx, AV_LOG_VERBOSE, "NumRefFrame: %"PRIu16"\n", info->NumRefFrame); + +#if QSV_HAVE_CO2 + av_log(avctx, AV_LOG_VERBOSE, + "IntRefType: %"PRIu16"; IntRefCycleSize: %"PRIu16"; IntRefQPDelta: %"PRId16"\n", + co2->IntRefType, co2->IntRefCycleSize, co2->IntRefQPDelta); + + av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2->MaxFrameSize); + av_log(avctx, AV_LOG_VERBOSE, "\n"); + + av_log(avctx, AV_LOG_VERBOSE, + "BitrateLimit: %s; MBBRC: %s; ExtBRC: %s\n", + print_threestate(co2->BitrateLimit), print_threestate(co2->MBBRC), + print_threestate(co2->ExtBRC)); + +#if QSV_HAVE_VDENC + av_log(avctx, AV_LOG_VERBOSE, "VDENC: %s\n", print_threestate(info->LowPower)); +#endif + +#if QSV_VERSION_ATLEAST(1, 9) + av_log(avctx, AV_LOG_VERBOSE, + "MinQPI: %"PRIu8"; MaxQPI: %"PRIu8"; MinQPP: %"PRIu8"; MaxQPP: %"PRIu8"; MinQPB: %"PRIu8"; MaxQPB: %"PRIu8"\n", + co2->MinQPI, co2->MaxQPI, co2->MinQPP, co2->MaxQPP, co2->MinQPB, co2->MaxQPB); +#endif +#endif + + av_log(avctx, AV_LOG_VERBOSE, "FrameRateExtD: %"PRIu32"; FrameRateExtN: %"PRIu32" \n", + info->FrameInfo.FrameRateExtD, info->FrameInfo.FrameRateExtN); + +#if QSV_HAVE_EXT_VP9_PARAM + av_log(avctx, AV_LOG_VERBOSE, "WriteIVFHeaders: %s \n", + print_threestate(vp9_param->WriteIVFHeaders)); +#endif +} + static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) { const char *rc_desc; @@ -941,6 +1019,8 @@ static int qsv_retrieve_enc_vp9_params(AVCodecContext *avctx, QSVEncContext *q) q->packet_size = q->param.mfx.BufferSizeInKB * q->param.mfx.BRCParamMultiplier * 1000; + dump_video_vp9_param(avctx, q, ext_buffers); + return 0; } From patchwork Mon Dec 13 06:50:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 32401 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5049032iog; Sun, 12 Dec 2021 22:52:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwePJTCeR9DaBy1k40PzlXtViXzycyq/VS4f4LdOvdc9JaFpjs7BZB280zUT/HmAzgVsy/k X-Received: by 2002:a17:907:6ea1:: with SMTP id sh33mr43081318ejc.150.1639378342287; Sun, 12 Dec 2021 22:52:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639378342; cv=none; d=google.com; s=arc-20160816; b=Aa5gAiKIHxlzVV0cxsTmcYw5VQpzn71chGNKui3e39hKJ3G+b7BVD/g+Bko7HrJclv eWHTF0VGu51G4nEnBgw8Aavmig9XbB8B+z+RVM7o5JFBNMJub5fFuEhAvlobkVV43tgF 0H/fFJthid+T8/jQvqXad0o834XjeD1HA/PcXTnmMIw2YU2xsYX3pGbz3mErngq8MwsA 7Z9bSSuF7kEDEKqKgzk/EZ/fe9UkQcAKfC6H6Q8NV0heIIrMphoQqiMXAzELlWPLOBIq gVLWawTG9L0sZOlxhdkrR+6XplTXwqG9Wp8ll7MvBXMZqdqJ+2DNm74sVyRuaPe4j0ql oBsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=laDs+BVwMwErlwIqco9wSkPi/HeppPc4S/7eFJmyVpE=; b=hSyBM2BFs82Fj2E/PZg9fgHvdLBQ2nqkml/DHrbqMNyJh6M9qIz+X/5MDItDOg/0nf hnur3DP3laSVJi6iLb4yoyhJtBmx2VjQpoaskwXNEzEP+R5/FqYbv0MAAUz8IYbHytFx Fto0Wp+XMcnFrbH3fBU8RFgO5+/+nqX3g1yPrFHu2RBs+bg/iOCWrB6pONWY3nOfuhP/ ShZ8G20FsqSxOs2N+6STmV1yvkdbY2poxzNMaXpxL+Dc+mzMnBCx6sVA65PTkyx89F0X 5X8eTMbEP8XwHGcBEkVk7PFxb4waGhxawAaR4LfjmXc+1wDV91NEodkBJpx5r65vH7dh xGEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=D1D70vqq; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w17si14614498ejb.426.2021.12.12.22.52.21; Sun, 12 Dec 2021 22:52:22 -0800 (PST) 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=@intel.com header.s=Intel header.b=D1D70vqq; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C86B768AEF9; Mon, 13 Dec 2021 08:51:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53F1068AE8E for ; Mon, 13 Dec 2021 08:51:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639378304; x=1670914304; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=GEAUeOkeFuMqSJq8sNfQT9KKDPnbz7cofStKCRsi/to=; b=D1D70vqqXtsE37cuZtDeFqG4vIPx43ABG2s8FXKXYUCsIFpMKEhzwM2f PcZpYPRVjodU9xI55TS0uayQq1dETLJAPzaCGclpMguMh756STQgA8ZfM tMz/RBiicwAbx/L055S39j5JwytnsxGCRmfXfzLFPLjsHFhIqx9/XSEab fzfguU2VDt2LjvPq2rcGNgQZBSm1RXHUlp4fCG2VeTLHPpqylEMYbfnwE Q08DfiDqns1Fe7j8t/HLlyWTSPCKdVvrdNuQyhQlWoS36iaJQDgh15hrL xEwi6oMD1uxtNaQBnXY0299wGPuIUOcZtkriWIJfWT5LvLql2ipXUym1E w==; X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="218687390" X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="218687390" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:34 -0800 X-IronPort-AV: E=Sophos;i="5.88,201,1635231600"; d="scan'208";a="660773462" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2021 22:51:33 -0800 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:50:38 +0800 Message-Id: <20211213065038.26898-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211213065038.26898-1-haihao.xiang@intel.com> References: <20211213065038.26898-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH 5/5] lavc/qsvenc: dump parameters for mjpeg encoding in verbose mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cSN/RloFN+Hz --- libavcodec/qsvenc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 106438f227..92a8b49fe3 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -421,6 +421,18 @@ static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q, #endif } +static void dump_video_mjpeg_param(AVCodecContext *avctx, QSVEncContext *q) +{ + mfxInfoMFX *info = &q->param.mfx; + + av_log(avctx, AV_LOG_VERBOSE, "Interleaved: %"PRIu16" \n", info->Interleaved); + av_log(avctx, AV_LOG_VERBOSE, "Quality: %"PRIu16" \n", info->Quality); + av_log(avctx, AV_LOG_VERBOSE, "RestartInterval: %"PRIu16" \n", info->RestartInterval); + + av_log(avctx, AV_LOG_VERBOSE, "FrameRateExtD: %"PRIu32"; FrameRateExtN: %"PRIu32" \n", + info->FrameInfo.FrameRateExtD, info->FrameInfo.FrameRateExtN); +} + static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) { const char *rc_desc; @@ -970,6 +982,8 @@ static int qsv_retrieve_enc_jpeg_params(AVCodecContext *avctx, QSVEncContext *q) if (q->packet_size == 0) q->packet_size = q->param.mfx.FrameInfo.Height * q->param.mfx.FrameInfo.Width * 4; + dump_video_mjpeg_param(avctx, q); + return 0; }