From patchwork Mon May 17 07:55:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2623720iof; Mon, 17 May 2021 00:56:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzX9NBp0pxesPjsYzaI179wD6Q0sGfDP9V5Dlp++GopTiMU78zGRezZ4Fg64mfem/QLy6Pv X-Received: by 2002:a17:906:a1cb:: with SMTP id bx11mr2951466ejb.115.1621238206463; Mon, 17 May 2021 00:56:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621238206; cv=none; d=google.com; s=arc-20160816; b=HiVP52hA2nKGCNn37x9gYU0b9BMeRUOjqp+Q4jP9L7MOmXZKFVLDqNNyEWBYZT3Hm2 NU5dqHrkJluwjDwQeQxkShRljmIAYx09cBRC1r80dGkvH1L1g7TJGeTZu1qtFzI5yimg eyEm08ih/0KgnmnWqgcIJtcuhKfRbrIac7J1BSNChlkQJRQ3tAdWkEGPtUQ0uWCN1h+h C2e4oTi89jg/6v0cdlP0gKWrKuXyLtyrIAsPf9GLt4IaxQF6BfQJ77KaF3PGVYuOvMDT iqYK7tQB75bzetPzCDUCPiE8guZIBQJ5md53mBiRwCL0qKAfYHkEHpIISv9PHJsFc4Z3 FLeg== 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=WPaLHbHeaExQBG7qBsVJL9QXHNih+44ZxheJolVf7Hg=; b=T57SX0ppmKa4sIf1205rjW/2JF/h7wheHutR7KfxIs4wnPIucXAPrjn44sLZ94lJAO uEQdEuj9aKwbzaLU4VpXpcrrBUzEg3ApvXUBE5UFap3lFHp6q7mdy5ddo2TfdFidNawb 8PyXXC42m06/Y4NO5OpJYfRrDC7LTiryMI+otu9I0drBWn/9ejbfanR78wrmmXsrUHJO 5RYoBHSUJELKWTdZYd0oejI41hJbWf0GFPoRdvpXvdk8KJeLeFkGGMX32qE/sj48I4tt jheNl/kpV/RwYT0Hl9nW1dAfPsE5b/43QGt/K9QXp8uOtvGU8bcf/nXgKIKBF6LD1ZEm 72Qw== 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 p8si2606144eja.155.2021.05.17.00.56.46; Mon, 17 May 2021 00:56:46 -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 7A1AB68987B; Mon, 17 May 2021 10:56:16 +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 EA501680911 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-59; Mon, 17 May 2021 17:56:04 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 17:55:55 +1000 Message-Id: <20210517075557.33664-2-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 1/3] libavcodec/libx264: 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: 3WTzERy1FoBS Signed-off-by: Brad Hards --- libavcodec/libx264.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 1c27f7b441..1fac141ec6 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -31,6 +31,7 @@ #include "internal.h" #include "packet_internal.h" #include "atsc_a53.h" +#include "sei.h" #if defined(_MSC_VER) #define X264_API_IMPORTS 1 @@ -303,6 +304,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, int64_t wallclock = 0; X264Opaque *out_opaque; AVFrameSideData *sd; + int total_unreg_sei = 0; x264_picture_init( &x4->pic ); x4->pic.img.i_csp = x4->params.i_csp; @@ -316,6 +318,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, x4->pic.img.i_plane = avfmt2_num_planes(ctx->pix_fmt); if (frame) { + void *sei_data_a53_cc; for (i = 0; i < x4->pic.img.i_plane; i++) { x4->pic.img.plane[i] = frame->data[i]; x4->pic.img.i_stride[i] = frame->linesize[i]; @@ -349,28 +352,50 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, reconfig_encoder(ctx, frame); if (x4->a53_cc) { - void *sei_data; size_t sei_size; - ret = ff_alloc_a53_sei(frame, 0, &sei_data, &sei_size); + ret = ff_alloc_a53_sei(frame, 0, &sei_data_a53_cc, &sei_size); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - } else if (sei_data) { + } else if (sei_data_a53_cc) { x4->pic.extra_sei.payloads = av_mallocz(sizeof(x4->pic.extra_sei.payloads[0])); if (x4->pic.extra_sei.payloads == NULL) { av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - av_free(sei_data); + av_free(sei_data_a53_cc); } else { x4->pic.extra_sei.sei_free = av_free; x4->pic.extra_sei.payloads[0].payload_size = sei_size; - x4->pic.extra_sei.payloads[0].payload = sei_data; + x4->pic.extra_sei.payloads[0].payload = sei_data_a53_cc; x4->pic.extra_sei.num_payloads = 1; x4->pic.extra_sei.payloads[0].payload_type = 4; } } } + for (int j = 0; j < frame->nb_side_data; j++) + if (frame->side_data[j]->type == AV_FRAME_DATA_SEI_UNREGISTERED) + total_unreg_sei++; + if (total_unreg_sei > 0) { + x264_sei_t *sei = &(x4->pic.extra_sei); + sei->payloads = av_realloc_array(sei->payloads, + sei->num_payloads + total_unreg_sei, + sizeof(x264_sei_payload_t)); + if (!sei->payloads) { + av_free(sei_data_a53_cc); + sei->num_payloads = 0; + return AVERROR(ENOMEM); + } else + for (int j = 0; j < frame->nb_side_data; j++) + if (frame->side_data[j]->type == AV_FRAME_DATA_SEI_UNREGISTERED) { + x264_sei_payload_t *payload = &(sei->payloads[sei->num_payloads]); + payload->payload = frame->side_data[j]->data; + payload->payload_size = frame->side_data[j]->size; + payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED; + sei->num_payloads++; + } + } + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); if (sd) { if (x4->params.rc.i_aq_mode == X264_AQ_NONE) { 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, From patchwork Mon May 17 07:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2623448iof; Mon, 17 May 2021 00:56:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxI2+1Umiipr/B2aHywgM1wJpQEgbYJ9e49yz4CgP98qU7qQHvgyK96S8HXRszlPuBXo7Fr X-Received: by 2002:a17:907:37b:: with SMTP id rs27mr3143737ejb.287.1621238177205; Mon, 17 May 2021 00:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621238177; cv=none; d=google.com; s=arc-20160816; b=QOX+ZSYaXKbyrCjqkwMIlJlo/Y/bgeMgDaRsx7Gu4juIQHDoaq3CEyA3AYNowzkThX v9O5M3TfrfZqURoVwu9Nr+R+xycEjkE+oWjZNs3pDu+DY1b8jubyi//GN11bKp7VpdqT uwUj7ZzTHDWHz7QelGHxjjy3Yu4qLieYj4rTC1fsBu3wnzDYV6ZNiTL+PYVAcDTB/aTJ x54tFkLrTWNht9YYcnuouLz0isegAO3CJZB+Do/PY+Pp9TYI11S1qlOgLmy4jrb7pF7/ 5udXa/QW6X9ESuDco1eHuQvjSO4DVJKJMO4sVWBt9620BQzajB5d0ohTtQmMBFAt/y4d nuqA== 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=jlVO10fw98SH2Su9zUl6s5XSDwEjlDZShXVykRLHg5A=; b=dOpqzFP6+WDSpTFqaayBzFIsnwQaVDq73hRvl/qfv9qj5yKRJ64oF/Ht4IaeSykEUG +NZgfjkbpFgOQCJ2ISmKuc2aj9fVJBF2alJzkHC+FfeTnusz63rUlMkJBooxvvSWDwhK fSkF23Q45QyyB1oQQHpZ0iXAPfEkd2elkP8wlACbmyZb/GctTcUAMxuV+HTHZ3PV9giv D+/Uf/JUNGSFKkHzoq5PL34DL+GDLlsH69sycaQhIawa1KUNyMs6r7pAN/0AQOVAOnFI Pl/NyWNWEMtlRcDikH3Dxav21/Ggh4qF1hwAIBvj2VJwee5VDWMMjHH+THECNYEfFKVk UYkg== 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 r5si13755368eda.364.2021.05.17.00.56.16; Mon, 17 May 2021 00:56:17 -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 4693E6880B0; Mon, 17 May 2021 10:56:13 +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 E2145680665 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-Jb; Mon, 17 May 2021 17:56:04 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 17:55:57 +1000 Message-Id: <20210517075557.33664-4-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 3/3] avcodec/nvenc: 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: MhYXZJs0TSt1 Signed-off-by: Brad Hards --- libavcodec/nvenc.c | 64 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 0dcd93a99c..e22fdfb5a8 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -2170,9 +2170,10 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) NVENCSTATUS nv_status; NvencSurface *tmp_out_surf, *in_surf; int res, res2; - NV_ENC_SEI_PAYLOAD sei_data[8]; + NV_ENC_SEI_PAYLOAD *sei_data = 0; int sei_count = 0; int i; + int total_unregistered_sei = 0; NvencContext *ctx = avctx->priv_data; NvencDynLoadFunctions *dl_fn = &ctx->nvenc_dload_funcs; @@ -2185,6 +2186,8 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) return AVERROR(EINVAL); if (frame && frame->buf[0]) { + void *a53_data = NULL; + void *tc_data = NULL; in_surf = get_free_frame(ctx); if (!in_surf) return AVERROR(EAGAIN); @@ -2230,7 +2233,6 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) pic_params.inputTimeStamp = frame->pts; if (ctx->a53_cc && av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC)) { - void *a53_data = NULL; size_t a53_size = 0; if (ff_alloc_a53_sei(frame, 0, (void**)&a53_data, &a53_size) < 0) { @@ -2238,15 +2240,21 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) } if (a53_data) { - sei_data[sei_count].payloadSize = (uint32_t)a53_size; - sei_data[sei_count].payloadType = 4; - sei_data[sei_count].payload = (uint8_t*)a53_data; - sei_count ++; + sei_data = av_realloc_array(sei_data, sei_count + 1, sizeof(NV_ENC_SEI_PAYLOAD)); + if (!sei_data) { + av_free(a53_data); + sei_count = 0; + return AVERROR(ENOMEM); + } else { + sei_data[sei_count].payloadSize = (uint32_t)a53_size; + sei_data[sei_count].payloadType = 4; + sei_data[sei_count].payload = (uint8_t*)a53_data; + sei_count ++; + } } } if (ctx->s12m_tc && av_frame_get_side_data(frame, AV_FRAME_DATA_S12M_TIMECODE)) { - void *tc_data = NULL; size_t tc_size = 0; if (ff_alloc_timecode_sei(frame, avctx->framerate, 0, (void**)&tc_data, &tc_size) < 0) { @@ -2254,13 +2262,46 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) } if (tc_data) { - sei_data[sei_count].payloadSize = (uint32_t)tc_size; - sei_data[sei_count].payloadType = SEI_TYPE_TIME_CODE; - sei_data[sei_count].payload = (uint8_t*)tc_data; - sei_count ++; + sei_data = av_realloc_array(sei_data, sei_count + 1, sizeof(NV_ENC_SEI_PAYLOAD)); + if (!sei_data) { + av_free(a53_data); + av_free(tc_data); + sei_count = 0; + return AVERROR(ENOMEM); + } else { + sei_data[sei_count].payloadSize = (uint32_t)tc_size; + sei_data[sei_count].payloadType = SEI_TYPE_TIME_CODE; + sei_data[sei_count].payload = (uint8_t*)tc_data; + sei_count ++; + } } } + for (int j = 0; j < frame->nb_side_data; j++) + if (frame->side_data[j]->type == AV_FRAME_DATA_SEI_UNREGISTERED) + total_unregistered_sei++; + if (total_unregistered_sei > 0) { + sei_data = av_realloc_array(sei_data, + sei_count + total_unregistered_sei, + sizeof(NV_ENC_SEI_PAYLOAD)); + if (!sei_data) { + av_free(a53_data); + av_free(tc_data); + sei_count = 0; + return AVERROR(ENOMEM); + } else + for (int j = 0; j < frame->nb_side_data; j++) { + AVFrameSideData *side_data = frame->side_data[j]; + if (side_data->type == AV_FRAME_DATA_SEI_UNREGISTERED) { + sei_data[sei_count].payloadSize = side_data->size; + sei_data[sei_count].payloadType = SEI_TYPE_USER_DATA_UNREGISTERED; + sei_data[sei_count].payload = av_memdup(side_data->data, side_data->size); + if (sei_data[sei_count].payload) + sei_count ++; + } + } + } + nvenc_codec_specific_pic_params(avctx, &pic_params, sei_data, sei_count); } else { pic_params.encodePicFlags = NV_ENC_PIC_FLAG_EOS; @@ -2274,6 +2315,7 @@ static int nvenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) for ( i = 0; i < sei_count; i++) av_freep(&sei_data[i].payload); + av_free(sei_data); res = nvenc_pop_context(avctx); if (res < 0)