From patchwork Tue May 21 09:02:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 49094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp5097496pzb; Tue, 21 May 2024 02:05:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW7NN/RVONvtg3ut5m+YAzSh5/9q0roDzHzw3TBjyB3UVJi2NurxdV0gycMrrbGCL2BpgsWimOXjspstAM3a8uvsbwWJb4pW+tw4Q== X-Google-Smtp-Source: AGHT+IGgyBP0r8QiYOt0B1yNMwHHx0gmW60N3G/ItEcP0cMo81Nt/kIFrIzyOFv1r23uJBx95PSl X-Received: by 2002:a05:6402:b89:b0:56f:e715:d1c7 with SMTP id 4fb4d7f45d1cf-5734d59d8b3mr19926496a12.1.1716282335901; Tue, 21 May 2024 02:05:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716282335; cv=none; d=google.com; s=arc-20160816; b=KlD9wgpyGgKgUxwR8R4p9i6I636I2PqXAMyG9+RFdZzdQcjBwwp79lcFRIPBqxb0WX ebHV6FsPGUG4HrT4Xw6+36uabqSEiyDw5yoKmF9ejJ+Jj2kY3+LNTSELwhsbRFSpnzX2 wBOFdZORkZHhet4cni2ts74ywcOplsvh9FQ+ZGyLqZ8IP3tQGUGm0jBc318mWtYqaSCs RsglCQfltIx8dHADM3Y4maVHxLRyAKPh8JgSDAqP7sdn0Fxvj7vF7NgptFKg0oqVNxkS z3qYMdTi9+L+57aKs8WCNbKsAwiZY5ZeAu6T1zS29XpUoT75TLy2Qfs28Vn1T7I6LuFn Ykgw== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=+PaBZ4wvlbuNjtR/Yjv2SSFeF319TybKKKinpaa1yAY=; fh=LnlYe9qYwgML7nWWXqAumr7YCmPjjpEPjQf6GasgJC0=; b=hxg69g0Vy+THZS5z1iO2ZLwCkMecnn7uKJZ4hgYjr8XKaxqBT3TXsJtE4GH5m8yE0z sK/DT2nJOas3qPb7sx80BK+xF2fuWzWDFNOkogdnf3La/g8CM6mGtaE41tnx2Y4yBtsw 1EvzH8HEgk9GNqW3eqpro1uwy/qXW/e5342gTM2oRSJMQY3Jn+SOSmtOuGXxlx+99CjW caGJ8mnzr9SFLP7OcDv97GH8jleaqJlQOTAcb9/axJ7qIbeeNVsC04T6uFFp9mBUJuIk K2CTQiglQw8jshrxFk0/Dhh+G8IoujKm1Xy1QprIIFrxOGtT+tCRgY3xJ4h/veQbQKY7 lbSw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=onGA3KZH; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-574ebc7960esi8359959a12.432.2024.05.21.02.05.29; Tue, 21 May 2024 02:05:35 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=onGA3KZH; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83F0A68D392; Tue, 21 May 2024 12:03:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7ucg6VgXD9As --- 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);