From patchwork Sat Mar 2 08:51:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 46695 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp1750624pzb; Sat, 2 Mar 2024 00:52:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUKK2IpfpxsV7i3DUSdWnGl8t1lVCNH+YU4UvmfdiD9t93Jxk/8FpshzE271zuVDVYGTDaY4FmfcbdD/O+YS8yk/YBwwCu/g5DQmg== X-Google-Smtp-Source: AGHT+IHc+L1AriGVA+108KL35uTT9N0qGMIT0eEHoWFwWaj47f1y/WBvBWVRhf7zMk0G5JX6ikwZ X-Received: by 2002:a17:906:34c6:b0:a3e:f79e:ce56 with SMTP id h6-20020a17090634c600b00a3ef79ece56mr2572210ejb.45.1709369522495; Sat, 02 Mar 2024 00:52:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709369522; cv=none; d=google.com; s=arc-20160816; b=zQNSi+PJe+XlMF3qkHY/E2LMdsh+1/XC4Rf3MzYX2+V9NvnSAnU3eZg4WvpFIpQFzB 9kQOhfKdn5e2jH0R6hyAwHklBBFIhqKKz7VdJzxvo71pcrBhJkWIMWJ61Ng8yWOgNayE moRUz4qpL5TNZJLo9Q56UUtTbcywrRc6zFOz9nOXyrK43n0UkOAhaw5MccZ71SBp1okO GqKPdJAzHqxqYFwFCLDEnsfpwrDxOwdDQQqE1Ty34J+Su80GRTvVjVeEKx+hQVh5Zl5S BiZNPynFu/JsVEq4hOo35bKaLA3ZVaVZvON1+r1QhImLqzdCMtU9aGaAawHGYP+DIx73 ip6w== 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:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:message-id:delivered-to; bh=w612VEcbMc9fJCWh5PlBiaro3T+iIaHaUKZa7Uw72wA=; fh=frUT2hx60kzuIVmkNUv7bM3Y/kw3lxlKoLH+4fdDqZk=; b=g0hSGgHlGC5GBk3dAnhFAMYbTNtsMs0Q8PxSu9MLLbb8kEU8wF2FDmdn6bmDq9dkuK VL+IeGLWR5a3/CHXAAoYHlcF3aENzAATzreEZLslPhMAkjR0bMYfYyJEzat/5nKxb7Et mGwprgRfZAKf+Uv+jCAsqhtsrp1IAGOvnuNhj9EiZEXxhJN1OIXQY3N5ZL2iUhqXovON tfc5pBRM6lYwI2pmp7R8/n+6dldZ9D0FiuB0ve9KW1e643+yMetuwk1gfRvoYNDlLQZD MJS9ywwViaGieOrsaezzYQWkzgjnRqTCdzIloIOzGkGlWNf58L7RLOunog66xa/8nxgm Myew==; dara=google.com 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 f26-20020a170906049a00b00a3eafe37e75si2205950eja.675.2024.03.02.00.52.02; Sat, 02 Mar 2024 00:52:02 -0800 (PST) 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 75B1A68D2FF; Sat, 2 Mar 2024 10:51:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5596468D2F9 for ; Sat, 2 Mar 2024 10:51:47 +0200 (EET) Received: from localhost.localdomain ([163.125.127.26]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id CE93BA88; Sat, 02 Mar 2024 16:51:41 +0800 X-QQ-mid: xmsmtpt1709369501tmm3r70ym Message-ID: X-QQ-XMAILINFO: MgIlO7JxtfZa0gTbcC1qM7TNH8GRncWfAfDlF0DVS/CwqrjH4vMNT6MTUovpPK 6vGVLZigzBM0fXdp9XzK8+4sDY7RLWWZXPHP7PYb3SLWv9nKAJVRXIEGgii9Bc383UnnSj/1k3Lu R2Y/UpeDZQKJbpYyG4waW+Kc2eDr5T64a/l033Vu+6xmkl7WepTghtbTUXUrE+UC1VWIud5j4vpV 8GIioa4tRpdri8xnYNBoI9IUlc1FnMWvq6HdTDXPcxJwSQUxT7qxv7LOyYR6vXFo8beBQ1iyWlQc hYsWnmpq9SySRt1YrREHVJf0EahekSK7UhOrSJSRllxW/QWljYbZt7sQs8sAslTvSOWMaGb/EC+x FycP66zjlT5a8/D8RuilaW8usOkgQNCvhtKRJFSPAD0J5V68ljwoJbaT+yQR3pyH75HXUQljTWRw x2K5yUnE+i593eGPmiH3BSTEyGtTJs1nYWvfbQDWwH740WbBwtvQMHiI3+Qc74um4r1nXagVgvfN xeaCLlXjdOFrSj9fyT+W1SQC4pP+YxdCiE8EuGqT/pvnNkvWKYBRLADVzyrzkOHMSIHn2sPbpi5p aem2g6PcaPVUH1pi8lm4phla3V5mIf4uQLafDA3k7gGWXtZR+7yDH5l62nWwHZ0kniZvkAQU0qHl TPC7/pdag2J+VORqhkP5X8MuqwaRgtyfuamEATs14vXRJxryz19FqwF2ze5l+WkC8ONfsdaDIWYH mGK/+n0MieZAWPj+uglatT2cUqtthT0g8vST8mtaP95YE9/ZyznA2iLQ4JhfGQz44qbTI43tmNTV L32fBPIGGiG6dQQqdFfF+tPlVN2LobU3dmtz4TqeJCdRikQVNM+qv/z/bbCOOpgn/Sav+3cHTEXr C/Ydys6uuOBrrfN28qPOUPPrZFPKZC7fyOoHFqxn+pANouldsWc4E93vUPWVyH+5fIGIlLWcU9be jaJSS1y4rG3O0xF6//V7d1KlADsZ1Wb49WZqBAs6Y= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Mar 2024 16:51:37 +0800 X-OQ-MSGID: <20240302085137.23670-1-411294962@qq.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <29ed7620-f60f-4f31-bc22-3f0903456c07@gmail.com> References: <29ed7620-f60f-4f31-bc22-3f0903456c07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/3] avformat/flvenc: support enhanced flv PacketTypeMetadata 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: , X-Patchwork-Original-From: zhupengfei via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: 411294962@qq.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B/qX2NrjPZnp From: Zhu Pengfei <411294962@qq.com> Signed-off-by: Zhu Pengfei <411294962@qq.com> --- libavformat/flvenc.c | 142 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index f6d10f331c..ae7ea84bad 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -24,6 +24,7 @@ #include "libavutil/intfloat.h" #include "libavutil/avassert.h" #include "libavutil/mathematics.h" +#include "libavutil/mastering_display_metadata.h" #include "libavcodec/codec_desc.h" #include "libavcodec/mpeg4audio.h" #include "avio.h" @@ -124,6 +125,7 @@ typedef struct FLVContext { int flags; int64_t last_ts[FLV_STREAM_TYPE_NB]; + int write_metadata_pkt; } FLVContext; static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) @@ -478,6 +480,145 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) avio_wb32(pb, flv->metadata_totalsize + 11); } +static void flv_write_metadata_packet(AVFormatContext *s, AVCodecParameters *par, unsigned int ts) +{ + AVIOContext *pb = s->pb; + FLVContext *flv = s->priv_data; + AVContentLightMetadata *lightMetadata = NULL; + AVMasteringDisplayMetadata *displayMetadata = NULL; + const int flags_size = 5; + int64_t metadata_size_pos = 0; + int64_t total_size = 0; + const AVPacketSideData *side_data = NULL; + + if (par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_AV1 || + par->codec_id == AV_CODEC_ID_VP9) { + if (flv->write_metadata_pkt) return; + + side_data = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL); + if (side_data) + lightMetadata = (AVContentLightMetadata *)side_data->data; + + side_data = av_packet_side_data_get(par->coded_side_data, par->nb_coded_side_data, + AV_PKT_DATA_MASTERING_DISPLAY_METADATA); + if (side_data) + displayMetadata = (AVMasteringDisplayMetadata *)side_data->data; + + /* + * Reference Enhancing FLV + * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp.pdf + * */ + avio_w8(pb, FLV_TAG_TYPE_VIDEO); //write video tag type + metadata_size_pos = avio_tell(pb); + avio_wb24(pb, 0 + flags_size); + put_timestamp(pb, ts); //ts = pkt->dts, gen + avio_wb24(pb, flv->reserved); + + if (par->codec_id == AV_CODEC_ID_HEVC) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeMetadata| FLV_FRAME_VIDEO_INFO_CMD); // ExVideoTagHeader mode with PacketTypeMetadata + avio_write(pb, "hvc1", 4); + } else if (par->codec_id == AV_CODEC_ID_AV1 || par->codec_id == AV_CODEC_ID_VP9) { + avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeMetadata| FLV_FRAME_VIDEO_INFO_CMD); + avio_write(pb, par->codec_id == AV_CODEC_ID_AV1 ? "av01" : "vp09", 4); + } + + avio_w8(pb, AMF_DATA_TYPE_STRING); + put_amf_string(pb, "colorInfo"); + + avio_w8(pb, AMF_DATA_TYPE_OBJECT); + + put_amf_string(pb, "colorConfig"); // colorConfig + + avio_w8(pb, AMF_DATA_TYPE_OBJECT); + + if (par->color_trc != AVCOL_TRC_UNSPECIFIED && + par->color_trc < AVCOL_TRC_NB) { + put_amf_string(pb, "transferCharacteristics"); // color_trc + put_amf_double(pb, par->color_trc); + } + + if (par->color_space != AVCOL_SPC_UNSPECIFIED && + par->color_space < AVCOL_SPC_NB) { + put_amf_string(pb, "matrixCoefficients"); // colorspace + put_amf_double(pb, par->color_space); + } + + if (par->color_primaries != AVCOL_PRI_UNSPECIFIED && + par->color_primaries < AVCOL_PRI_NB) { + put_amf_string(pb, "colorPrimaries"); // color_primaries + put_amf_double(pb, par->color_primaries); + } + + put_amf_string(pb, ""); + avio_w8(pb, AMF_END_OF_OBJECT); + + if (lightMetadata) { + put_amf_string(pb, "hdrCll"); + avio_w8(pb, AMF_DATA_TYPE_OBJECT); + + put_amf_string(pb, "maxFall"); + put_amf_double(pb, lightMetadata->MaxFALL); + + put_amf_string(pb, "maxCLL"); + put_amf_double(pb, lightMetadata->MaxCLL); + + put_amf_string(pb, ""); + avio_w8(pb, AMF_END_OF_OBJECT); + } + + if (displayMetadata && (displayMetadata->has_primaries || displayMetadata->has_luminance)) { + put_amf_string(pb, "hdrMdcv"); + avio_w8(pb, AMF_DATA_TYPE_OBJECT); + if (displayMetadata->has_primaries) { + put_amf_string(pb, "redX"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[0][0])); + + put_amf_string(pb, "redY"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[0][1])); + + put_amf_string(pb, "greenX"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[1][0])); + + put_amf_string(pb, "greenY"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[1][1])); + + put_amf_string(pb, "blueX"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[2][0])); + + put_amf_string(pb, "blueY"); + put_amf_double(pb, av_q2d(displayMetadata->display_primaries[2][1])); + + put_amf_string(pb, "whitePointX"); + put_amf_double(pb, av_q2d(displayMetadata->white_point[0])); + + put_amf_string(pb, "whitePointY"); + put_amf_double(pb, av_q2d(displayMetadata->white_point[1])); + } + if (displayMetadata->has_luminance) { + put_amf_string(pb, "maxLuminance"); + put_amf_double(pb, av_q2d(displayMetadata->max_luminance)); + + put_amf_string(pb, "minLuminance"); + put_amf_double(pb, av_q2d(displayMetadata->min_luminance)); + } + put_amf_string(pb, ""); + avio_w8(pb, AMF_END_OF_OBJECT); + } + put_amf_string(pb, ""); + avio_w8(pb, AMF_END_OF_OBJECT); + + total_size = avio_tell(pb) - metadata_size_pos - 10; + avio_seek(pb, metadata_size_pos, SEEK_SET); + avio_wb24(pb, total_size); + avio_tell(pb); + avio_skip(pb, total_size + 10 - 3); + avio_tell(pb); + avio_wb32(pb, total_size + 11); // previous tag size + flv->write_metadata_pkt = 1; + } +} + static int unsupported_codec(AVFormatContext *s, const char* type, int codec_id) { @@ -878,6 +1019,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) memcpy(par->extradata, side, side_size); flv_write_codec_header(s, par, pkt->dts); } + flv_write_metadata_packet(s, par, pkt->dts); } if (flv->delay == AV_NOPTS_VALUE)