From patchwork Sat May 1 02:23:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27549 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:cc:0:0:0:0 with SMTP id m12csp64516pxt; Fri, 30 Apr 2021 19:24:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZtHpSdfktUjf7AJoINfxqP8yZWqy89V0BJdWznlh/J8C+yROmOHZhse78iR4Djurv2zIa X-Received: by 2002:a05:6402:6cf:: with SMTP id n15mr9116843edy.51.1619835850232; Fri, 30 Apr 2021 19:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619835850; cv=none; d=google.com; s=arc-20160816; b=HXHjgynKaBwGmQ8zTZy112phXwuFLFgToWWpDTdPI/yNceaAe8U1nfoywIPh5j7JHG eE42IYZA701t1Fn7lwecAR0fW8IthFOaESjKrO/lEMOvKfUXYuFSiev3af14ak/6v0rg gvjNcDtaIULrZYjXeKOICpoBPUBpWuEC+URgFn5XVoFK+xdcUOk3Qs6eJPQEHENvAfGS PLeQQFnisRvOEuZbckpvRewpSfmd3bHKm5+dCCjFlP4rent+szS4wDIqk+uDS8pwW9HE ZV5gq8sUcmi9jjuT++7/VyppEnZTtomlNXA3a0Xn8OyDGUGY6Ip5c33gHOAsNTpVRbOc Z+eA== 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=UkGLlNnDRC+SgMhq4oLuIsNAd0kYwQGdmwwt1gbRQFw=; b=Gf5t3yrhTxsjfR5FlXZ+JxEKCW79XZsagHpo6BcF0x6GXSDylSqRLuLvo8TQHk2dY7 KmQ9fpaboCTIIGck5frOy2JlkmKAjKHp1hsU7P+BUwwGfIHADuVU6CsCu2Z/ZoxLCQkP GAg6Vl0+P+TLt/NqCxqF7nJ6uHm01HVsIFcLLLbuswxLbw6YgpL3tiJctJIVVUSha6Ux vzEnvnLc9IhX4Nn3MnfTz7xXN630gtYzZF0B893QOmX00srozjr4Gi5G34zAvQ+I05aJ 5D10MlhOY8p0FPXgvKl0/k7zXx+vQl4IudT6ijmseVN1Z2Y9JXwnP7+Z9SjROnMcGyVU ct6A== 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 b6si5842938ejb.254.2021.04.30.19.24.09; Fri, 30 Apr 2021 19:24:10 -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 2B6E26880E6; Sat, 1 May 2021 05:23:30 +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 68A7B6808E6 for ; Sat, 1 May 2021 05:23:17 +0300 (EEST) Received: from ppp115-205.static.internode.on.net ([150.101.115.205]:41406 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 1lcfHm-0008W8-F4; Sat, 01 May 2021 12:23:14 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 May 2021 12:23:02 +1000 Message-Id: <20210501022304.301425-3-bradh@frogmouth.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210501022304.301425-1-bradh@frogmouth.net> References: <20210501022304.301425-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 v2 2/4] libavcodec: write out user data unregistered SEI for x265 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: T8G4KEU/A5eg Signed-off-by: Brad Hards --- libavcodec/libx265.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index a1bd205201..013a991e52 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -484,6 +484,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int nnal; int ret; int i; + int total_unregistered_sei; ctx->api->picture_init(ctx->params, &x265pic); @@ -515,6 +516,25 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy(x265pic.userData, &pic->reordered_opaque, sizeof(pic->reordered_opaque)); } + for (int j = 0; j < pic->nb_side_data; j++) { + if (pic->side_data[j]->type == AV_FRAME_DATA_SEI_UNREGISTERED) + total_unregistered_sei++; + } + if (total_unregistered_sei > 0) { + x265_sei *sei = &(x265pic.userSEI); + sei->payloads = av_realloc_array(sei->payloads, + sei->numPayloads + total_unregistered_sei, + sizeof(x265_sei_payload)); + for (int j = 0; j < pic->nb_side_data; j++) { + if (pic->side_data[j]->type == AV_FRAME_DATA_SEI_UNREGISTERED) { + x265_sei_payload *payload = &(sei->payloads[sei->numPayloads]); + payload->payload = pic->side_data[j]->data; + payload->payloadSize = pic->side_data[j]->size; + payload->payloadType = USER_DATA_UNREGISTERED; + sei->numPayloads++; + } + } + } } ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,