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 941A945843 for ; Fri, 24 Feb 2023 04:26:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8D7768C10D; Fri, 24 Feb 2023 06:25:41 +0200 (EET) Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E27F68C0C7 for ; Fri, 24 Feb 2023 06:25:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677212728; bh=Hk7Bf6isJEecwnd9auxa37t9drtZsqq87j7hnonrVBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=swbw9eTSzsOX745Epflf5EIGsL0FvfxUiiwnhFR1EqU4IouACHKUpMLXVWoTd70dH 6nznOB/D2mKq+G1H3iJjxwhIBKI19ImTbb1mb4XZi1tGerIpyR3BOiVyEnyWaKu5Sn wJNscNJ0GIQb56Y5KvkBotqHVFv5wYth2ZdFV8t0= Received: from localhost.localdomain ([119.147.10.197]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6588BCBD; Fri, 24 Feb 2023 12:25:24 +0800 X-QQ-mid: xmsmtpt1677212728to0ewkfzw Message-ID: X-QQ-XMAILINFO: Mdc3TkmnJyI/FsHtzPj5lINfR8DgXhLFGVZ0UDVYDVZgRm9HuHzDNQJj+aICQR 042wlAchRjoI3MecQIjECPed/5oRULUyz4cxSXRIlEYZ/XgAdduKQ/qpL3Y83Jvh5i5DP2zyPFl5 zKds/8txbKzNILfxJpLLn7sLd82CAVvl6IB1WLOOGjByiV6eBOhg1AyVWpjDxjYscy7T8biR4BND LDrGG7Yp+BlPH3vZROXCwm5nFd94DnZA/RmE4qoHtiXASglR04QFUfYXNy7GCkkiz9A3xjALY7io JYsPsRcvIfDu6R/2vIlGmphj7iFOxIuoUCUE/UYpJ+10nH7c9cz9inHw/y3EJi4QjxL0XJ1r5iaI Oq8kHR9R386rgxs+4Ri/ovrma3iMWLa0P77DjiclTC3WQhhhxFTWKyWFzSlMNOE6U1rR6PGDxrdY S17FmvwIecXpq/xew3mGxy5GjACjUc9f19yfXbLPsPg0SLQxEyO6FnL+rtiJWYBYLWth2wQ5kPqw vTx3qr+kaNKf38C/Y+tR+tWprOrCVNBBX+BsLVpOhZZ7wtcFBMUWRGoAbft4t9CfsDWY5JkESRWF 6lZ3YTb9HcQjAmguB1nkgF/IErw59uoJFnCUuLTo/k6lvDExMyghBWn48JHQxuTuyY7TX6QKnvmM shOQGgPrUShc6jM/kY1YUBu8MPN3kl19kCTQDQH4+RIQttkRzhTwPhIW25RjJjtwXuLjd/iuDKzU 8n1q7i0yjHF8otI3X6f3FS65jzjGrTiatJZjS1PAYx/7bKRkzqWuui+zT5ZqTzl0lvi8UIhH9CQl Flm5HWKQlGgqf6XfkDVPMmzrnnJrCrS+nJbe4odqgUdLUPxfiSmY3VIufmNu+CfrwtNN9uGcjTg6 KohTHMsxIbfkYjER4rrgQHM35EX39ihg78ZzFUUYASMt7z2gQGGTdxKOZXuJsPi9cA3Qo3Ci3XQM xkYb2dhlgCr0w31BVD513f4iIiZkQ7AQsUxBP4QJ8oXmlUM1BtiHfb1gt/NPrf From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 20:25:22 +0800 X-OQ-MSGID: <20230224122523.143571-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224122523.143571-1-quinkblack@foxmail.com> References: <20230224122523.143571-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] 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 | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 99b93c1d5b..2b84ed1afa 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1203,6 +1203,43 @@ static int is_mp4_pcm_codec(enum AVCodecID codec) return 0; } +static int mov_write_chnl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + int layout = 0; + int ret; + uint8_t speaker_pos[64] = { }; + + ret = ff_mov_get_channel_config_from_layout(&track->par->ch_layout, &layout); + if (ret || !layout) { + layout = 0; + ret = ff_mov_get_channel_positions_from_layout(&track->par->ch_layout, + speaker_pos, FF_ARRAY_ELEMS(speaker_pos)); + if (ret) { + char buf[128] = {}; + + av_channel_layout_describe(&track->par->ch_layout, buf, sizeof(buf)); + av_log(s, AV_LOG_WARNING, "unsupported channel layout %s, skip 'chnl'\n", buf); + return 0; + } + } + + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "chnl"); + avio_wb32(pb, 0); /* version & flags */ + + avio_w8(pb, 1); /* stream_structure */ + avio_w8(pb, layout); + if (layout) { + avio_wb64(pb, 0); + } else { + for (int i = 0; i < track->par->ch_layout.nb_channels; i++) + avio_w8(pb, speaker_pos[i]); + } + + return update_size(pb, pos); +} + static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); @@ -1353,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.25.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".