From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 42B5F4AD94 for ; Tue, 21 May 2024 09:05:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4AF2868D40C; Tue, 21 May 2024 12:03:55 +0300 (EEST) Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D14DC68D37F for ; Tue, 21 May 2024 12:03:42 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 705B227FFD7D1; Tue, 21 May 2024 11:03:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1716282218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aUfbhxM6AUy77FCGK4lkFlb3PoLjOwJGGbfenUx2heg=; b=onGA3KZHLN7NlZ/Devp6BUVtCDA9VsOA++Bry/CmfWdXrP63XYQIyfkNGmARyL7DA90Zn0 19pOfM6D+GTTpCKjRYqUTvzIHPo7p0ekDy2ozyamqVgOiMhhHC9G/xme1dVqV/WG9K4uDy dG/cYUm9DNWeV9VayqYDk38t78WpCpmdnf89WvUjleVHh8LljQu89RgeazGNEwnYUcaJKO FeZk08e+AOjJ6KkRucyHi+cGUWNO8sf27ZGdYj8By8nytFvOeChdisWWhF0ID3sx0IvQ5T SizRJO4+RZx2sGBzSxV3VDrQY26Zonhsg7/A0/N7Xce6C3PH6OFnUEEG3zMVbQ== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2024 11:02:15 +0200 Message-ID: <20240521090316.782-7-timo@rothenpieler.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240521090316.782-1-timo@rothenpieler.org> References: <20240521090316.782-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/13] avformat/flvenc: refactor fourcc writing 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: Timo Rothenpieler Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/flvenc.c | 96 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 49 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 13e06aedbb..94d633fbca 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -492,6 +492,45 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) avio_wb32(pb, flv->metadata_totalsize + 11); } +static void write_codec_fourcc(AVIOContext *pb, enum AVCodecID codec_id) +{ + switch (codec_id) { + case AV_CODEC_ID_AAC: + avio_write(pb, "mp4a", 4); + return; + case AV_CODEC_ID_OPUS: + avio_write(pb, "Opus", 4); + return; + case AV_CODEC_ID_FLAC: + avio_write(pb, "fLaC", 4); + return; + case AV_CODEC_ID_MP3: + avio_write(pb, ".mp3", 4); + return; + case AV_CODEC_ID_AC3: + avio_write(pb, "ac-3", 4); + return; + case AV_CODEC_ID_EAC3: + avio_write(pb, "ec-3", 4); + return; + case AV_CODEC_ID_H264: + avio_write(pb, "avc1", 4); + return; + case AV_CODEC_ID_HEVC: + avio_write(pb, "hvc1", 4); + return; + case AV_CODEC_ID_AV1: + avio_write(pb, "av01", 4); + return; + case AV_CODEC_ID_VP9: + avio_write(pb, "vp09", 4); + return; + default: + av_log(NULL, AV_LOG_ERROR, "Invalid codec FourCC write requested.\n"); + av_assert0(0); + } +} + static void flv_write_metadata_packet(AVFormatContext *s, AVCodecParameters *par, unsigned int ts, int stream_idx) { AVIOContext *pb = s->pb; @@ -528,13 +567,8 @@ static void flv_write_metadata_packet(AVFormatContext *s, AVCodecParameters *par 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, FLV_IS_EX_HEADER | PacketTypeMetadata | FLV_FRAME_VIDEO_INFO_CMD); // ExVideoTagHeader mode with PacketTypeMetadata + write_codec_fourcc(pb, par->codec_id); avio_w8(pb, AMF_DATA_TYPE_STRING); put_amf_string(pb, "colorInfo"); @@ -703,24 +737,14 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i if (extended_flv) { avio_w8(pb, FLV_CODECID_EX_HEADER | AudioPacketTypeSequenceStart); + write_codec_fourcc(pb, par->codec_id); if (par->codec_id == AV_CODEC_ID_AAC) { - avio_write(pb, "mp4a", 4); flv_write_aac_header(s, par); - } else if (par->codec_id == AV_CODEC_ID_OPUS) { - avio_write(pb, "Opus", 4); + } else if (par->codec_id == AV_CODEC_ID_OPUS || par->codec_id == AV_CODEC_ID_FLAC) { av_assert0(par->extradata_size); avio_write(pb, par->extradata, par->extradata_size); - } else if (par->codec_id == AV_CODEC_ID_FLAC) { - avio_write(pb, "fLaC", 4); - av_assert0(par->extradata_size); - avio_write(pb, par->extradata, par->extradata_size); - } else if (par->codec_id == AV_CODEC_ID_MP3) - avio_write(pb, ".mp3", 4); - else if (par->codec_id == AV_CODEC_ID_AC3) - avio_write(pb, "ac-3", 4); - else if (par->codec_id == AV_CODEC_ID_EAC3) - avio_write(pb, "ec-3", 4); + } } else if (par->codec_id == AV_CODEC_ID_AAC) { avio_w8(pb, get_audio_flags(s, par)); avio_w8(pb, 0); // AAC sequence header @@ -743,14 +767,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i avio_w8(pb, FLV_IS_EX_HEADER | PacketTypeSequenceStart | FLV_FRAME_KEY); } - if (par->codec_id == AV_CODEC_ID_H264) - avio_write(pb, "avc1", 4); - else if (par->codec_id == AV_CODEC_ID_HEVC) - avio_write(pb, "hvc1", 4); - else if (par->codec_id == AV_CODEC_ID_AV1) - avio_write(pb, "av01", 4); - else if (par->codec_id == AV_CODEC_ID_VP9) - avio_write(pb, "vp09", 4); + write_codec_fourcc(pb, par->codec_id); if (track_idx) avio_w8(pb, track_idx); @@ -1240,14 +1257,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_w8(pb, FLV_IS_EX_HEADER | pkttype | frametype); } - if (par->codec_id == AV_CODEC_ID_H264) - avio_write(pb, "avc1", 4); - else if (par->codec_id == AV_CODEC_ID_HEVC) - avio_write(pb, "hvc1", 4); - else if (par->codec_id == AV_CODEC_ID_AV1) - avio_write(pb, "av01", 4); - else if (par->codec_id == AV_CODEC_ID_VP9) - avio_write(pb, "vp09", 4); + write_codec_fourcc(pb, par->codec_id); if (track_idx) avio_w8(pb, track_idx); @@ -1255,19 +1265,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wb24(pb, pkt->pts - pkt->dts); } else if (extended_audio) { avio_w8(pb, FLV_CODECID_EX_HEADER | AudioPacketTypeCodedFrames); - - if (par->codec_id == AV_CODEC_ID_AAC) - avio_write(pb, "mp4a", 4); - else if (par->codec_id == AV_CODEC_ID_OPUS) - avio_write(pb, "Opus", 4); - else if (par->codec_id == AV_CODEC_ID_FLAC) - avio_write(pb, "fLaC", 4); - else if (par->codec_id == AV_CODEC_ID_MP3) - avio_write(pb, ".mp3", 4); - else if (par->codec_id == AV_CODEC_ID_AC3) - avio_write(pb, "ac-3", 4); - else if (par->codec_id == AV_CODEC_ID_EAC3) - avio_write(pb, "ec-3", 4); + write_codec_fourcc(pb, par->codec_id); } else { av_assert1(flags>=0); avio_w8(pb, flags); -- 2.43.2 _______________________________________________ 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".