From patchwork Sat May 15 05:43:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1067995iof; Fri, 14 May 2021 22:44:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgZTGbFyzSlIpc8fXGBlmwta+nGuCBnyInS4hY25JBfMKQEPYpO+hCkkpuPbL8dDW2ZiiW X-Received: by 2002:a50:cdd1:: with SMTP id h17mr59348140edj.178.1621057455974; Fri, 14 May 2021 22:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621057455; cv=none; d=google.com; s=arc-20160816; b=V8PZZwEGW9Ny0tTpXsgGEOp8Y4EsEAbb2pwtiP+Xq8kXJ1QsKZe2ga9fCkdkBI9yfO U25fQvxrXvw1pLhG8jt9bOsTY5oAOMvcIwNbRBQbk+Ked5PMU6DkAzoHZTdH68uMuCzE TqaJDJZly8b8NW4wVzu4MNjdbqXdC4mOb6HvVTUKAnenKvgHhOrQ8jU4nvTGJ/Y6tPGR iISMMpK6mKxn+rJTa+5asJ4Dt+a0dlN33Z6pSZ2in9u+AkuDJNradt25kR+WY8T2UNI9 R5ApN27bcjJrvKSM86xczxxpbT4CqgUXq2yzhis3nE5mPMLdGr+05B1KeI5+hZE7pjt4 av2w== 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=pxINYXVcuqGr7zhiEAMRr6Q4tOiKVbv2Y+YzfOnjCWw=; b=IwyjaAyp6dF432tdJI+zXSkQ1HNa5CsswizxGI2vTGuHHLabBwE3opuROKidJQDzWG yP4y8WFTMFK4Rm0L54WLYusBRhmqfuFHy+OldM+BCcwcw8nfGWqWYl9tS3JQFCVR6IGk aecJxCdF6/LFa2If5UpvaT61SqqYe73zCVHaDhX37QhrjsZxG9/nrXQiLjiXFGCt5ADx +QFkknXKZI8fT08ZhHk91j4elsOEqBO9D6/O6eNpcnWuQFcLahKlbC/A2BohwzPsitgc k0e088zvgg7r1Ue+pNiXRRWK+BTOVRxTx0b+E23+htMVEl6i+K4w2m/obe58sDovV3jP xQ8A== 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 gg35si7246626ejc.460.2021.05.14.22.44.15; Fri, 14 May 2021 22:44:15 -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 342E168813A; Sat, 15 May 2021 08:43:49 +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 7EE6D680C04 for ; Sat, 15 May 2021 08:43:39 +0300 (EEST) Received: from ppp115-205.static.internode.on.net ([150.101.115.205]:60460 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 1lhn5N-0009gp-9E; Sat, 15 May 2021 15:43:37 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 May 2021 15:43:16 +1000 Message-Id: <20210515054317.30414-3-bradh@frogmouth.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210515054317.30414-1-bradh@frogmouth.net> References: <20210515054317.30414-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 v3 2/3] 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: Js6ktneJaPGa Signed-off-by: Brad Hards --- libavcodec/libx265.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index a1bd205201..e21eb8828d 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,27 @@ 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)); + if (!sei->payloads) { + av_log(ctx, AV_LOG_ERROR, "Not enough memory for unregistered SEI, skipping\n"); + sei->numPayloads = 0; + } else + 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,