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 6B1E6458A7 for ; Fri, 24 Feb 2023 18:29:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0870C68C161; Fri, 24 Feb 2023 20:29:03 +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 7AAC068C13E for ; Fri, 24 Feb 2023 20:28:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677263333; bh=JjvQ4U2au6uTBeMawFf6n7fkgbj0jnqCFj829vFUJuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cD64eo16WcSvtwWAAHEwctuTHUQ0WKCEpKlurl13F+/RjXK/zPk7HNPjr0bp7Blob e49xDqIeAFxmvpbHklPnae2WGD0fkuvlK0AuhJC1qDen5rJUKb78f0qg7pDpi754ns YLyakjRXzLm9V5AOKw4cP4c30Hs5lLBiR3e8rnaM= 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: xmsmtpt1677263332ts6poxxbp Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uT+E41oYQPEoGwEU84vNc63gIvJRlfcl07IlJF2zPeWDqPp1x5WN XKP1XZADYgmfi44OWvqqQOsA0EiHAJlAr3RoaKdTG0mmA7mvHRp1qRzblnWMml6+/X5MSZfTajie t5m9pdXIlrZ1PimTvvvJBOZHcagv/oZsp5zR7cdvavwKNK+cS+kHHzMbDKpbqZjhXI2ipcqVnnbD +DcqD10vZxd04OjxrYgTzPO0L9B9RQprwlDWEHsTjppblS0LkjpcvQFu/TPVwKIpOcm3l1mM0OLL X0y8QxDS4xl0S/K3tmRFu4gh2TbKSiqJFkRKsTESO5Z9R2qr53oUac3uRZ9/ag5wc0XLK6rBLUeO PcJvVh8S2mo6f4aXas3IGrRyNa6Cq6/aY02lOJ0npaJ7vs+dfEWxFqvn+yASxXRwpDdgVlKUlhKx 7+O8Nf90l8G1g3iXcBC5sBUYupUXLQpYXemUaspn7/4eYaai8ft7UhCdfB2fmV5l39DTcKY9M5VG eUsdwhuwjUGsBpUqNljx4ypgbb/iC9CUqWJ93YAHGj7CM87ArCBTS//ShMOEsY2uHksBJWie5RMG 41nP0solo08CH6ZcTXVuBuynYmDyg7biaMrwNvaqE5b7kFrg7nSQeGfCZHLl90thjMqkrPbpXedn Snaa2jPJvvvFuMqMC2bHDQWTrTgUVJCu0Ssp5wQc1u1dTOC3JjvnEi6DLlGukH3kVYcnuL9Lb9/x 2U+0q6JxLfc42VVu6lMV5/MVXYUBLTjSlCfv00hDliWrjtxbnu4Iz+fWEhYxAHwNcdWEFamJIbb8 RmDhFuysNJ5+uzwzMWv841Q3022FmXs6Ks9w+mmFPy8fpcAQnNE0ncYe0TMMO+a855E4Md+KDaK4 Ua2ZxQZScnnPZ8i6hAZmoznaiXN8Vv5y7tAqQW669FyFPf9xl0hjW/uBc8v/Hb29QBa4VOzsa5DT CLTIXJzuKrymeMQPwuXNAhC2LqfrD1 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 02:28:42 +0800 X-OQ-MSGID: <20230224182849.426345-2-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 1/8] 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 | 60 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c4fcb5f8b1..3315057b88 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1179,6 +1179,47 @@ static int mov_write_btrt_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int is_mp4_pcm_codec(enum AVCodecID codec) +{ + switch (codec) { + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S32LE: + + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F32LE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_F64LE: + return 1; + default: + return 0; + } +} + +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); @@ -1243,7 +1284,8 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex } else { /* reserved for mp4/3gp */ avio_wb16(pb, track->par->ch_layout.nb_channels); if (track->par->codec_id == AV_CODEC_ID_FLAC || - track->par->codec_id == AV_CODEC_ID_ALAC) { + track->par->codec_id == AV_CODEC_ID_ALAC || + is_mp4_pcm_codec(track->par->codec_id)) { avio_wb16(pb, track->par->bits_per_raw_sample); } else { avio_wb16(pb, 16); @@ -1307,6 +1349,8 @@ 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)) + ret = mov_write_pcmc_tag(s, pb, track); if (ret < 0) return ret; @@ -7744,6 +7788,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, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S16LE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S24BE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S32BE, MKTAG('i', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_S32LE, MKTAG('i', 'p', 'c', 'm') }, + /* ISO/IEC 23003-5 floating-point formats */ + { AV_CODEC_ID_PCM_F32BE, MKTAG('f', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_F32LE, MKTAG('f', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_F64BE, MKTAG('f', 'p', 'c', 'm') }, + { AV_CODEC_ID_PCM_F64LE, MKTAG('f', 'p', 'c', 'm') }, + { AV_CODEC_ID_NONE, 0 }, }; #if CONFIG_MP4_MUXER || CONFIG_PSP_MUXER -- 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".