From patchwork Tue May 21 09:02:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 49085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp5097551pzb; Tue, 21 May 2024 02:05:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWYpnWeXBlwd5kc93UkryKsAf0Pw5XE4P6eltLWfYoMOq6MfZI/3wk5Y9WjExBhJSsfG2A5mwIgQ0yTRP0Hic35hoIWqyqRb3oMg== X-Google-Smtp-Source: AGHT+IGxAGA8Gg440s3O34+ew9z/jG7xRgEpzrW6TQlSbnRM10SGyplkwP31LwlwbF5zyfEFKb0h X-Received: by 2002:a50:a40c:0:b0:56d:c928:ad76 with SMTP id 4fb4d7f45d1cf-5734d67e8d0mr21019727a12.26.1716282341971; Tue, 21 May 2024 02:05:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716282341; cv=none; d=google.com; s=arc-20160816; b=PC3nG84uz1z86rJA1FgQhiSydZhH61dkcJJN9+6Klh0xTTlS/BSl8uLeq8oynsLM37 hg/fYYHYCMTYxqCryw1/i6nsCm1cPhZF91z60oOI+tm5RmcSJklkO+MO2htZHYw0tlqn icupTh3hdTy48XFV9ThPzjR9d9tBBjRCaNMkjIZz0oHQQDVo7KGSV/YDrCA0fu9G/0Rn JBvbcUbfcmfvwPRq/Btv2LvTjAe7Sr4FxP9tAciMhnuKDP71o2ln/bT+ieb1H/5liJ9S 8BPdMqPZ5h9W+cj41CJtipN1z95Vab6lRAx4kkJpLueP+HD2ERd4cEEb4//R1UJQsQ21 YCcg== 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=1KHRd8u8QQZhg6bLQnQnsM9mzlac56If9TRfTqhU7pk=; fh=LnlYe9qYwgML7nWWXqAumr7YCmPjjpEPjQf6GasgJC0=; b=ubMA0sR69g46UfV8UHWNGf2PtDmjbyEQzxrGIxw7OXXMi5+Ak0H6p3PBVsyx1ge23v /P7s98piBRNLtpq9wDf8Mtah9iTxRPBxLJD8LX9kxp7nwb8aU7C8Wh8WowwlRQdsBjJB kICjRuaZRoR+go3B+20uhFhr2LdYjXpDbs1bp16INkqZHzXhc9h8pxK7fJ8FpLoWtyYU rRBMIhpN14YtrbcRtysk3FcuAg2dKwONri6sHYNlOe6QQOkbUCzxbfiuqOIVwbtjyLKY F092AJfaKnAA3P4KZPrmGHk1P6Wk5NT3LEvEw70FsslOy5m60GnlYUzR4OT/LvzfBD1v KSIg==; 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=QV1NkIuw; 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-5733c3787c5si13518597a12.656.2024.05.21.02.05.41; Tue, 21 May 2024 02:05:41 -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=QV1NkIuw; 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 EE41C68D415; Tue, 21 May 2024 12:03:56 +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 4017968D37F for ; Tue, 21 May 2024 12:03:43 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id A334427FFD7D2; 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=1MAb2I2Ks68z+wPkLaZvy4LLtmERKeBhHCzRfj7ZM0c=; b=QV1NkIuwDVboRf5dBn5IWkhlTKfCOw5OoO6QTsfuyFVcQRsW6Zlis5w46Oh1kyuLmDIhsY hxhUp3hH5LRsapnQNJus0XJ32/5jAT/gsk+dYdQhSXGoTtNVAEdBF49CI+rxwUkIT5bAK6 2MkqCAixCS3sIwNcZTjQii/accyFj0o/IgvcZbEgOuOkn0eMx6LeFYnBCLh2AuArVYGbmg 4K0hmoHfh7UmAJw2X4GT5Hj+/U5WIdGRHfxrR1kaJ5WZDYOYN7H93dsWWpa+XWu4zNJRUI FvDkr8Qsjs37zxkGOjDkRIUkxNAk1h/0VYS/gtVsVeMJHzBzvUYNnrP2GGsS3w== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2024 11:02:16 +0200 Message-ID: <20240521090316.782-8-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 07/13] avformat/flvenc: write enhanced rtmp multichannel info for audio with more than two channels 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: ifMTWmpz4W6Z --- libavformat/flvenc.c | 93 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 8 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 94d633fbca..056940afc5 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -711,10 +711,82 @@ static void flv_write_aac_header(AVFormatContext* s, AVCodecParameters* par) avio_write(pb, par->extradata, par->extradata_size); } +static void flv_write_multichannel_body(AVFormatContext* s, AVCodecParameters* par) +{ + AVIOContext *pb = s->pb; + + switch (par->ch_layout.order) { + case AV_CHANNEL_ORDER_NATIVE: + avio_w8(pb, AudioChannelOrderNative); + break; + case AV_CHANNEL_ORDER_CUSTOM: + avio_w8(pb, AudioChannelOrderCustom); + break; + default: + avio_w8(pb, AudioChannelOrderUnspecified); + break; + } + + avio_w8(pb, par->ch_layout.nb_channels); + + if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) { + // The first 18 entries are identical between FFmpeg and flv + uint32_t mask = par->ch_layout.u.mask & 0x03FFFF; + // The remaining 6 flv entries are in the right order, but start at AV_CHAN_LOW_FREQUENCY_2 + mask |= (par->ch_layout.u.mask >> (AV_CHAN_LOW_FREQUENCY_2 - 18)) & 0xFC0000; + + avio_wb32(pb, mask); + } else if (par->ch_layout.order == AV_CHANNEL_ORDER_CUSTOM) { + for (int i = 0; i < par->ch_layout.nb_channels; i++) { + enum AVChannel id = par->ch_layout.u.map[i].id; + if (id >= AV_CHAN_FRONT_LEFT && id <= AV_CHAN_TOP_BACK_RIGHT) { + avio_w8(pb, id - AV_CHAN_FRONT_LEFT + 0); + } else if (id >= AV_CHAN_LOW_FREQUENCY_2 && id <= AV_CHAN_BOTTOM_FRONT_RIGHT) { + avio_w8(pb, id - AV_CHAN_LOW_FREQUENCY_2 + 18); + } else if (id == AV_CHAN_UNUSED) { + avio_w8(pb, 0xFE); + } else { + avio_w8(pb, 0xFF); // unknown + } + } + } +} + +static int flv_get_multichannel_body_size(AVCodecParameters* par) +{ + int res = 2; + + if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) + res += 4; + else if (par->ch_layout.order == AV_CHANNEL_ORDER_CUSTOM) + res += par->ch_layout.nb_channels; + + return res; +} + +static void flv_write_multichannel_header(AVFormatContext* s, AVCodecParameters* par, int64_t ts) +{ + AVIOContext *pb = s->pb; + int data_size = flv_get_multichannel_body_size(par); + + avio_w8(pb, FLV_TAG_TYPE_AUDIO); + avio_wb24(pb, data_size + 5); // size + put_timestamp(pb, ts); + avio_wb24(pb, 0); // streamid + + avio_w8(pb, FLV_CODECID_EX_HEADER | AudioPacketTypeMultichannelConfig); + write_codec_fourcc(pb, par->codec_id); + + flv_write_multichannel_body(s, par); + + avio_wb32(pb, data_size + 5 + 11); // previous tag size +} + static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, int64_t ts, int stream_index) { int64_t data_size; AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; + int extended_flv = 0; if (par->codec_id == AV_CODEC_ID_AAC || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_MPEG4 || par->codec_id == AV_CODEC_ID_HEVC @@ -730,10 +802,10 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i avio_wb24(pb, 0); // streamid pos = avio_tell(pb); if (par->codec_type == AVMEDIA_TYPE_AUDIO) { - int extended_flv = par->codec_id == AV_CODEC_ID_OPUS - || par->codec_id == AV_CODEC_ID_FLAC - || par->codec_id == AV_CODEC_ID_AC3 - || par->codec_id == AV_CODEC_ID_EAC3; + extended_flv = par->codec_id == AV_CODEC_ID_OPUS + || par->codec_id == AV_CODEC_ID_FLAC + || par->codec_id == AV_CODEC_ID_AC3 + || par->codec_id == AV_CODEC_ID_EAC3; if (extended_flv) { avio_w8(pb, FLV_CODECID_EX_HEADER | AudioPacketTypeSequenceStart); @@ -754,10 +826,10 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i } else { int track_idx = flv->video_track_idx_map[stream_index]; // If video stream has track_idx > 0 we need to send H.264 as extended video packet - int extended_flv = (par->codec_id == AV_CODEC_ID_H264 && track_idx) - || par->codec_id == AV_CODEC_ID_HEVC - || par->codec_id == AV_CODEC_ID_AV1 - || par->codec_id == AV_CODEC_ID_VP9; + extended_flv = (par->codec_id == AV_CODEC_ID_H264 && track_idx) + || par->codec_id == AV_CODEC_ID_HEVC + || par->codec_id == AV_CODEC_ID_AV1 + || par->codec_id == AV_CODEC_ID_VP9; if (extended_flv) { if (track_idx) { @@ -792,6 +864,11 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i avio_skip(pb, data_size + 10 - 3); avio_wb32(pb, data_size + 11); // previous tag size } + + if (par->codec_type == AVMEDIA_TYPE_AUDIO && (extended_flv || + (av_channel_layout_compare(&par->ch_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO) == 1 && + av_channel_layout_compare(&par->ch_layout, &(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO) == 1))) + flv_write_multichannel_header(s, par, ts); } static int flv_append_keyframe_info(AVFormatContext *s, FLVContext *flv, double ts, int64_t pos)