From patchwork Tue Dec 21 15:18:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 32804 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5523251iog; Tue, 21 Dec 2021 07:18:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvkfLrX9umyfxgXtQLSx3/+izmi8oXDqQ1H57xcRHw2vkXwk6bj9mWElR6rX3YTjS4cI2U X-Received: by 2002:a17:906:6dce:: with SMTP id j14mr2993501ejt.305.1640099906079; Tue, 21 Dec 2021 07:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640099906; cv=none; d=google.com; s=arc-20160816; b=G+35aY9IeQCSSmQA5GeHH8MWwSoTOsvArTwPiSkSvVRIcrswx1aT7/5//4O2O09j5U Lc/xdYeRN0EFO1D3LLp6lsz9r6cxgXJ6pZxYR9hueiV7uHCN4KiEybxx2+I/VkXEV3ft /sFPqBMgSpjFiv4IvPEf1LE0tMkkltqPLupffdYBE4XyzlMUzJHxHs8H5bOQ0egFAw4C QjJ+GjaAMExDiTips2V4XKD49eXMOCcVDnbWcWgOeb3NW2f/Gq0I/Mt3oOxbg4h0RUPd H8lwjZWdacP1ZlWkX4uaxV8hoZ3iDQgVku1PII0kWByxTmrrgsZdlHkthJ4V/VC7WQpC Wd6w== 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=QNN9bbPLev0ZrtctmE1yAfO12T3IpZdMstGNn/kBXFQ=; b=YUPLI0Xc1qenvtdNkB0DYzoFVf7PB6vwMwR2xZSWZsNEgcgEJj0JWPOLzXzUO+AFeV 4FQEn7/XUyNgW6F3xKG82CInCYqnT/88p00pKSEF1t++6sMIQfHbmn1Ns3ouGPucRPHK S0HrXtcVh0DDShfZh4bAqHjD4DHKKnQrQ7EtAafw4inusMermjlRpPQwX58oYbUv/mIN H2PYK/R1V2CNqBP8mE2YVolimKaWzENso2wCv/82ZV719KUyApb0fAKafUlcdC+ZXCXI NFqd7WuksmQFT/PAOGBzAk8fH+fMNN47jLylVXTm/HUotoCEx3hpAQfRtAJ/EgvPsbsv Akpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=ZJ4g6obb; 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=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z5si9257907edl.607.2021.12.21.07.18.23; Tue, 21 Dec 2021 07:18:26 -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=@126.com header.s=s110527 header.b=ZJ4g6obb; 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=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D48AE68AF4C; Tue, 21 Dec 2021 17:18:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m964.mail.126.com (mail-m964.mail.126.com [123.126.96.4]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FF6368AEEB for ; Tue, 21 Dec 2021 17:18:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=g4X5Q2IylpylGUYwmD TXU2Ht0j1nca8cMIVdpufQoZg=; b=ZJ4g6obbNF3DSBzWkhnAzXkRQMQ9ELmC/+ M57+t12yYJxvzo/6CLp0texYGNtsH4yEDTBg69laiOHao4pSoSiY35acvqBh7QU0 j51qVymYdLyt1eX8BoPLad1KnA8aOwBPs9wVkCxNHW5WC6mJUYqSKNGofh+4JPZ8 WsARaAXMk= Received: from localhost.localdomain (unknown [139.226.141.210]) by smtp9 (Coremail) with SMTP id NeRpCgAHHjcw8MFh93qAAw--.9655S2; Tue, 21 Dec 2021 23:18:09 +0800 (CST) From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 23:18:06 +0800 Message-Id: <20211221151806.23772-1-zhongli_dev@126.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: NeRpCgAHHjcw8MFh93qAAw--.9655S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCFWxAFykAF4fXFW3uFy7GFg_yoW5Gw4Upa 1rAr10gr1DJrnrKa47Ww1UGa13KFyDCFyxAFW2vayIya9Yyr4xCryvya1fGa4jq3s2kr40 9wn8Ary2qF4qqa7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zROzV8UUUUU= X-Originating-IP: [139.226.141.210] X-CM-SenderInfo: x2kr0wxolbvvby6rjloofrz/1tbi7hFwwFtC84zl-QAAsx Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc: specify codec name when print profile 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b0XM5Ihev53D It is more clear and easily to detect the issues similar to commit 3857ecbe70e81cb6ad7a7f155c311e8522b93b3e Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 92a8b49fe3..be5a541409 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -47,41 +47,41 @@ struct profile_names { }; static const struct profile_names avc_profiles[] = { - { MFX_PROFILE_AVC_BASELINE, "baseline" }, - { MFX_PROFILE_AVC_MAIN, "main" }, - { MFX_PROFILE_AVC_EXTENDED, "extended" }, - { MFX_PROFILE_AVC_HIGH, "high" }, + { MFX_PROFILE_AVC_BASELINE, "avc baseline" }, + { MFX_PROFILE_AVC_MAIN, "avc main" }, + { MFX_PROFILE_AVC_EXTENDED, "avc extended" }, + { MFX_PROFILE_AVC_HIGH, "avc high" }, #if QSV_VERSION_ATLEAST(1, 15) - { MFX_PROFILE_AVC_HIGH_422, "high 422" }, + { MFX_PROFILE_AVC_HIGH_422, "avc high 422" }, #endif #if QSV_VERSION_ATLEAST(1, 4) - { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "constrained baseline" }, - { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "constrained high" }, - { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "progressive high" }, + { MFX_PROFILE_AVC_CONSTRAINED_BASELINE, "avc constrained baseline" }, + { MFX_PROFILE_AVC_CONSTRAINED_HIGH, "avc constrained high" }, + { MFX_PROFILE_AVC_PROGRESSIVE_HIGH, "avc 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" }, + { MFX_PROFILE_MPEG2_SIMPLE, "mpeg2 simple" }, + { MFX_PROFILE_MPEG2_MAIN, "mpeg2 main" }, + { MFX_PROFILE_MPEG2_HIGH, "mpeg2 high" }, }; static const struct profile_names hevc_profiles[] = { #if QSV_VERSION_ATLEAST(1, 8) - { MFX_PROFILE_HEVC_MAIN, "main" }, - { MFX_PROFILE_HEVC_MAIN10, "main10" }, - { MFX_PROFILE_HEVC_MAINSP, "mainsp" }, - { MFX_PROFILE_HEVC_REXT, "rext" }, + { MFX_PROFILE_HEVC_MAIN, "hevc main" }, + { MFX_PROFILE_HEVC_MAIN10, "hevc main10" }, + { MFX_PROFILE_HEVC_MAINSP, "hevc mainsp" }, + { MFX_PROFILE_HEVC_REXT, "hevc rext" }, #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" }, + { MFX_PROFILE_VP9_0, "vp9 0" }, + { MFX_PROFILE_VP9_1, "vp9 1" }, + { MFX_PROFILE_VP9_2, "vp9 2" }, + { MFX_PROFILE_VP9_3, "vp9 3" }, #endif }; From patchwork Tue Dec 21 15:22:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 32805 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5527429iog; Tue, 21 Dec 2021 07:22:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4KRGkNFQ1whf3UUohr/ofS8yX/BSQT8QNk9if+xkJNVyOjimG9c/JPG2MoOalT/UKOMhu X-Received: by 2002:a05:6402:22f8:: with SMTP id dn24mr3814995edb.357.1640100176749; Tue, 21 Dec 2021 07:22:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640100176; cv=none; d=google.com; s=arc-20160816; b=c71Nx8cutL6t2gdiZoLCzw+diYdQlXPKLFGAhi2VzVbw4mYUQLP0OWXHNf6xix2wfA 5RdNY+avs4LhAmutBM8eJepk0n7UxQxyeRgj8YbN937XJf9S4JgCA7X3buhuVn7G3M+3 e471XIEIzKPoS94H8R/zasyh2BGboYPFbicRqwEL6j0mUcAKXwppBD+CiFe3+hCUSR8y GrZfuOhgTrsQuzIAmV5FvVbRJJzwZ+eMWlF6GeXp+erLdflrCjAKUWJ8R/KdKnq0ZLgD GhI0VHwHRdosmUBk0hdcG1Yfh5LIockAA+wRl6losGoIlwPww57tvs+0XkBnjfETjvPM FIhw== 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=+guVdWeB32E7pbpHTIA3Lafh1UPsSMo8qEBpWv6Oon0=; b=kBp2CqVmy4ImTrn/nOynOzMQcw+8A00cZ3FNbA+Cxyi6/F4GqeIjIdxLWT29GLdiYa nVdct+Y0PTKe+T7BdEcqy0j5OKY8Nbz+TKqajZf1oHF51S5BET/59ATRgoKymhG5iHfz zTd33+vW9frgxcKNSnWO9tztkrXstHRJRauAIF2rJsuI7skeasds7I9juH8N+Jw6q3EY FWTyWgINWw4PKMc1NujX5mr4n/tYPcLtO0T2Getv5PRDnPE2+unhKXwZwDm3VbO6LeDP x5b/hzMB6ehfUKwjPMc2SUZaJS/3wIC5Rc0dpvVmmA69gpa7jVVRT8q1KcjQZYJUBT78 2RSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=FUBvaLpd; 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=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ji13si803150ejc.168.2021.12.21.07.22.45; Tue, 21 Dec 2021 07:22:56 -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=@126.com header.s=s110527 header.b=FUBvaLpd; 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=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D8F668AF54; Tue, 21 Dec 2021 17:22:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-m963.mail.126.com (mail-m963.mail.126.com [123.126.96.3]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5731468AEE9 for ; Tue, 21 Dec 2021 17:22:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=JqW1ScM6s7qZPEe5b0 Eh/pc5mdIkof+8cNhYxDo/s2c=; b=FUBvaLpdLQt/rhJKJ4i8bVz9QxYz0QOv1b dfuZqaJLUpsUkO7lkXmB2oBQmN6EbDM1aCTIS4eggBiM1B9IbPr/3jrWEzqTjo0e E30R51ZJvxfv8/cxFRR6OzJXqxLZ2sr4mJRCWzbXAV03/cZvfoMMTDp/9vQRgsrf EdXN6fQZ4= Received: from localhost.localdomain (unknown [139.226.141.210]) by smtp8 (Coremail) with SMTP id NORpCgAXGSUz8cFhCkF0Aw--.35355S2; Tue, 21 Dec 2021 23:22:27 +0800 (CST) From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 23:22:25 +0800 Message-Id: <20211221152225.23833-1-zhongli_dev@126.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: NORpCgAXGSUz8cFhCkF0Aw--.35355S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxuF43Gr1rCFyxXw4DJFWrZrb_yoW5XFWkp3 W7XFn3try2grykuwn3Aw1kWws5Cr1IgFZ5WwsFkwn7JryaqFnrXryYyFyavayfXrZ2q392 vrZ0kFs7G3y7JrJanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UUhLnUUUUU= X-Originating-IP: [139.226.141.210] X-CM-SenderInfo: x2kr0wxolbvvby6rjloofrz/1tbiVwFwwFpEFvqa6QAAsn Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc: enable lookahead for hevc encoding 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 , Daniel Socek , Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wywNNtLG8fyz Update version based on the patch: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20211009015949.1510-1-haihao.xiang@intel.com/ Signed-off-by: Daniel Socek Signed-off-by: Haihao Xiang Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 10 ++++++++++ libavcodec/qsvenc_hevc.c | 3 +++ 2 files changed, 13 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index be5a541409..db6d397068 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -210,6 +210,11 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, 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); +#if QSV_HAVE_LA + if (info->RateControlMethod == MFX_RATECONTROL_VBR && q->extbrc && q->look_ahead_depth > 0 ) { + av_log(avctx, AV_LOG_VERBOSE, "LookAheadDepth: %"PRIu16"\n",co2->LookAheadDepth); + } +#endif } 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); @@ -742,6 +747,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) switch (q->param.mfx.RateControlMethod) { case MFX_RATECONTROL_CBR: case MFX_RATECONTROL_VBR: +#if QSV_HAVE_LA + if (q->extbrc) { + q->extco2.LookAheadDepth = q->look_ahead_depth; + } +#endif #if QSV_HAVE_VCM case MFX_RATECONTROL_VCM: #endif diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index b7b2f5633e..5847ea21f7 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -235,6 +235,9 @@ static const AVOption options[] = { { "load_plugins", "A :-separate list of hexadecimal plugin UIDs to load in an internal session", OFFSET(qsv.load_plugins), AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, VE }, +#if QSV_HAVE_LA + { "look_ahead_depth", "Depth of look ahead in number frames, available when extbrc option is enabled", OFFSET(qsv.look_ahead_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 100, VE }, +#endif { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 = MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" }, { "unknown", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, VE, "profile" }, { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" },