Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] avformat/flvenc: support enhanced flv PacketTypeMetadata
@ 2023-11-15 14:40 zhupengfei via ffmpeg-devel
  2023-12-04 21:16 ` James Almer
  0 siblings, 1 reply; 2+ messages in thread
From: zhupengfei via ffmpeg-devel @ 2023-11-15 14:40 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: 411294962

From: Zhu Pengfei <411294962@qq.com>

Signed-off-by: Zhu Pengfei <411294962@qq.com>
---
 libavformat/flvenc.c | 158 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index f6d10f331c..615a072928 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,161 @@ static void write_metadata(AVFormatContext *s, unsigned int ts)
     avio_wb32(pb, flv->metadata_totalsize + 11);
 }
 
+static void flv_write_metadata_packet_if_needed(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 (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;
+
+    if (!lightMetadata && !displayMetadata) {
+        return;
+    }
+
+    /*
+    * Reference Enhancing FLV
+    * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp.pdf
+    * */
+    avio_w8(pb, FLV_TAG_TYPE_VIDEO); //写入Video /Audio 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);
+    } else {
+        return;
+    }
+
+    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
+
+    /* mixed array (hash) with size and string/type/data tuples */
+    avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
+
+    avio_wb32(pb, 0); // write array count
+
+    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); // array end of object
+
+    if (lightMetadata) {
+        put_amf_string(pb, "hdrCll");
+
+        /* mixed array (hash) with size and string/type/data tuples */
+        avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
+
+        avio_wb32(pb, 0); // write array count
+
+        put_amf_string(pb, "maxFall");
+        put_amf_double(pb, lightMetadata->MaxFALL);
+
+        put_amf_string(pb, "maxCLL");
+        put_amf_double(pb, lightMetadata->MaxCLL);
+
+        // array end of object
+        put_amf_string(pb, "");
+        avio_w8(pb, AMF_END_OF_OBJECT);
+    }
+
+    if (displayMetadata && (displayMetadata->has_primaries || displayMetadata->has_luminance)) {
+        put_amf_string(pb, "hdrMdcv");
+
+        /* mixed array (hash) with size and string/type/data tuples */
+        avio_w8(pb, AMF_DATA_TYPE_MIXEDARRAY);
+        avio_wb32(pb, 0); // write array count
+
+        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);
+    }
+    avio_w8(pb, AMF_DATA_TYPE_OBJECT_END);
+
+    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 +1035,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_if_needed(s, par, pkt->dts);
     }
 
     if (flv->delay == AV_NOPTS_VALUE)
-- 
2.42.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-04 21:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-15 14:40 [FFmpeg-devel] [PATCH 1/2] avformat/flvenc: support enhanced flv PacketTypeMetadata zhupengfei via ffmpeg-devel
2023-12-04 21:16 ` James Almer

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git