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 5656E447B2 for ; Fri, 24 Feb 2023 18:30:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7389368C1A0; Fri, 24 Feb 2023 20:29:10 +0200 (EET) Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC1C68C174 for ; Fri, 24 Feb 2023 20:28:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677263336; bh=KoMjQyxsKfVbtwYntMGcVRF4F+pUL7SKnemLqd7aTUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S0yjrUV9qNms10vB9kKJ2Sq4d7GkhTj6HuX5NZ1vlpISABjiW6pvXpwLwfbWgz0mO V28DobWYmCnQIAnluShtdSikO1MtigrEwOguOKDsXAzNSgMBODXU/DqiYOlnPn7kwT VNV8oEFBb/B8zYm2uzkHqy8xIQpIAmuo6+FQHruo= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 7333FEEC; Sat, 25 Feb 2023 02:28:51 +0800 X-QQ-mid: xmsmtpt1677263335tq8sii9ad Message-ID: X-QQ-XMAILINFO: N26DAMVpW7UEElWISCEDwQP/7583RrLiwov/NwDaOxTGFupq0rfY62jNs4BcUj SHBgKsHX7oo0Rm0fmXN3bXKyF/SaYWyqWHsEs4s7FhnZz5gG9bEYSJT96fZK3uJ6dPEflX6xS8WY oETvAFUzdhtWCmk1jQ62wAXkP6p4d8hq/MIpkSKADqaskTiNoqkF3S8VnCakbJaPLFA0f9CqJYvP yzE19mMcCmxFNuTCJQwxz9R5FiuF01KNtAA5i68FTlgvNq/AFgZAsIVc/iumVgYlvn4qm4EuQGEY k1RAaSnBvUo/rBvFF1703rTMWMCV0nTDg4hqGHe/ZPKxW63W47jd/NoQBHWxuv98xXsL6Yxw7oXX 2GV5PhPcLu6/y9uGSmOXnSGY2/0DKdsz+JKrK8++mpDW2q77+IGnteT4L0ix/04u0oqCmz8nq7uH khyRsPCLW2es1bJjqY2P7cVjCXEhlVkXZNu1VbdZE+TaPMfBEawQmRoIDdOQ5VDsK12rGjvp8zPi w9/NV09GhbYUpJYXDx4IWAi+gROf/ZDQHxhdNbfdLY9Qwh/+iGMSI6iWq3pLQxq+QoD8/ig11aMJ ayLn9HdfzRn/E8ahqBS9uSyv4XUe947IpCZGQg0AFSiYb/jKpRQtahYdUrPX1+w6hILqX/477sj7 aYB+LrqwofUK2HmTe0A9aCe7w1JFXfhAe2+GvYYXnOXKX9OFlgufDHZw8XVazF7MzZCJOXPVqPLc oEc5PcbTX/Q+6siuRoGsOrPOPMestsKRCuALRNV5Owa9bTR/mYM3ZM/SIUT62BxanUKCZNo9PJ5r 1sBkg8mJFiZN1gyBD1hMU79L+WIg+QUK5CmDh9mCWGKBhLUO5hnVbc02TqMbXDHBI6fZoOEBwmh1 69046rYLCJpqgWjSV7OjPmmTGi2Td3TVZqUJ8tIMdp/Dy67Qn28r9siLfsrjRI+AnpsUW6Evn3PP Nle9RXJfMOzy9Aro2s2FYpNu8ybBy16oH88E2hpPPWCiLcSE0OUaKvLOHyvXQM From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 02:28:48 +0800 X-OQ-MSGID: <20230224182849.426345-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224182849.426345-1-quinkblack@foxmail.com> References: <20230224182849.426345-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/8] avformat/movenc: write ChannelLayout box for PCM 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: Zhao Zhili 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: From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavformat/movenc.c | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3315057b88..058d3cd6d1 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1199,6 +1199,47 @@ static int is_mp4_pcm_codec(enum AVCodecID codec) } } +static int mov_write_chnl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + int config = 0; + int ret; + uint8_t *speaker_pos = NULL; + const AVChannelLayout *layout = &track->par->ch_layout; + + ret = ff_mov_get_channel_config_from_layout(layout, &config); + if (ret || !config) { + config = 0; + speaker_pos = av_malloc(layout->nb_channels); + ret = ff_mov_get_channel_positions_from_layout(layout, + speaker_pos, layout->nb_channels); + if (ret) { + char buf[128] = {}; + + av_freep(&speaker_pos); + av_channel_layout_describe(layout, buf, sizeof(buf)); + av_log(s, AV_LOG_ERROR, "unsupported channel layout %s\n", buf); + return ret; + } + } + + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "chnl"); + avio_wb32(pb, 0); /* version & flags */ + + avio_w8(pb, 1); /* stream_structure */ + avio_w8(pb, config); + if (config) { + avio_wb64(pb, 0); + } else { + for (int i = 0; i < layout->nb_channels; i++) + avio_w8(pb, speaker_pos[i]); + av_freep(&speaker_pos); + } + + return update_size(pb, pos); +} + static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); @@ -1349,8 +1390,13 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex ret = mov_write_dmlp_tag(s, pb, track); else if (track->vos_len > 0) ret = mov_write_glbl_tag(pb, track); - else if (track->mode == MODE_MP4 && is_mp4_pcm_codec(track->par->codec_id)) + else if (track->mode == MODE_MP4 && is_mp4_pcm_codec(track->par->codec_id)) { + if (track->par->ch_layout.nb_channels > 1) + ret = mov_write_chnl_tag(s, pb, track); + if (ret < 0) + return ret; ret = mov_write_pcmc_tag(s, pb, track); + } if (ret < 0) return ret; -- 2.34.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".