From patchwork Thu Jan 11 16:37:00 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: 45570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf2f:b0:199:de12:6fa6 with SMTP id gc47csp1811582pzb; Thu, 11 Jan 2024 08:37:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0mCk8/bW/T54nl4pTQoZpX+NMfWb0vJIlPB57VDtqgyPxIOJWAaCpdNNJff8YctREyqUp X-Received: by 2002:a17:906:578f:b0:a27:4bbe:5ddc with SMTP id k15-20020a170906578f00b00a274bbe5ddcmr700353ejq.19.1704991038702; Thu, 11 Jan 2024 08:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704991038; cv=none; d=google.com; s=arc-20160816; b=dGiK5XAKyhKkhow+rVP7qtgQj6YAzMb8v4WzMyVh4nfjN08qfwmXwxy8Yoz6luMsF2 mCQX06/As46+yqtpNDxwZZt5fM4/0p8FzMVWitSbQSBFsIF1dtIxeJueV4q5YeH7IaHK EuitiJxr1/ur6eI3rEEA/1q6ZsnYnbWPQgbhfDLO9x31YefjGeg2LpaaZBzBM9XHB8Ap w3jgzH3pQRf5huDDfMOi5v7CtLSsiFafx5NlQotk5f0Z48LRs8k+mqowtwaMykuccB8e RSM0Wik17Ld89fHWPwwJ5JLkM7dCtdnjviIlg2qUBDb/lPQSPd8wswzWJvsWXNxFhTRa AyzA== 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=/yd/Mqz1Py4iAOA+CEKezkT+eUKR9FwjbOacq1OWdXQ=; fh=frUT2hx60kzuIVmkNUv7bM3Y/kw3lxlKoLH+4fdDqZk=; b=jJkIwm2rNsscRZ+l45NWNm0586I1BEAzoxePNZLieTOQDYf7JwT+E0V+BIjsjEYl6d W/tmljBLeQjx1BKLLsW50532drp5TGTG8bMp3zghxNzgJo4nmjtXzRga82i9tN6Wlpix op0aPvG7U8LhrW52K568AZ4CEzKkd6ZNV+tQut7c9Mw0I73057tVc+RtcTOp4MKsQ6OB wKNBKXFvwNWQPU1iGUdQcL4pv7HUgNrhGFzcdYagydwUU14GkXb8u137wjERjZo7HUS8 Fw79Bluv0bpI4mUB01AYN3S6u2fA/Q5ib/hiVhHWsd5iD+OYrwPYpwYGhFnW+c6rSnJz Ednw== 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 cf20-20020a170906b2d400b00a27f49d40b6si661755ejb.104.2024.01.11.08.37.17; Thu, 11 Jan 2024 08:37:18 -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 6162E68D060; Thu, 11 Jan 2024 18:37:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-73.mail.qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B07768CFA3 for ; Thu, 11 Jan 2024 18:37:07 +0200 (EET) Received: from localhost.localdomain ([103.102.203.208]) by newxmesmtplogicsvrsza1-0.qq.com (NewEsmtp) with SMTP id 9423BCDF; Fri, 12 Jan 2024 00:37:02 +0800 X-QQ-mid: xmsmtpt1704991022toirghum3 Message-ID: X-QQ-XMAILINFO: NJ/+omVLhVgaKexESHpbmC9ohzZci/T3aY5KmVY2aIGiDefHF+AGgHAX4top49 nX9FGUTSUi/DpupyQHWBYv1zeXpsdYsu8gbS8x2JciZxAHuS4lv1pzttU/Q8YAm3QTcgVmn+3XfI Hm6wvQWDZn8gYX9qQkRNXnw+LUHoDaCvDKgKeMc7mRhUKbWzxrMED5TZuJbAgXsHNeB4eCfzZ2Ry dUXzaYY2O2K+WQRXr6nYhwIqraFCBfHjgXfi2ZVDyQt/8Gt5GBUltqjNKip9bl5qqGhsQ1iVhkUt T25KT3RGW6vJbjQG5NIwNhL/ERlIv8dyXK2Y1eN+c82CVrD+B5PGjMiW2R0e7hHpyXl7GYlNl5o/ +8jUqZBQobOjNMwd3vtY84Rxa6LebbOeJ4eLSV7R5dD91Ye0dMVSyfurunF3iUEwd0We52KI/wiz dde6toVgCDWjoZrIcf0PihqFYXXaNmDLZ7suWHmLKdUTJFHnDOCRdi7X+wjeyeeoy9O82FLElRba C6xMUVHxv/x01HMrueRFcLnB2NBLMUndPhZF2IIJu0V120sorGp6H1XeX5GBdaH6S5UP3Qeio2gZ LKuosME9zn6iny2MGM97EPAMspIH+sTPyo9HIqdi8tlhCq7j5EDZBkIjPegCaltSscQ5gcc16PxS rxir60lM5tsONqYEMuuNwG/Qx+x7Blw44uT6Al741BbsMizaXI99TnnEb2wm7xw/zwoRHUDaxOqU P8KQAKE1PAIGcfOCk2TdZm7c/jxo/7qv335lyZwwAG4dtym1U9LFgTQbIRzep/Tlsdi/NrKbSbXj gLhUuDYZX/LG7FU4Ro6zgwpFLZFJz6WWaDWawyKDZafYRfdMynRq3Wsn5n7mPrAMILjoO/tNn953 mtUGvtx0Qx8UcRnOWSzXFWgs5YX8TLcBVVxVzkEaHVGyqydYM4RL4jUweTdk7XFb3ES7kuNI3Zbc bNONnJkk+4yLUZz/8+c14ArTfIxJ7pDDF2wdnjWZLEQmtMF5i9kplzfxsRXpcZufypB2ISNO+e47 Js8cfJWw== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Jan 2024 00:37:00 +0800 X-OQ-MSGID: <20240111163700.24483-1-411294962@qq.com> X-Mailer: git-send-email 2.42.1 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 v3 2/2] 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: 9Bk6o36C2gGS From: Zhu Pengfei <411294962@qq.com> Signed-off-by: Zhu Pengfei <411294962@qq.com> --- libavformat/flvenc.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index f6d10f331c..4485aba03c 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,136 @@ 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); + + put_amf_string(pb, "transferCharacteristics"); // color_trc + put_amf_double(pb, par->color_trc); + + put_amf_string(pb, "matrixCoefficients"); // colorspace + put_amf_double(pb, par->color_space); + + 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 +1010,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)