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 F018745843 for ; Fri, 24 Feb 2023 04:25:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 603FB68C0F9; Fri, 24 Feb 2023 06:25:39 +0200 (EET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A4E468C0C7 for ; Fri, 24 Feb 2023 06:25:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677212726; bh=5IgZ9ZUCLrPXduwmGsyUIAmCCOW4CE1+Fu1kNI4zHXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JQOtavlvu2fZbSbJvKatO+Zsfczs35DDe8yNYAOKIvtX6NMJosmSjfgazDYiTda0w 5SwlHwOx6yrQKSlcXh4vfUTVQDQfh2DyKbuDytzHmBP4QfJhEgk6ATnCRZ+xe8Z1UB j5zPtYWVwjFIDSItZCelIC7mu8GgdK9WizTrzknk= 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: xmsmtpt1677212725t7ox896oh Message-ID: X-QQ-XMAILINFO: OW5zxOp0HHYwPVIYVTWS+SKk9w/hmUDjrwERvpeEx7mXc2657CgeafU2M68TW/ 5AXZoq0Y+4eHxHe+ev2SCgR80cAOOfd/HzNR6jVlbVVYkd3RgNXYLpSDu87cBmZvnA99Z1QwaRSM uSEEHhuzSJ/aKx8NQBGryWGSV8fIOm9JpujpHEeSU5Qd2AvGDwUwIqeJRa5f9WF+CkQiIUDI3eh8 8m2RJcHhfXkgO+L4ehFpQokAtEXSI8C+aUOSYldNqramB2ZKP7O4fDLg3nVng7GjZuTtyQZm3tOT GQD0k6mdgu2OC5y+QrKNUrhNXd3BlcTMUOJr5v4BKVRwDQzlrctp0oI2m6in3SalqEUfG3hnMd2U /LEX8yxvdpJDj5VzNUbRVDczaMXLUVa4XxApxWpLSeQnih5ZDkQx1kEPlFuRdCwrhifWU+4ynlJo GCzuVTVTsQ4DLz8UTvkUcHRwDmONwFkTImXaMlaDrGqvS0cVXtFCx02WDk1Mk1KuTxF351T+BuDO yB3OeQ1gnvQD/jPxuQXYTlUHxb45gw46IHD1jQyImCQESVC9OLof5ygtk07gmo61ZiXbIW8MS4gd tLHOtE5aFhxJkLF7XQRZ/YQ2Z6yu4W/qlU7M44x9vlqBQYPKPFf0BCnbf1UCHJfMZGRA2g+78BeR f3jnfhB5xZytILvjYuXoFw6qp7dauUHoPoSO3etjROP+4fDMB2XRafgla7J6WAh0OzQR1W2gHm5o BF4k6OPfvF6gBkW1AjjR+Xs31PAd2BKxuVecm9LcPcFpshmBRNjZ9ps+msUVGQaacZ1gSu8/7Zt0 7YnNWOFkQSpWIO+vIPFCGfb9jPndrYulTH7UW7gkRRdv/rpjNq9sXOF6STqVhYxbK8M5YGAmeZxJ hmaZ7hGchL74IQ9BhKScoHodxIBUeV0aD+VxOxRKQiTLbovIAgNVD6yAOCgLMEbyWjrPVmJHkK4M Wod24k+JirnqO333EyO9Wvl1xbjRZa From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 20:25:18 +0800 X-OQ-MSGID: <20230224122523.143571-2-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 1/6] 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 | 64 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c4fcb5f8b1..99b93c1d5b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1179,6 +1179,51 @@ static int mov_write_btrt_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int is_mp4_pcm_codec(enum AVCodecID codec) +{ + static const enum AVCodecID codec_list[] = { + AV_CODEC_ID_PCM_S16BE, + AV_CODEC_ID_PCM_S16LE, + AV_CODEC_ID_PCM_S24BE, + AV_CODEC_ID_PCM_S24LE, + AV_CODEC_ID_PCM_S32BE, + AV_CODEC_ID_PCM_S32LE, + + AV_CODEC_ID_PCM_F32BE, + AV_CODEC_ID_PCM_F32LE, + AV_CODEC_ID_PCM_F64BE, + AV_CODEC_ID_PCM_F64LE, + }; + + for (int i = 0; i < FF_ARRAY_ELEMS(codec_list); i++) { + if (codec == codec_list[i]) + return 1; + } + + 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 +1288,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 +1353,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 +7792,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.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".