From patchwork Fri Apr 30 11:34:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27540 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp332802pxb; Fri, 30 Apr 2021 04:35:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwhE7SAtNy9IxA/4MIcUvGilifihhQLHGwBmi/C3lalUsLZyzL2fKcXrKgZ7eFxrKpPBYJ X-Received: by 2002:aa7:c049:: with SMTP id k9mr5345770edo.56.1619782500135; Fri, 30 Apr 2021 04:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619782500; cv=none; d=google.com; s=arc-20160816; b=NuzaUvRb9H2P5bJ93+1O7wZEdM++JvP8kVIkvPANBAgC5TxoQtbI0dUuQUuhK/mJ9X pr8iaZB711sBH1h5y/oFyf9lD3HqDW2CuicrFNT4iyoWoOTOdinGyadXy4z2KRNH59Rl 3MXZulr2BhHCxWC2S+raw59ESU9Zs8loQf0vkpJwt3pzviJQMSzWtGyo7nryF3EJGLC4 224xyLU3aj4pzYP9rp/pF9rEQQRTOHQ7MOjsGiEQWfqGkf/umzMXpQajCQSvpf60zdJC guqiKZIb4CRJZJ3pbSBolwR1jRyjwshs7ZlIkdcR1ndSx4QJtHPk8sgPT2vUhtYHZhAd CIbw== 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=rEppIPlt4oPB5WuG7dwxUQdI4BFr/IOvvfLJaq/+pyc=; b=BWe3m0uLop8P/24wS/0NYPF1V8ASA4yypQg8FsLw0Wwol8fH70X88ftA6iaMm8qryY XSVuddr/sbes8NRFQBTvBsq7D3FLPneYAhNR0HlQMNz9MMKOJZnT+rBGHchwe8dEMa6o UmH1I8GXLSHE/k1HoxHJ1YiAYuL4SNRQvduUiz4+SKHFJhbqRwMM4kZO1muJa2Jx3FCa BaLV3TKGG0q9X3bWRiIyzCLp58k8jQZh9Q0h9LPINNVK+O/M+769LfFgHmDTNud9FPLX hxKyj9uI9OudBqVNKY3svxjlKIu60kR2FDFHRNAFN/whm0kEXQy7R/8j+8GAWV8LIgY6 oihQ== 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 q11si2950439eju.518.2021.04.30.04.34.59; Fri, 30 Apr 2021 04:35:00 -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 01FE3689916; Fri, 30 Apr 2021 14:34:54 +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 A67136881A9 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-Qi; Fri, 30 Apr 2021 21:34:42 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 21:34:30 +1000 Message-Id: <20210430113432.308139-4-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 3/5] 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: OxEQQCucshj7 Signed-off-by: Brad Hards --- libavcodec/libx265.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index a1bd205201..3dceb3d165 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -484,6 +484,8 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, int nnal; int ret; int i; + AVFrameSideData *sd; + int num_unregistered_sei; ctx->api->picture_init(ctx->params, &x265pic); @@ -515,6 +517,17 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, memcpy(x265pic.userData, &pic->reordered_opaque, sizeof(pic->reordered_opaque)); } + num_unregistered_sei = av_frame_num_side_data(pic, AV_FRAME_DATA_SEI_UNREGISTERED); + x265pic.userSEI.payloads = av_realloc_array(x265pic.userSEI.payloads, x265pic.userSEI.numPayloads + num_unregistered_sei, sizeof(x265_sei_payload)); + for (i = 0; i < num_unregistered_sei; i++) { + sd = av_frame_get_side_data_n(pic, AV_FRAME_DATA_SEI_UNREGISTERED, i); + if (sd) { + x265pic.userSEI.payloads[x265pic.userSEI.numPayloads + i].payload = sd->data; + x265pic.userSEI.payloads[x265pic.userSEI.numPayloads + i].payloadSize = sd->size; + x265pic.userSEI.payloads[x265pic.userSEI.numPayloads + i].payloadType = USER_DATA_UNREGISTERED; + } + } + x265pic.userSEI.numPayloads += num_unregistered_sei; } ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,