From patchwork Fri Apr 30 11:34:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27541 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp333129pxb; Fri, 30 Apr 2021 04:35:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfEQKVw4GxtC9ofd9V88AXzDmWY4Z5Ye9Gg+04mKC+9tQFu2InzL9i68Hr2nJuZOvbmpsI X-Received: by 2002:a17:906:d18a:: with SMTP id c10mr3778100ejz.271.1619782521366; Fri, 30 Apr 2021 04:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619782521; cv=none; d=google.com; s=arc-20160816; b=p6COFYjpuYgLlP1clemdJQuIatqElj+cySp1RaaWIhGUJwtKYLpHDlUediaRW0FFb2 FAgloW4HLFxW3hLM6TOV2ggk1fe5MY9WVMU4ws/ebs0jJXVxHJoQJg2A3628so55SW79 p4RmE0T4srSXdoeOYQ3U+XYQpC2k7/pnmYwOy6Q5hBmDAEMod1Fbo2Okahax9wUhcJOa gpaHXqsDE3KmLZNDrkdgH5tUPGon96bxKZmMUhMj8tpTd/IsIAea+vQVFLQLGcARIagf NkSYcARPlUdCg3Y5/18cNbScBuuJUDd1g+UE3yNtgQ0yFS4OVpcAaASbxCCZD+rH8NI8 3smw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=ZwxVGDRurjaUjrV1tf/5Zuy2SPCpWgtwBwlnDCvnqyk=; b=acQXdy3NMvdmCKo2xCVEFF7xvQOLmifsOy1YC5Dx2VZ3jVZ4QIIuY8QkzETlw+K9kH o0oAbWulm1luc4Tc5TfmIoMhJMC1bK8zjPLU1NabnhEeN6guSXMWiatjXXJp/UVLoijt Sy9ApYHJwt3JU4VL1fr05vVdpY+HLVeZ3vJOI+JUcfXuos2JFxJ2YBcIbMYDkrAQRjYV y2IOUis8tGd1jZoLNhAeNoAt7hfTVavCZLpq0pt7m5qN6LiBjOCwJmRzr88XN3Y36/JY gLqijV47alo1iUbVD6+Dw3T188phi27sVbFY0apEyp4uvozjBwv/H6m5CrGePSPjk/9H bM+Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v18si1731872edb.78.2021.04.30.04.35.20; Fri, 30 Apr 2021 04:35:21 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5173A688133; Fri, 30 Apr 2021 14:34:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cp1.nerdvana.net.au (cp1-new.nerdvana.net.au [113.212.99.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9653688342 for ; Fri, 30 Apr 2021 14:34:46 +0300 (EEST) Received: from ppp115-205.static.internode.on.net ([150.101.115.205]:41184 helo=audax.fritz.box) by cp1.nerdvana.net.au with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lcRPu-0000qy-Tl; Fri, 30 Apr 2021 21:34:42 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 21:34:31 +1000 Message-Id: <20210430113432.308139-5-bradh@frogmouth.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210430113432.308139-1-bradh@frogmouth.net> References: <20210430113432.308139-1-bradh@frogmouth.net> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cp1.nerdvana.net.au X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - frogmouth.net X-Get-Message-Sender-Via: cp1.nerdvana.net.au: authenticated_id: bradh@frogmouth.net X-Authenticated-Sender: cp1.nerdvana.net.au: bradh@frogmouth.net X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH 4/5] libavcodec: write out user data unregistered SEI for nvenc 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: Brad Hards Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZykB0y6VlyDl Signed-off-by: Brad Hards --- libavcodec/nvenc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 0dcd93a99c..1a895a64f4 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2173,6 +2173,8 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) NV_ENC_SEI_PAYLOAD sei_data[8]; int sei_count = 0; int i; + AVFrameSideData *sd; + int num_unregistered_sei; NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; @@ -2261,6 +2263,20 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) } } + num_unregistered_sei = av_frame_num_side_data(frame, AV_FRAME_DATA_SEI_UNREGISTERED); + for (int i = 0; i < num_unregistered_sei; i++) { + sd = av_frame_get_side_data_n(frame, AV_FRAME_DATA_SEI_UNREGISTERED, i); + if (sd) { + sei_data[sei_count].payloadSize = sd->size; + sei_data[sei_count].payloadType = SEI_TYPE_USER_DATA_UNREGISTERED; + sei_data[sei_count].payload = av_memdup(sd->data, sd->size); + sei_count ++; + if (sei_count >= 8) { + break; + } + } + } + nvenc_codec_specific_pic_params(avctx, &pic_params, sei_data, sei_count); } else { pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;