From patchwork Mon May 17 07:55:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2623534iof; Mon, 17 May 2021 00:56:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHtYIKn8OHitXViyEhKBkp5DgXh3zsYPF+0fKoz0S76tuUK47CWTnFkkTOFHlXtE7x3SJJ X-Received: by 2002:aa7:d0c9:: with SMTP id u9mr69949941edo.43.1621238187012; Mon, 17 May 2021 00:56:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621238187; cv=none; d=google.com; s=arc-20160816; b=fOvoXtICiUzrGpTeZL4Uh+9k4h3iswby2vOxHx7yYHZXaysOL9VeE7cRyO2vueEKR+ m+eVtKso7Uwa7tNw6oxBPOIWM37hfG4OoZJ9zxJFURIzU4ZrauklQw8fUDyMhXhi+9WK eS7MDGTb4dLJ24qKfUnNipzAJmGnGftGUa3TIcPvj8FjvP45ZMXhhlBQYH7uQQwiu2vf J7iKRlLvetRCt50eei7yH5/FkKtYhEUurD+vncf3ZkdZmS2NYlSdJhMOK44SHJxw2Aeh sZ9odrAFadzxCmY1LXbQ8lqgM++FXKwKSHOUmMIUDzLOZJCBuwlLqHG/CZ2cjLXElt8D J00w== 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=OFFqQZB2PBhVL9MnvYizG+Mzc+CJeIkFZF8i2Whi7xM=; b=BzdFQ+ObBph99ccV59ZJzcmtOirBNhb9FIVJyCp/2ldxzttgM047kmwtFbhuF0lAv+ ikSMOoiJIAZ0PRwZnc2Y+RePIpOcI/hTFzHeIYgVHIczvW8Ro36jBjVvsxwhLiFDROeG Ns/Uw5qkYiiq2pgibzMOxcbngk737CXaDwbC747kL0f+RhVgFqVzR7ReTlMxCDLRD7b8 g048eEu/p94zGz+SzBIiXXV5iRugaU9P4jm4Xwc6x4x11+UIU2JHvCmKFPtsX8+7+LYh GFHA8fud3QKraDC7vtmkxTqPWaGuepnnXNBY9t7P3vg5u6Aw5a+hAh/z9l5GTrhaFEUK 9mxA== 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 de20si13268837edb.211.2021.05.17.00.56.26; Mon, 17 May 2021 00:56:27 -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 52E796891CF; Mon, 17 May 2021 10:56:14 +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 E490A680775 for ; Mon, 17 May 2021 10:56:06 +0300 (EEST) Received: from [1.129.164.187] (port=50270 helo=localhost.localdomain) by cp1.nerdvana.net.au with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1liY6e-000CCu-DH; Mon, 17 May 2021 17:56:04 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 17:55:56 +1000 Message-Id: <20210517075557.33664-3-bradh@frogmouth.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210517075557.33664-1-bradh@frogmouth.net> References: <20210517075557.33664-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 v4 2/3] libavcodec/libx265: write out user data unregistered SEI 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: b+KZmDZi1UKk 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..d66506dda9 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) { + sei->numPayloads = 0; + return AVERROR(ENOMEM); + } 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,