From patchwork Sat Feb 11 11:02:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 40369 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp2054289pzk; Sat, 11 Feb 2023 03:03:35 -0800 (PST) X-Google-Smtp-Source: AK7set/B0hY0quzVtXFQ6U9WFX1817p51wdlxFbu0YW8Pwkp04pl3usot0B7OMUF6IoiU3616aQu X-Received: by 2002:a17:906:9f24:b0:8b0:ad1a:d021 with SMTP id fy36-20020a1709069f2400b008b0ad1ad021mr724241ejc.39.1676113415316; Sat, 11 Feb 2023 03:03:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676113415; cv=none; d=google.com; s=arc-20160816; b=ndaErgPMEnDDlzJsseKudFfeya/WNO98AeEYIF0gDgT5khqsyQ9Pl8VJcNakanB6ee JjMOPRzCPywCuNCuKupflVs8rMc7cQbSC/jnrApUJrHFAmxcoNGT5ie1pl4/8ClEHg+C emC7IgKzEofjb5QDyyBHCpqVb0xjpMXhENcVV7CSq1PB92QnevFyfNn3Ywn+kWhJ6GU9 rFPoXjLuk6xY+wKkPDvDNSQkAhBPx1GZFqHUQgdPcHZeDDzq/zdDY/qStObz52hMNMES QzM+28Z5DTNeGcIKNYtn0cDOpRMz14d7NwAjIwioIFyyeD0O6M2KqOBiDNMgr0Ex761Z vBEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=dMuCIssYoCFnB+F9CnYkAlooUSw5lwrM70v1MYS5I+o=; b=XulXNL+KLINQQPe2M+k7kcueV3nzjRtfs/sdaW/7eAWDceWk7079w/PBm3+w/G2bLh oILO7NZ1Bl9Ki30mGbIfC9KK3ywre8KrE7kYsdnksm1zH0N3keL7pLAmfLw57Vn5eaxM 1fCDgrGfqyNAs5HUCH2CsUT6roX0MplDpCJkIcNp1yVQwXRpd+PHMhgBYX0lrDq10RBO UhazckUDP/pLHPErHcd5647HdAeYsrfYnNuVSTisFD9dOSM/TI+8pRSU+sZ2R9EpR7s1 ToLyGqzQO3Xen/DEkJVbAfyOTb69agTvbKlWZ+EdQHwGpJNiNNtQlYlKlzK5BPDs91Bp tWpQ== 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 21-20020a170906009500b00888fddc4eacsi11508300ejc.668.2023.02.11.03.03.34; Sat, 11 Feb 2023 03:03:35 -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 0E4BA68BDC0; Sat, 11 Feb 2023 13:03:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0254968BD43 for ; Sat, 11 Feb 2023 13:03:24 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4PDSQ12XjXz9sbD for ; Sat, 11 Feb 2023 12:03:21 +0100 (CET) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Feb 2023 16:32:51 +0530 Message-Id: <20230211110251.6726-1-ffmpeg@gyani.pro> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDSQ12XjXz9sbD Subject: [FFmpeg-devel] [PATCH] avformat/flvenc: allow to write qualifying metadata as number 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fhe6wzQX3dou The FLV format can store metadata as numbers which are used and handled by many streaming platforms. Now, metadata values can be sent as AMF Number type if 1) tag key starts with "num_" 2) value is scanned and can be represented as a double. Written tag will have "num_" prefix removed if written as AMF Number. --- doc/muxers.texi | 2 ++ libavformat/flvenc.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index ed5341be39..c9bafeec19 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -509,6 +509,8 @@ ffmpeg -re -i ... -c:v libx264 -c:a aac -f fifo -fifo_format flv -map 0:v -map 0 @section flv Adobe Flash Video Format muxer. +This muxer will store user metadata whose keys start with @code{num_} and whose value is identified as a +pure value of type double as an AMF Number. All other user metadata is stored as a String. This muxer accepts the following options: diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 81d9b6100d..25d09ef304 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -23,6 +23,7 @@ #include "libavutil/dict.h" #include "libavutil/intfloat.h" #include "libavutil/avassert.h" +#include "libavutil/eval.h" #include "libavutil/mathematics.h" #include "libavcodec/codec_desc.h" #include "libavcodec/mpeg4audio.h" @@ -275,8 +276,10 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; int write_duration_filesize = !(flv->flags & FLV_NO_DURATION_FILESIZE); - int metadata_count = 0; + int metadata_count = 0, is_num; int64_t metadata_count_pos; + double numvalue; + char *key, *tail; const AVDictionaryEntry *tag = NULL; /* write meta_tag */ @@ -378,10 +381,30 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) av_log(s, AV_LOG_DEBUG, "Ignoring metadata for %s\n", tag->key); continue; } - put_amf_string(pb, tag->key); - avio_w8(pb, AMF_DATA_TYPE_STRING); - put_amf_string(pb, tag->value); - metadata_count++; + + is_num = !strncmp(tag->key, "num_", 4) && *(tag->key + 4); + key = is_num ? (tag->key + 4) : tag->key; + + if (is_num) { + numvalue = av_strtod(tag->value, &tail); + if (*tail || numvalue == HUGE_VAL) { + av_log(s, AV_LOG_ERROR, "Value %s for key %s cannot be stored as a double-typed number. Will be written as a string\n", tag->value, key); + key = tag->key; + is_num = 0; + } + } + + av_log(s, AV_LOG_DEBUG, "Writing tag %s with value %s count: %d\n", key, tag->value, metadata_count); + + put_amf_string(pb, key); + if (is_num) { + put_amf_double(pb, numvalue); + } else { + avio_w8(pb, AMF_DATA_TYPE_STRING); + put_amf_string(pb, tag->value); + } + + metadata_count++; } if (write_duration_filesize) {