From patchwork Fri Dec 24 04:32:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7844097iog; Thu, 23 Dec 2021 20:33:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAxKPisqHnZd5lFvRIEU33GMOHRdd1yxEXrln9vVK0wUuSoLEjbDcl+/39KKVM5z4twhtK X-Received: by 2002:a05:6402:41a:: with SMTP id q26mr4572647edv.387.1640320386937; Thu, 23 Dec 2021 20:33:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640320386; cv=none; d=google.com; s=arc-20160816; b=suW1HApejlu8Ei4sqA1N77BVnn+ZKF5pm5AsXnJnvbQJHCLEqNJehYYiP2JZ8FZfXK /4+25kvo2iKFNA0wFWm3DTo/DqHULbPddsmFSg6vwxxwVS2YBnQqfFGGK+Aa3C5isJr8 PXLU9pyi9brp2cXVQ4NsM0FpWuHm2JGIc49X4e8KfCyY5TuzyMRfsQl5J91osDzbI0G9 q1Tw67FRiLsrvOXB9P8wThQHPm66mkHounNFMtI1aE8XW6x+hwb1qfXZGNvq/kwtPR+F XjrEISEUeccNtiqRBAsfFsBf8mg31/B8cOKwhwFpbn7v9l51nznuHUYhl5MRPSuzr7Wm MThA== 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=a8C+zFbqI50AMG8w5GXHaZTmujLpkDiK9I2jwK2mLFw=; b=Dqyp7Deo63NK3ocS6z2ujNRjVAOCRsdjKOnJTkBxyGFusxC63Bwddb0jW9KXkxHTtV k6eez+phLIq7wzyqVKpj60tDfVsDr+pnKxKc1BigyHS+8sTuU54syU4G6cN/WbX64oI/ W/s8WijQibdYy4VuihZC4lIMqm96/9ecfPhkdZkrZo71P83yhBRjxVKySROo1oItXRIW UEa+F4q9Z3Ubbliy8BDVTRp5wCJvOJlvBEuTGWl+mJ1u1tp2bQhdnLqkrib0dHW0O/AU SoKprvDg7Ml1354OYSPttg2MMk2cxKcCWSJFUjTZbov63dicvIoWP9jAKM9JoPAPbdaC tSBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Gg80R0nd; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g14si3110481eds.424.2021.12.23.20.33.06; Thu, 23 Dec 2021 20:33:06 -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=@gmail.com header.s=20210112 header.b=Gg80R0nd; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7404F68B271; Fri, 24 Dec 2021 06:33:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 164F568AF42 for ; Fri, 24 Dec 2021 06:32:55 +0200 (EET) Received: by mail-pg1-f175.google.com with SMTP id 8so6625685pgc.10 for ; Thu, 23 Dec 2021 20:32:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=BxLkWOJApL+6D1xkhC4+JZtaAQp6fqJAGcsLzXGieOQ=; b=Gg80R0ndVxdYD0VUeZtbeYTuyWOnWutUE1Kg9cDYexq/NfLRzpLxb3uQkF3GtfzAW+ hiqzjfFD9+weqUbvtfDtxOMIPROswPciG54wnkR0K5KZOphPY8loSENigGQZmVD3CrXF cJzzdHWzxGtXj+UM5LMhFseCBhfa6GvCyohelCx1GUT+BT5mblfPr1j9/QLBvAcoOGVV R0INBDNDRkDY7SKy7ycndL7ILswmxDV7Kb5XnDV7wH2tl/Z+x4T7dgOc8OVWXN7iBQwd 9PoKS/Cx+Xvb7SohTjp4Url5JckzEEswvcLSTCEhQr5fJvmGFq1z27pshtf3autQEpqc g8yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BxLkWOJApL+6D1xkhC4+JZtaAQp6fqJAGcsLzXGieOQ=; b=P0UmRT3uSQT6Y7qGA2Sv4U8j7GNzggYULZU4Gdsc27gBwQERpM4uNqHkWoPmXwSQLR SVwesLvwIdDH189LL50nBpQV06XjOs6PQ4L1vQnb5byyiRQPR3Z/nbbaeEbp6R9j0n7S k6gOIUuJQQRIewIYoudsa6aVzTpCaodU68igmitlk85Df+tGnQwmohDSWmO1d+HLPy+C 1utCxdBEvr4NNyDzYuZLIqbUuhiwDckDoW/Rf4YGiEH9XcTgaKyIKBVFCeGWuiueUIwP x+LpTUoPWfDb80dOqvk3bRJJyLECpwUiDkLYze1IZHcRlpjN8xGe7wRzDfyj0rHE2SEU qVvQ== X-Gm-Message-State: AOAM5330tinpyW3ukxC3lBseC/I0MJqruYM2f5wy8Pg5LVIxpQFj7QK7 WWYS9dXAXAh6z6wjPZKY2L0VUgxJN98= X-Received: by 2002:aa7:9207:0:b0:4a4:f59a:9df with SMTP id 7-20020aa79207000000b004a4f59a09dfmr5284390pfo.63.1640320373702; Thu, 23 Dec 2021 20:32:53 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id k19sm7848242pff.5.2021.12.23.20.32.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Dec 2021 20:32:53 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Dec 2021 12:32:47 +0800 Message-Id: <1640320367-30993-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] avcodec/nvenc: add udu_sei option to import user data unregistered SEIs 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UUyum7NuKYZO From: Limin Wang Note: nvenc sdk will truncated user data unregistered SEI if the size > 503. for example, hardcode its size to 504, trace_headers will report below error: Invalid SEI message: payload_size too large (504 504 bytes). Signed-off-by: Limin Wang --- libavcodec/nvenc.c | 2 +- libavcodec/nvenc.h | 1 + libavcodec/nvenc_h264.c | 2 ++ libavcodec/nvenc_hevc.c | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index edc46ed..12ffcf0 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2221,7 +2221,7 @@ static int prepare_sei_data_array(AVCodecContext *avctx, const AVFrame *frame) AVFrameSideData *side_data = frame->side_data[i]; void *tmp; - if (side_data->type != AV_FRAME_DATA_SEI_UNREGISTERED) + if (!(ctx->udu_sei && side_data->type == AV_FRAME_DATA_SEI_UNREGISTERED)) continue; tmp = av_fast_realloc(ctx->sei_data, diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 08531e1..b42a156 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -235,6 +235,7 @@ typedef struct NvencContext int intra_refresh; int single_slice_intra_refresh; int constrained_encoding; + int udu_sei; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 7d78aa0..79b7aca 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -194,6 +194,8 @@ static const AVOption options[] = { OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "constrained-encoding", "Enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices", OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "udu_sei", "Use user data unregistered SEI if available", + OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index a13ac5a..12b4e11 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -175,6 +175,8 @@ static const AVOption options[] = { OFFSET(single_slice_intra_refresh), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "constrained-encoding", "Enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices", OFFSET(constrained_encoding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "udu_sei", "Use user data unregistered SEI if available", + OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL } };