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 4F8BD45551 for ; Mon, 6 Mar 2023 04:02:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8280368BB5A; Mon, 6 Mar 2023 06:02:24 +0200 (EET) Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EECD368AD1B for ; Mon, 6 Mar 2023 06:02:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678075332; bh=HLKVFWyMwvLck5o3/62o88XTTLpGio/LaAiJaXCYw/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ibsYNAuE6cUNY1G9mTjpuNmf1nfGS36RvmOtrD6Sun8rS1Sb+30zZOyWXochtwTRR Mt0FJZfh0XhVTeMR+xfmMeABCZLrQbtTIswEtuXzIFWgPY21WwkBJTS+OaBSaW0aZG 6YIFmZLUd9izUkZpsXUn3aKaH9PWsMI7OT22B01s= Received: from localhost.localdomain ([119.147.10.201]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 88210DA; Mon, 06 Mar 2023 12:02:08 +0800 X-QQ-mid: xmsmtpt1678075331t0wsc8k7j Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+z1kb38sM0nlmdBukrcV6QKRXPyD74pKmtQ53HMkxom6T93E09Ti imT/1ZJwKstx4PVDWUiPvSe60CGxHBd6vSfti5d1dl/2dH4NiWAvTkLD3yR51ZmaZNcNdEs0HGiz uhTd3JAGMUrE2ES1LJDjx8nTBxhlfCLaJrbfvGCSRhJjQUq6QGgf/lP1Af2OXePh19PQQ8AEe7lB RK6ZXGUGTJGBnwKawFMArT4uelPkliqyfUgHzPxxiJVwW+8HIfix00GE/DIo6PxXO8ZBy2D2qUj/ AQO0ZMgv11jVb/Qqm3WtMCPBUfKRRTih0cCOjT5kcPKGsyp1AH3VqlhHq2T/EqI4zb3aRmXb4TC2 N0j4Tr2UY/ewY3aA9VOrt+EqVvhUiUFexxGOztFBm95eLvL2+BcY3+fgARrDv0I3V3lXnNFfbJzM TJGtbimaCUr9TWNfDTiK/LlXLD69iutbfa1oqY9zYqQ8nf4CEJKHsnFo2QSc7g0wn8pFqx0mJ8HR jm0nAs0bzR47WHchQW6WyB8p+tM1BIIpnhMWD7v/DwimwgDy70XmEslPfDURm9LA+HLYibu5q6ue /34U0e/3pQ7B1cITl8iOAuPOWF6CrMp9uEaofy3DXYthrK/p9HjKAAOSNGewoxjEEZzhVpcF+qlC 0GyU5rAHVVT7qRodeRAlciZn8YV6WVBN2I7W07kdl2wZca3fC2eHLCQP0BhN3Cv3eKAr/DhDajgU 5RtQV7QMVUSHOrHygbuMi9JzpoJ5diSyONY96pqpL4m2ybWtIU9aQHq/HFIKtqdJYpHaqp/Kl/8p fiTlTQCzR34cBpeBlLkFv0DEY0V78tbFa0VlC8FNXTHq5jvtcNWotNmMCkO7SFQPhlLOKrIOZIk3 2I5ujxUIbY80pt6wfu+73pXJ9ziBGWhMNakBmsxeuL+SmQphGLHoXNk/eqEicGy93kBXg1LLNP7h fVnyA52E+SaKuU7JINq96YWCCiuFhz From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:10 +0800 X-OQ-MSGID: <20230306120211.1249250-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306120211.1249250-1-quinkblack@foxmail.com> References: <20230306120211.1249250-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 4/5] avformat/movenc: add PCM in mp4 support 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 It's defined by ISO/IEC 23003-5. Fixes ticket #10185 Signed-off-by: Zhao Zhili --- libavformat/movenc.c | 84 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c4fcb5f8b1..2ec575c954 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1179,6 +1179,68 @@ static int mov_write_btrt_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +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); + int format_flags; + + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "pcmC"); + avio_wb32(pb, 0); /* version & flags */ + + /* 0x01: indicates little-endian format */ + format_flags = (track->par->codec_id == AV_CODEC_ID_PCM_F32LE || + track->par->codec_id == AV_CODEC_ID_PCM_F64LE || + track->par->codec_id == AV_CODEC_ID_PCM_S16LE || + track->par->codec_id == AV_CODEC_ID_PCM_S24LE || + track->par->codec_id == AV_CODEC_ID_PCM_S32LE); + avio_w8(pb, format_flags); + avio_w8(pb, track->par->bits_per_raw_sample); + + return update_size(pb, pos); +} + static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext *mov, MOVTrack *track) { int64_t pos = avio_tell(pb); @@ -1305,7 +1367,13 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex ret = mov_write_dops_tag(s, pb, track); else if (track->par->codec_id == AV_CODEC_ID_TRUEHD) ret = mov_write_dmlp_tag(s, pb, track); - else if (track->vos_len > 0) + else if (tag == MOV_MP4_IPCM_TAG || tag == MOV_MP4_FPCM_TAG) { + 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); + } else if (track->vos_len > 0) ret = mov_write_glbl_tag(pb, track); if (ret < 0) @@ -7744,6 +7812,20 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_MPEGH_3D_AUDIO, MKTAG('m', 'h', 'm', '1') }, { AV_CODEC_ID_TTML, MOV_MP4_TTML_TAG }, { AV_CODEC_ID_TTML, MOV_ISMV_TTML_TAG }, + + /* ISO/IEC 23003-5 integer formats */ + { AV_CODEC_ID_PCM_S16BE, MOV_MP4_IPCM_TAG }, + { AV_CODEC_ID_PCM_S16LE, MOV_MP4_IPCM_TAG }, + { AV_CODEC_ID_PCM_S24BE, MOV_MP4_IPCM_TAG }, + { AV_CODEC_ID_PCM_S24LE, MOV_MP4_IPCM_TAG }, + { AV_CODEC_ID_PCM_S32BE, MOV_MP4_IPCM_TAG }, + { AV_CODEC_ID_PCM_S32LE, MOV_MP4_IPCM_TAG }, + /* ISO/IEC 23003-5 floating-point formats */ + { AV_CODEC_ID_PCM_F32BE, MOV_MP4_FPCM_TAG }, + { AV_CODEC_ID_PCM_F32LE, MOV_MP4_FPCM_TAG }, + { AV_CODEC_ID_PCM_F64BE, MOV_MP4_FPCM_TAG }, + { AV_CODEC_ID_PCM_F64LE, MOV_MP4_FPCM_TAG }, + { AV_CODEC_ID_NONE, 0 }, }; #if CONFIG_MP4_MUXER || CONFIG_PSP_MUXER -- 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".