From patchwork Mon Mar 6 12:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40594 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587176pzb; Sun, 5 Mar 2023 20:02:27 -0800 (PST) X-Google-Smtp-Source: AK7set/FX0KIaTHglmyp76indPnXzd1ksuw5/+hymEiB9cX+nhpvFVNxx5kPOQOdcWmY9P8eR5Vj X-Received: by 2002:a17:907:3f82:b0:8b1:7e88:c20f with SMTP id hr2-20020a1709073f8200b008b17e88c20fmr14866934ejc.15.1678075347342; Sun, 05 Mar 2023 20:02:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075347; cv=none; d=google.com; s=arc-20160816; b=nPUe3kDt4ZBus+OBdt4UchGSpji4gR06MABJT5Phsk0Ca/sr6MsOV+IIUDzxKpvGnf n2e2zH2RBbUO7D49pjCw+AtcayCXR5+WFIxKCRW3/KEH2lkoJlaqsm3sHGv/pNOGFlE6 jWdC2TWGDakWDRv0R7wdyTLXYt0UfO22P6VmchOX2S+A0rsCFMm4yTt6oAfYhkif7wI3 NqHTHluw4XYFgOrgWSyUPqSTMrz6qnyiOkX8CVNEsV+woMXIxBoh4Uvmnnoqu9wTKA9W 6IADEbQ1u53Zvj7hOBeiyRFkn4/dse3pYuxS+IAkLt6ZAQmRVrq/ylAN7Si3NcKO6VsA /mvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=ZdyQuYrcz8z84pGht2MBhY6zy/o7XDmMSpViCk99kJ4=; b=mFfPbMQB4QswFlbkSPvPkMrYOhAbljToMUVYLM2vy+7PDgofAHjkbIYE5gpEQXZgPv VdFTP4N6Vfk6DzKYW/9tYLO50c23Jt42zMz4BPFd+pShg3ue5k3O9zgXMmdjGehlNMpa 9fwGAD8Pbylw8H1Hxdh5ku5CDoiVuzk4fAaXbeu3tlHM3DmHKs2mW0WqIMYJexuObZG+ rfXJQ60zpvJ7rgQoVYx1igHTDyNu+sAf830pCI6rWPvr+19iRM1FwOhYMGvP19lJpezK KPOjH4MIuWgOhlow5I4KcB200wuNuC37TC9NzU+fuYua97BbDao1yH9IqHt2x5QhQL9Z ZEUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qay8UfKS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h24-20020a170906399800b008da1e19114fsi7741829eje.322.2023.03.05.20.02.26; Sun, 05 Mar 2023 20:02:27 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qay8UfKS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A01EB689D0D; Mon, 6 Mar 2023 06:02:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-82.mail.qq.com (out203-205-251-82.mail.qq.com [203.205.251.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DAD2688373 for ; Mon, 6 Mar 2023 06:02:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678075330; bh=FXU3NaG6edSjgWJrtNSox+I3mk/9grhtUCYAkCd4dF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qay8UfKSld2KH44It49Iyj8ZWFDI2gg0Sq2SLSLw+KbhbK0jBXhD1lriyaq/r7a6N CNVB14yBtQ42MCO3dutRhXuCFujrNFMM0E2rxS4LKR1QJ/qdkU+MeMu9ClMfBYRdSu I5VFSbaLPEiA5B5AKy9VT1HkmWkbCvF1ckuR1t+E= 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: xmsmtpt1678075329tgdr3wk9f Message-ID: X-QQ-XMAILINFO: NJqppJoFFPLCCv67ZM8DXvB+01extOcYHlZY2XC92E7rGfdyeTBDn/jEwupFVj W9UpUzOX7nQB/ITmpsr9RBUbh/C8ZeWMUt+f0TDdrthFUDCZcyIQEq2vZi5rl9ssIGgZLOzNQ/Up JIiG7yrzLjESZTWdKno4bamBFYkLQUtAVNlnBBRlDe0DWvt/gL+3RYh+YCNNXJe7xoWI7xmP0uhP mCgz8SBUwGHOlr+fp16ZvdzyeySBlBaNdSIN6s3gcVUJ4U2Lb7QvrTEx7Oglt+N+Tor3OfJhtucg TRchkri5JxYwiRmrkg5ICgBzxUvosKF9XEpAg7XI3CTWr/GAXy1I0shhEzzDfcHNPTxiyGZ21pb7 9DsMVxo1n721p0UB9rkuEYaGOjLGsZ48AIAwdTzAQMhKRHjfkrLiAgeMC5K16/C+cGJAWNRoVCCL +7BFa6S3iWN2tTuYUk+Z6zvdSW1zHK4VqmqMGlkxuOfnTv5uKKo3OqR0FFXZbaIu+BZymBIkFeu4 hOI0pY6s+23Jysn7C/lMmHRQNMpiv8leWDZIz8TJYZkHc6JfPN7t6MKyTsV1mq00hN541zmZxsRr bncuQUrtXKxMF7kdHLb0qYMjkH82f0jP2TP7QOShBeMcB6hgdV6Xaj1JuN/v/a9SwJaONIgDzxmh pWfHSjM7KdgM53qEqbAfUFYw7tL394Y9ZxSO1ugHo5JKGAtBY6T+bX94Q+59q9Wv86gACXljr4mD GCQcu+PcTN81Cx8ds+RG46CF6dArXx2oTNia+mbslmdzDYz33VSRMTR9rw+/6j8y70Q9FeMu98Ky csfCy/DIaZRL+pXx8OYGQ0uwSVGukXwwSHDnCYKz68vMoLyCp7SPydvYGS/qF2Km5YtJqUIF9gMt 8ifLet0qkWHkRajhcQ0LXI+vt/fe8m3/FGicBs3AFOZ2EA2fus1UUDvnU5+Y5sKXOtTbZojqlhWG 8iiW3AjguUrndCij8dh6849IxOEbK3 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:07 +0800 X-OQ-MSGID: <20230306120211.1249250-2-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 1/5] avformat/mov: fix ISO/IEC 23003-5 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7fiGIIeTFEcX From: Zhao Zhili Missing floating-point formats support. Signed-off-by: Zhao Zhili --- libavformat/isom.h | 2 ++ libavformat/mov.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index 5107b4eb74..4b1cd42f0f 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -418,6 +418,8 @@ static inline enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags) #define MOV_ISMV_TTML_TAG MKTAG('d', 'f', 'x', 'p') #define MOV_MP4_TTML_TAG MKTAG('s', 't', 'p', 'p') +#define MOV_MP4_FPCM_TAG MKTAG('f', 'p', 'c', 'm') +#define MOV_MP4_IPCM_TAG MKTAG('i', 'p', 'c', 'm') struct MP4TrackKindValueMapping { int disposition; diff --git a/libavformat/mov.c b/libavformat/mov.c index a9911c0f79..14528bdcaa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1591,6 +1591,10 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { int format_flags; int version, flags; + int pcm_sample_size; + AVFormatContext *fc = c->fc; + AVStream *st; + MOVStreamContext *sc; if (atom.size < 6) { av_log(c->fc, AV_LOG_ERROR, "Empty pcmC box\n"); @@ -1608,6 +1612,51 @@ static int mov_read_pcmc(MOVContext *c, AVIOContext *pb, MOVAtom atom) } format_flags = avio_r8(pb); + pcm_sample_size = avio_r8(pb); + + if (fc->nb_streams < 1) + return AVERROR_INVALIDDATA; + + st = fc->streams[fc->nb_streams - 1]; + sc = st->priv_data; + + if (sc->format == MOV_MP4_FPCM_TAG) { + switch (pcm_sample_size) { + case 32: + st->codecpar->codec_id = AV_CODEC_ID_PCM_F32BE; + break; + case 64: + st->codecpar->codec_id = AV_CODEC_ID_PCM_F64BE; + break; + default: + av_log(fc, AV_LOG_ERROR, "invalid pcm_sample_size %d for %s\n", + pcm_sample_size, + av_fourcc2str(sc->format)); + return AVERROR_INVALIDDATA; + } + } else if (sc->format == MOV_MP4_IPCM_TAG) { + switch (pcm_sample_size) { + case 16: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; + break; + case 24: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S24BE; + break; + case 32: + st->codecpar->codec_id = AV_CODEC_ID_PCM_S32BE; + break; + default: + av_log(fc, AV_LOG_ERROR, "invalid pcm_sample_size %d for %s\n", + pcm_sample_size, + av_fourcc2str(sc->format)); + return AVERROR_INVALIDDATA; + } + } else { + av_log(fc, AV_LOG_ERROR, "'pcmC' with invalid sample entry '%s'\n", + av_fourcc2str(sc->format)); + return AVERROR_INVALIDDATA; + } + if (format_flags & 1) // indicates little-endian format. If not present, big-endian format is used set_last_stream_little_endian(c->fc); From patchwork Mon Mar 6 12:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40595 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587311pzb; Sun, 5 Mar 2023 20:02:47 -0800 (PST) X-Google-Smtp-Source: AK7set9VkdIC37LwyxV2XTdfaeJyroGVl/jO83BIBN9l+lYPFHV0pCg4NARDGqXW/Ipb8rdq7QJF X-Received: by 2002:a17:907:3f90:b0:878:711d:9310 with SMTP id hr16-20020a1709073f9000b00878711d9310mr10202053ejc.1.1678075367210; Sun, 05 Mar 2023 20:02:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075367; cv=none; d=google.com; s=arc-20160816; b=ThgOyafFswitubYDsuKDhgnypU403J2R9H+TWpkt6wxIA1qC6YMNIRZf3wwNq9xB9S +807tjf2oMtS9+NahVjXebEYEsQpHc/zabexb2eQf+Veb2Jl0zkuSc3+/lJIPvHlENLj l+2rzuFbKSr8+ILdLjqJK4TWviAHjsWcJawVLZj3b22jNzDONGf8AL0x/U4Sdg9/Kj6q KlTHvegyGzEwJDGGavxtM9dpgNiGKJ0MAdh9cNSk5LC5dmpdB/T7dIW4CketQwppJqSo yUgZ4Bd3IqZyZQ/ct79ShWVfq7wVe9XQfU41+KUqM88tkETXW3PhuokuQInvFbIytDmb QJjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=wLjUYdph6ad+O2Db+UrfoUMlJz3riOvjoq5B8iI9wjY=; b=J2J33F03FiXyjZ1Eh9VStxOfhHlJFejiLD1XxVlKFfGpVzJ3rUSKpwSdsa/Tgoc/QZ 5HAScJ2Q3VwJiJsV1mc0qVxh5zQdwhfloeDkyUQcB6KZUVD/0eB9D4rNFhIwSTWGG5uU j9Nt2TFfRvimO5q0yGNWpFEsZs7Ucgx5L12+4Henz6psnIHebTEIK577zp1Kd0xGR8AD q606GcW3rvkuvwDWzT04TRziL+fjQ/Uq2g4yiEFkYF6oHFkbz4L69FgRTJjBFcODESBs OnZCfztm4+OlZmyW79NSBDMbEj1w2biJE6XGm7p4qsIsUicUzMf8zSCp85OaOLfi+THE jrmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="RZWhJJA/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay15-20020a170906d28f00b008bedd21abe0si5964004ejb.567.2023.03.05.20.02.46; Sun, 05 Mar 2023 20:02:47 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="RZWhJJA/"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC77068BAF6; Mon, 6 Mar 2023 06:02:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EFB368A5F7 for ; Mon, 6 Mar 2023 06:02:13 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678075330; bh=t1R2fE+gr4jI6mlGjcocVnu6s5abxAZU6a4nrjhm0OI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RZWhJJA/XNC1MYA991oYfyby2MgBVnjWZ2vSop0Pihu9ORib23T0ZZlvWnIJ0Q/bq I7qHY8Llh0NKS7K4LcN7jAQ2iIxj/h+2POF9r3b/T4Mz4HLPqeF5z8HNG+M/M8VXcS +SWLSeqRzN0ZlqQ+Iv802zenFktWwYPqjfknZWrQ= 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: xmsmtpt1678075330t8ibj5gob Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeie25suaVCiIWvrfWHWmylyMzbIMrPX/RGf2cQWcbW2tJqUYvw6T2 olCdrqy2S+vojMESv25feZtBcxk6xqTH5LoG2hOyDnNU8LSy091CD2oUk6PILBv8ILPeahDkw0Cz e7L6Zljjak1v/cul73JF0VnxwnXoBlMBexC0splRPqsdxuHT0QrPUDHYgSAQZzmLNSxQDNuNjMmq GfoWY/xIRMeDUWt2OCSQVUJPQV45w5iJmHjB1yXZ7sUWZ5fxSMYk3AwH1rGtueVR81hAgypTGV9M kkaZm2jcLPZt1jktC4gBZ/nNegGM9VWx9pIfhXO083T3L3aFfloepKCtyXdaF/Z5q6TNfwOfaW2G ycw7oxICf9MjEO9BGxmKCoqfzF4YMKQULBR7rsYuI7XxQTxRQKQHNnFWt5EwwCNy939sTK4uh+tH gHmExysyslBD3SWHh5nejkg8LtE1MBo3FGGpcb7njL7hiPmEpGaumT7vFtlmUZc0574avh1eX4qD ukdpKPYRgHlDTGP6XzCpUBrnlTd6izjD33lPtNL0VzQuQSC8nDDZgEbVtWUKwcpaJxlJQW8il8dp 1ZyYNaGqyU2yR/MML4Yo8iv+yr67w0PLw56afgwfqk5MlqkNgbKkfFfZegshB+nm3l4/VJLrgp7V k+kWs2qe0rLuaUeHIoopPPo51YXaZFhKjxxtcJsWaSmy/pYiEWYPjqqWrnQu9duK2MRCYR7WlxUI hQKi/Wnoq1jop/qiwatpmYDdF5RLvZnvK9O3/GbxC+WJsIWK2YjvxLR2K/sbax3WXNTz55eiKCkT n6e7KdNxatCx6sXeFraX5Ilpp3vYUOM/2vbRILxs/6mW8D0OMTJciqI3m2IBqYeawIDWlUh2EvGi U05rwA1msNMp0jtPBlOG2O5r0BitWvI7SbXBIdgmfmhRBSiiqz0gDlQdOYBBnZ8LpE2Qu/KE+/pv LgGI1g9RXrbNOkN9w1fzDfTHQhMHW+3g/Nsp/UDAxQWqAov+t2pwplyofANTuE From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:08 +0800 X-OQ-MSGID: <20230306120211.1249250-3-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 2/5] avformat/isom_tags: remove ipcm from movaudio_tags 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1N8JJzeBaCBo From: Zhao Zhili ipcm is defined by ISO/IEC 23003-5, not defined by quicktime. After adding ISO/IEC 23003-5 support, we don't need it for ticket #9219. Signed-off-by: Zhao Zhili --- libavformat/isom_tags.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e2b80405cc..86c7272525 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -321,8 +321,6 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_PCM_S16LE, MKTAG('s', 'o', 'w', 't') }, { AV_CODEC_ID_PCM_S16BE, MKTAG('l', 'p', 'c', 'm') }, { AV_CODEC_ID_PCM_S16LE, MKTAG('l', 'p', 'c', 'm') }, - { 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', 'n', '2', '4') }, { AV_CODEC_ID_PCM_S24LE, MKTAG('i', 'n', '2', '4') }, { AV_CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') }, From patchwork Mon Mar 6 12:02:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40598 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587534pzb; Sun, 5 Mar 2023 20:03:19 -0800 (PST) X-Google-Smtp-Source: AK7set8FPy2fO5lARE3bUL74h7qiA1fxHGYp+V4QYm2774n8o9pU/TW6woomlytPDlagdzVS5jvp X-Received: by 2002:a17:906:58c3:b0:878:625c:c8ff with SMTP id e3-20020a17090658c300b00878625cc8ffmr11669171ejs.54.1678075399474; Sun, 05 Mar 2023 20:03:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075399; cv=none; d=google.com; s=arc-20160816; b=d4kwAyOrv+OBmS1QXMOxlm9B/xcvwvEsYILGHILYD6/fLjgJa/pp2Vh7wXSbe8NBCt i1rLf+3nZnDsFLJEWrmTrN00HgPvpwGcC6pwDyORnu/9Oyrev1daXo3qeFXA1N0Cozf0 nxOZ0r/FQnTf6SBAWmRvw2cyo/T/+l4rJ47ijD5Yo4lGRJaeG3V3Td9pkm5vixyZGDrr h+ZUDSETjAnz2OLBJfDLQLGFhCAxNEqwOf3nTstTEIM/GsojZAcejuOr4NCzbSmpljD1 lPWS6JV9zUNsuaK/63yGIFytal+V+CZggYDE51zci7N3KZl+Sq8w71C5b3rm9lmEe4ni lDCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=9Fc2Nf7SNe27WtiA5uIXqhm3PlBJ4mpfvAVPnlBZtWk=; b=EkhfFc3etIK/eVH9WTzoKGdMoyvLqDzPPQOZwd37SoLHp9vZuVFiVwmUzA+EgjM3x+ cpcoLC56DfaOngtmE6iL1k3Kd58/5gf7gmncKvrpfG+RieKAhGgoXQ5Dc6DIlO4AjnRr w3uouvg9zxziWHRT5S3DTQSShnSlyJhqQbd0dATrYfHKXFRsHOgjAQYIqX3FC6X9EXme 1qv66JVjvO3fzajkVjoHA1IYmjZ9FMXN7NPuhNzNUy8E0Ylb6W8gX+2iCy0MkvqiujYI MGucIoVdkuXPXRfyqKZj96BauDyeGSdUHniGQmST6KIDBSIDVuOUIz3XPZj5KwlGuJp9 aFwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=QaHjuEX7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x21-20020a170906b09500b008c1468c314esi8503405ejy.384.2023.03.05.20.03.18; Sun, 05 Mar 2023 20:03:19 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=QaHjuEX7; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A420168BB94; Mon, 6 Mar 2023 06:02:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-173.mail.qq.com (out203-205-221-173.mail.qq.com [203.205.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED2F6688373 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=1678075331; bh=c+neZnYx+Xte1WkPQPWehO5ruJPyRVyG9D34oW2P4rM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QaHjuEX7XRDGNq4KZ7O1u4H3J94m7moyUVx7Ty1wOq1t83RuNk+p9b1Sri11mX8fO XmrdM86UnyCkFEe2hTR0kmPE8+m8JcyUwBihxg/htbWYe5kNQfPOgq45+ql3Xo8g+o hZ7lc9vDsr9JZiHvDemC7qfwlhlZUerj/Kw8KtIQ= 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: xmsmtpt1678075330t6bqhu9uw Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69dhUgfJJ75B3eA7Crybn4pJbTUXoUmneRgPBs2khNb0TcqSSdrb HvUBXG32Z6ZGDwo+HQ0Z5Kg5AzAVnWjH6qVIl/qidUS3wUE3eAtylXHQ1rQ2R3MJngaHSzEXN7bI niW5ibzpG1rjMERFNqJgTF2eMyP4B8ZeJPclfPsgPkRB279KZvwK6osmSMO6Po008p9tPuGIdNGb Vfjps0c29EM8HpHyjZeL28HUeFJChs0QqwTBPsF3Nf3jp+bGzSRq0mHnJeTnmhh1YKGj60D7N/Ku CPzrZ2KL5xBO2AUOo8BjU65sdHI/D+7f5EmSwpBr43ZA6SmO13i6oESHAwesK2b7QAIpmUe1RRlN DaWBCMf4m3Rj0O1pdQZq1HDHnzJ1B3KeEEvxczqCAyK8N/4CvadBf1Iheb614nZgf8ttQP1o1Row dn0BDMrIxu28CCkcowL3ZtnwekikP1LnNW96ygQjPHf63gZYbej9tEWqVxY7JdWtf8dexNayRVGj afEizpa5nw32OAOlZYphqv35fGwW2K1TgLFnzUgTNBokrM4hH+K9rYEkS6jGSKkL2sw5obEWArWb qQinTAafkMW5SKEaiLKmQx7Jaq8jfKHmjqOg8Lj5n3w46pCuKsGnliFkVFgTBVMV5kU7lhRceLdD m2LPvkk1xOn3mBX/SnhoHYkopQNX88MOWsCNBYumL4X0JiIfJ0e9wLNf5Zm/u/eCb9liDbXa1oV0 8pX2lqfOY+kY6Pz91MZJcwTWjKu4hHvsBqzc3AfuW7mIpzQqUJ1FXh2XO8nmL5NTniHce10cGUb0 JWExnQVAGNLxoLSLe1o+ZtZ+WbYCSaEnwhju/PtvKYezz0gLUNdo7Uq1uahLCNojR2OWxshErtnv bxRYoXkPN58BT/ZiKUG7DKIqv5NUjI2FEDiNdh3+BOutHG0NHIc/LVSXxySTdupjUBltD2t9v9U4 FoN8WmOpWiMTJozCTfG87eeHcLbQsrszRS6RsKLunBlYx6Mi/kDzTVEIaG5XP9/VEt5SC6AGo= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:09 +0800 X-OQ-MSGID: <20230306120211.1249250-4-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 3/5] avformat/mov: parse ISO-14496-12 ChannelLayout 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kPWabxeLDaWd From: Zhao Zhili Only support chnl version 0 now. Signed-off-by: Zhao Zhili --- libavformat/mov.c | 85 +++++++++++- libavformat/mov_chan.c | 296 +++++++++++++++++++++++++++++++++++++++++ libavformat/mov_chan.h | 26 ++++ 3 files changed, 406 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 14528bdcaa..057fd872b1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -940,6 +940,88 @@ static int mov_read_chan(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_chnl(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int64_t end = av_sat_add64(avio_tell(pb), atom.size); + int stream_structure; + int version, flags; + int ret = 0; + AVStream *st; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + version = avio_r8(pb); + flags = avio_rb24(pb); + if (version != 0 || flags != 0) { + av_log(c->fc, AV_LOG_ERROR, + "Unsupported 'chnl' box with version %d, flags: %#x", + version, flags); + return AVERROR_INVALIDDATA; + } + + stream_structure = avio_r8(pb); + + // stream carries channels + if (stream_structure & 1) { + int layout = avio_r8(pb); + + av_log(c->fc, AV_LOG_TRACE, "'chnl' layout %d\n", layout); + if (!layout) { + uint8_t *positions = av_malloc(st->codecpar->ch_layout.nb_channels); + + if (!positions) + return AVERROR(ENOMEM); + for (int i = 0; i < st->codecpar->ch_layout.nb_channels; i++) { + int speaker_pos = avio_r8(pb); + + av_log(c->fc, AV_LOG_TRACE, "speaker_position %d\n", speaker_pos); + if (speaker_pos == 126) { // explicit position + avpriv_request_sample(c->fc, "explicit position"); + av_freep(&positions); + return AVERROR_PATCHWELCOME; + } else { + positions[i] = speaker_pos; + } + } + + ret = ff_mov_get_layout_from_channel_positions(positions, + st->codecpar->ch_layout.nb_channels, + &st->codecpar->ch_layout); + av_freep(&positions); + if (ret) { + av_log(c->fc, AV_LOG_ERROR, + "get channel layout from speaker positions failed, %s\n", + av_err2str(ret)); + return ret; + } + } else { + uint64_t omitted_channel_map = avio_rb64(pb); + + if (omitted_channel_map) { + avpriv_request_sample(c->fc, "omitted_channel_map 0x%" PRIx64 " != 0", + omitted_channel_map); + return AVERROR_PATCHWELCOME; + } + ff_mov_get_channel_layout_from_config(layout, &st->codecpar->ch_layout); + } + } + + // stream carries objects + if (stream_structure & 2) { + int obj_count = avio_r8(pb); + av_log(c->fc, AV_LOG_TRACE, "'chnl' with object_count %d\n", obj_count); + } + + if (avio_tell(pb) != end) { + av_log(c->fc, AV_LOG_WARNING, "skip %" PRId64 " bytes of unknown data inside chnl\n", + end - avio_tell(pb)); + avio_seek(pb, end, SEEK_SET); + } + return ret; +} + static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -7817,7 +7899,8 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('w','i','d','e'), mov_read_wide }, /* place holder */ { MKTAG('w','f','e','x'), mov_read_wfex }, { MKTAG('c','m','o','v'), mov_read_cmov }, -{ MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout */ +{ MKTAG('c','h','a','n'), mov_read_chan }, /* channel layout from quicktime */ +{ MKTAG('c','h','n','l'), mov_read_chnl }, /* channel layout from ISO-14496-12 */ { MKTAG('d','v','c','1'), mov_read_dvc1 }, { MKTAG('s','g','p','d'), mov_read_sgpd }, { MKTAG('s','b','g','p'), mov_read_sbgp }, diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index f66bf0df7f..df17976e59 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -551,3 +551,299 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, return 0; } + +/* ISO/IEC 23001-8, 8.2 */ +static const AVChannelLayout iso_channel_configuration[] = { + // 0: any setup + {}, + + // 1: centre front + AV_CHANNEL_LAYOUT_MONO, + + // 2: left front, right front + AV_CHANNEL_LAYOUT_STEREO, + + // 3: centre front, left front, right front + AV_CHANNEL_LAYOUT_SURROUND, + + // 4: centre front, left front, right front, rear centre + AV_CHANNEL_LAYOUT_4POINT0, + + // 5: centre front, left front, right front, left surround, right surround + AV_CHANNEL_LAYOUT_5POINT0, + + // 6: 5 + LFE + AV_CHANNEL_LAYOUT_5POINT1, + + // 7: centre front, left front centre, right front centre, + // left front, right front, left surround, right surround, LFE + AV_CHANNEL_LAYOUT_7POINT1_WIDE, + + // 8: channel1, channel2 + AV_CHANNEL_LAYOUT_STEREO_DOWNMIX, + + // 9: left front, right front, rear centre + AV_CHANNEL_LAYOUT_2_1, + + // 10: left front, right front, left surround, right surround + AV_CHANNEL_LAYOUT_2_2, + + // 11: centre front, left front, right front, left surround, right surround, rear centre, LFE + AV_CHANNEL_LAYOUT_6POINT1, + + // 12: centre front, left front, right front + // left surround, right surround + // rear surround left, rear surround right + // LFE + AV_CHANNEL_LAYOUT_7POINT1, + + // 13: + AV_CHANNEL_LAYOUT_22POINT2, + + // 14: + AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK, + + // TODO: 15 - 20 +}; + +/* ISO/IEC 23001-8, table 8 */ +static const enum AVChannel iso_channel_position[] = { + // 0: left front + AV_CHAN_FRONT_LEFT, + + // 1: right front + AV_CHAN_FRONT_RIGHT, + + // 2: centre front + AV_CHAN_FRONT_CENTER, + + // 3: low frequence enhancement + AV_CHAN_LOW_FREQUENCY, + + // 4: left surround + // TODO + AV_CHAN_NONE, + + // 5: right surround + // TODO + AV_CHAN_NONE, + + // 6: left front centre + AV_CHAN_FRONT_LEFT_OF_CENTER, + + // 7: right front centre + AV_CHAN_FRONT_RIGHT_OF_CENTER, + + // 8: rear surround left + AV_CHAN_BACK_LEFT, + + // 9: rear surround right + AV_CHAN_BACK_RIGHT, + + // 10: rear centre + AV_CHAN_BACK_CENTER, + + // 11: left surround direct + AV_CHAN_SURROUND_DIRECT_LEFT, + + // 12: right surround direct + AV_CHAN_SURROUND_DIRECT_RIGHT, + + // 13: left side surround + AV_CHAN_SIDE_LEFT, + + // 14: right side surround + AV_CHAN_SIDE_RIGHT, + + // 15: left wide front + AV_CHAN_WIDE_LEFT, + + // 16: right wide front + AV_CHAN_WIDE_RIGHT, + + // 17: left front vertical height + AV_CHAN_TOP_FRONT_LEFT, + + // 18: right front vertical height + AV_CHAN_TOP_FRONT_RIGHT, + + // 19: centre front vertical height + AV_CHAN_TOP_FRONT_CENTER, + + // 20: left surround vertical height rear + AV_CHAN_TOP_BACK_LEFT, + + // 21: right surround vertical height rear + AV_CHAN_TOP_BACK_RIGHT, + + // 22: centre vertical height rear + AV_CHAN_TOP_BACK_CENTER, + + // 23: left vertical height side surround + AV_CHAN_TOP_SIDE_LEFT, + + // 24: right vertical height side surround + AV_CHAN_TOP_SIDE_RIGHT, + + // 25: top centre surround + AV_CHAN_TOP_CENTER, + + // 26: low frequency enhancement 2 + AV_CHAN_LOW_FREQUENCY_2, + + // 27: left front vertical bottom + AV_CHAN_BOTTOM_FRONT_LEFT, + + // 28: right front vertical bottom + AV_CHAN_BOTTOM_FRONT_RIGHT, + + // 29: centre front vertical bottom + AV_CHAN_BOTTOM_FRONT_CENTER, + + // 30: left vertical height surround + // TODO + AV_CHAN_NONE, + + // 31: right vertical height surround + // TODO + AV_CHAN_NONE, + + // 32, 33, 34, 35, reserved + AV_CHAN_NONE, + AV_CHAN_NONE, + AV_CHAN_NONE, + AV_CHAN_NONE, + + // 36: low frequency enhancement 3 + AV_CHAN_NONE, + + // 37: left edge of screen + AV_CHAN_NONE, + // 38: right edge of screen + AV_CHAN_NONE, + // 39: half-way between centre of screen and left edge of screen + AV_CHAN_NONE, + // 40: half-way between centre of screen and right edge of screen + AV_CHAN_NONE, + + // 41: left back surround + AV_CHAN_NONE, + + // 42: right back surround + AV_CHAN_NONE, + + // 43 - 125: reserved + // 126: explicit position + // 127: unknown /undefined +}; + +int ff_mov_get_channel_config_from_layout(const AVChannelLayout *layout, int *config) +{ + // Set default value which means any setup in 23001-8 + *config = 0; + for (int i = 0; i < FF_ARRAY_ELEMS(iso_channel_configuration); i++) { + if (!av_channel_layout_compare(layout, iso_channel_configuration + i)) { + *config = i; + break; + } + } + + return 0; +} + +int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout) +{ + if (config > 0 && config < FF_ARRAY_ELEMS(iso_channel_configuration)) { + av_channel_layout_copy(layout, &iso_channel_configuration[config]); + return 0; + } + + return -1; +} + +int ff_mov_get_channel_positions_from_layout(const AVChannelLayout *layout, + uint8_t *position, int position_num) +{ + enum AVChannel channel; + + if (position_num < layout->nb_channels) + return AVERROR(EINVAL); + + for (int i = 0; i < layout->nb_channels; i++) { + position[i] = 127; + channel = av_channel_layout_channel_from_index(layout, i); + if (channel == AV_CHAN_NONE) + return AVERROR(EINVAL); + + for (int j = 0; j < FF_ARRAY_ELEMS(iso_channel_position); j++) { + if (iso_channel_position[j] == channel) { + position[i] = j; + break; + } + } + if (position[i] == 127) + return AVERROR(EINVAL); + } + + return 0; +} + +int ff_mov_get_layout_from_channel_positions(const uint8_t *position, int position_num, + AVChannelLayout *layout) +{ + int ret; + enum AVChannel channel; + + av_channel_layout_uninit(layout); + + if (position_num <= 63) { + layout->order = AV_CHANNEL_ORDER_NATIVE; + layout->nb_channels = position_num; + for (int i = 0; i < position_num; i++) { + if (position[i] >= FF_ARRAY_ELEMS(iso_channel_position)) { + ret = AVERROR_PATCHWELCOME; + goto error; + } + + channel = iso_channel_position[position[i]]; + // unsupported layout + if (channel == AV_CHAN_NONE) { + ret = AVERROR_PATCHWELCOME; + goto error; + } + + layout->u.mask |= 1ULL << channel; + } + } else { + layout->order = AV_CHANNEL_ORDER_CUSTOM; + layout->nb_channels = position_num; + layout->u.map = av_calloc(position_num, sizeof(*layout->u.map)); + if (!layout->u.map) { + ret = AVERROR(ENOMEM); + goto error; + } + + for (int i = 0; i < position_num; i++) { + if (position[i] >= FF_ARRAY_ELEMS(iso_channel_position)) { + ret = AVERROR_PATCHWELCOME; + goto error; + } + + channel = iso_channel_position[position[i]]; + // unsupported layout + if (channel == AV_CHAN_NONE) { + ret = AVERROR_PATCHWELCOME; + goto error; + } + + layout->u.map[i].id = channel; + } + } + + + return 0; + +error: + av_channel_layout_uninit(layout); + return ret; +} diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 93d9878798..8c807798ab 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -163,4 +163,30 @@ int ff_mov_get_channel_layout_tag(const AVCodecParameters *par, int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, int64_t size); +/** + * Get ISO/IEC 23001-8 ChannelConfiguration from AVChannelLayout. + * + */ +int ff_mov_get_channel_config_from_layout(const AVChannelLayout *layout, int *config); + +/** + * Get AVChannelLayout from ISO/IEC 23001-8 ChannelConfiguration. + * + * @return 0 for success, -1 for doesn't match, layout is untouched on failure + */ + +int ff_mov_get_channel_layout_from_config(int config, AVChannelLayout *layout); + +/** + * Get ISO/IEC 23001-8 OutputChannelPosition from AVChannelLayout. + */ +int ff_mov_get_channel_positions_from_layout(const AVChannelLayout *layout, + uint8_t *position, int position_num); + +/** + * Get AVChannelLayout from ISO/IEC 23001-8 OutputChannelPosition. + */ +int ff_mov_get_layout_from_channel_positions(const uint8_t *position, int position_num, + AVChannelLayout *layout); + #endif /* AVFORMAT_MOV_CHAN_H */ From patchwork Mon Mar 6 12:02:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40596 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587368pzb; Sun, 5 Mar 2023 20:02:57 -0800 (PST) X-Google-Smtp-Source: AK7set9KkvpcW0d2r2WLSh9aXuwQeGeuC6G3Itdvw2K2cHw5jo3kpXB26ZXMV+Ge8J5TccW/E7F+ X-Received: by 2002:a17:907:9611:b0:8aa:1f89:122e with SMTP id gb17-20020a170907961100b008aa1f89122emr12438651ejc.39.1678075377498; Sun, 05 Mar 2023 20:02:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075377; cv=none; d=google.com; s=arc-20160816; b=pWzM3O4nkg5M5wGlSKu+bcqHzOJDqhGgKqcOmqv9kyjBsGjIZoAnGEpR7eBaI745Sk jSKlNlfMBO8wcEioisgMon7XPKMGityyg388YXCt7gM/niSMr0WQ89ECe0ipNM6nlwpH tAq9LSj7QJvuQ3rJa9Dl03WFCeac6XX1HAbTFcdvVqfUzIvpKO/dAIlAGKygPk2CyZAg a2X5Y+PBWD/qKc2Pai/QTTunU77ZsrIhEj1QlDhlkVb5XNpW9KWxa10Xlm8b1UxKUt4m z8LAARq9SvSoYzSLIjBnPDok0xOBgm/dIVwHoxaFg2LRJcVNPiQt2Ct3BIsHjaJ7rtIm qqkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=5/B8UoMFPZR8sYLk0zmdl/JteEFw5An5mMNVR8/ZJGA=; b=VJ4FSuD+9xAVt6Kb4dbfZei7+tFWem0ht9UPDaII+9q99k3fQfTdPmKB0E3n/2tsoK iML0no5bTr7LpPih703BlsGeU7mHkSZntPkqLOAZG9O59Jfa2VMaLhUZcg1AS7fOdBKS HJWP3Tzlh3HQPAUb0M0bXmWgau7zI7NOjC2kWRzf344ZGHMuLJnpCmFFqHuWhFI8pkzp P6EEiftdhxMbzPatOilVlmYa89PT+1IoGZ6VqA8VN3zspUpTaI9nMIkKCpZLW4hnZTAK +7mEVe71UZnZQPlWMeCo/6c6sQDVTvTJmhblejzKg+BsH7eWoZdsbNyIzQY020l8Pd7f EwrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ibsYNAuE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n8-20020a056402060800b004c180fc7861si6916814edv.357.2023.03.05.20.02.57; Sun, 05 Mar 2023 20:02:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ibsYNAuE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B975D68BB61; Mon, 6 Mar 2023 06:02:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bSa/mmRnrPbn 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 From patchwork Mon Mar 6 12:02:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587464pzb; Sun, 5 Mar 2023 20:03:08 -0800 (PST) X-Google-Smtp-Source: AK7set+1Bs4cEvsyc7tQfOo3ujZ0dMYIGv9wh+qHCkud4pC+z60cAcxwd5arVFpCf1p0907RRgm5 X-Received: by 2002:a17:907:a04:b0:7e0:eed0:8beb with SMTP id bb4-20020a1709070a0400b007e0eed08bebmr12436681ejc.41.1678075388390; Sun, 05 Mar 2023 20:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075388; cv=none; d=google.com; s=arc-20160816; b=CYzqLBumYikrYoknHUSDDbqjLXENFcMSNNWy+xg1G78VQCWaSuOb8e3Q2LSbTD5drs ae6eTEbWXdRDZKboMkAppABIvvY6s9OviiOV/An4AaIUuFOwzf42k+I2K0A0soTs++/N GuB01X74OavRpzf3Ritr7wBLAFcRREzo+rkzw9usq2clYK/ZHF5mrOfaUZtWoSAMbpGF wzcBJQ3RyC9QLi0EfiOlVhJ3BBwFQyg2COGrz/0YrUmb/m+UTqR2ybLh4QpKp81v3frm t8dxtAajf/yNvaz3bLIrMux1I/5Hogoj/debPJ8wBpssua2MOv+Wwja+LNYTRTNbVtIc cpew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=DUWvGiD0pa9qOPs1n2Eda5HoA2B/pxoJluJ5yov0Qss=; b=r1JcE9b0ZdQIGo2Aeu0+1NHRJQ78tsOzXCadlfzKd7s0wYxee2ehdtQ67v5TzWMntk O/nPcnwcLVmKpNkKaWi/JtMUZqusSsxpTjG8hjVEuinFBDuLj9t71Fgb69KeGCgsD4wR pBZdMZzkcUeTpQStxSsTm1Vt0unybhBcqWWTt535IDKvRMuAVXgWtk6ukixoR8uE0yiY ixq518VYwh13ttaMgbIrNXLHnZP02/fJecIRIePNMIeLsfb2Zg4Av4IFjqret4TicJ4v daPpUkriFN+9sC4dPeR22DWMPzXZ+KS371dbcf2hq+7m26DzOQGJO1dIDxy+ZYsa5gHQ +OOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=o7oH++uS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lu13-20020a170906facd00b008c25e1c05desi8391104ejb.392.2023.03.05.20.03.07; Sun, 05 Mar 2023 20:03:08 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=o7oH++uS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B021468BB6A; Mon, 6 Mar 2023 06:02:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 5B73F68A5F7 for ; Mon, 6 Mar 2023 06:02:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678075332; bh=GSGF+i+gx4QLcyhnGFPOVMLZmW0B0ZzOnd6hthKdmCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=o7oH++uS8bOvhoVZkffIIoGU2EXYQKzGKeXcvomOA3E9NHqphX4xXrYso/AC8rP/e 29GfN2EQbhCxesmuqJPFtODKC2FHVBm46/Y0hUSxXQyKMnryw69UhRLNaDWWG3RPqQ zcD8IycyJNGrcb/qkgTeDkO0gZPu4FRAjA88wEpk= 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: xmsmtpt1678075331tbdjrxiua Message-ID: X-QQ-XMAILINFO: OfkeHAqGKDFbLwWqm3jBMT0/98LBUKAeq7pxVkBU/CRbav914761C9AKid+15H X/xnNLf0e+hhWElA97JFeeX04/jv6WTZPGtQViYlHyR4AnuG88k2sXe47uOoS/8v3FFLbfx8qm05 MHu73Xz3Od+bTSy/1Yh0nI6IgiaYNs8LZ0Uzra2iOv1UQUYV0TkCQliiURBqfTlzWfMhM3UzNc4Q tpEdl2A13BaLBtmFT4AOks8hDB78VDdXHEMKfn7RrGapsPOzlw8bckHdJCyMlDFmke5otH8A++5m esvR6VRE2mpQ39xS6hYNaXdEpZH3LYT4ulIj2AiHD15823f7sX3foameyZhf46l1nnmSOQOezxKE x3W3mn1gZowRGTLGpQI7b/2RPw/0kzVsWkwK+HID4dVFm7m4BWK/Arkq3rrvbUvdXYrMZU4bWmk3 tW8ELsmDVBBd4w38PLaWHu6HA9GXY62wxOpPSrKOGwICPd4aE/jb7uwn5sL4DLo8CVo1VmOxPHHl 9zHSYv/syHa5xeSfrBZFs7z51Jk9BYSvE9D4AIpE53yQ7p5pOsogEiwd2f6SgP0P7jplNAY59Ljs pUe1XIa1gokc8iJ/MPj8SZ1tFDRhcBfZlSAQgYphPU9QvTe5X+WjgMJRxBh2wCcibLMxB+eJZcP2 nJF0ni3o8SfgnUMblC75fKDFf/KX2OVYhAb/xkfA45LVkLnEwO7nUCOTZkw8Kw267UPMQyBRsc1/ d91ztMo1/KO4fRYMhEmvtXsil3B6xJDXvgRAxkwl1e3uiJNA6hs7FkxfxbCUsm2DUlBJpe3BADCN xASPyxTefgAoKaQlLzBiL+zzJJu6jX68zRO+qlM+Q0SPDW2vb/IbmYwwC43MsurpQWq4ZJKxNngA 9lvNIQxUMyfAcEkTwgmn8dmZxC+1x2KoqUUbDJbj7Jwb8VlNBoTfCvaB1m/iF2h/KQtda9bou+T+ bTILhgSALOFGa6mg8T5/eKdBD+Ulp7DqfJoWmj3JdoRR8Yc/5NTw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:11 +0800 X-OQ-MSGID: <20230306120211.1249250-6-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 5/5] fate/mov: add PCM in mp4 test 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KOdP+MEYgDW5 From: Zhao Zhili Signed-off-by: Zhao Zhili --- tests/fate/mov.mak | 12 ++++++++++++ tests/filtergraphs/mov-mp4-pcm | 5 +++++ tests/ref/fate/mov-mp4-pcm | 27 +++++++++++++++++++++++++++ tests/ref/fate/mov-mp4-pcm-float | 7 +++++++ 4 files changed, 51 insertions(+) create mode 100644 tests/filtergraphs/mov-mp4-pcm create mode 100644 tests/ref/fate/mov-mp4-pcm create mode 100644 tests/ref/fate/mov-mp4-pcm-float diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 8a7218a215..d795445691 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -165,6 +165,18 @@ FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-channel-description fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" +# Test PCM in mp4 and channel layout +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ + += fate-mov-mp4-pcm +fate-mov-mp4-pcm: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-mp4-pcm +fate-mov-mp4-pcm: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-mp4-pcm -map [mono] -map [stereo] -map [2.1] -map [5.1] -map [7.1] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" + +# Test floating sample format PCM in mp4 and unusual channel layout +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ + += fate-mov-mp4-pcm-float +fate-mov-mp4-pcm-float: tests/data/asynth-44100-1.wav +fate-mov-mp4-pcm-float: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-af aresample,pan=FL+LFE+BR|c0=c0|c1=c0|c2=c0 -c:a pcm_f32le" "-map 0 -c copy -frames:a 0" + FATE_FFMPEG += $(FATE_MOV_FFMPEG-yes) fate-mov: $(FATE_MOV) $(FATE_MOV_FFMPEG-yes) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/filtergraphs/mov-mp4-pcm b/tests/filtergraphs/mov-mp4-pcm new file mode 100644 index 0000000000..7fa25a2c3c --- /dev/null +++ b/tests/filtergraphs/mov-mp4-pcm @@ -0,0 +1,5 @@ +[0:a:0]pan=mono|c0=c0[mono]; +[0:a:0]pan=stereo|c0=c0|c1=c0[stereo]; +[0:a:0]pan=2.1|c0=c0|c1=c0|c2=c0[2.1]; +[0:a:0]pan=5.1|c0=c0|c1=c0|c2=c0|c3=c0|c4=c0|c5=c0[5.1]; +[0:a:0]pan=7.1|c0=c0|c1=c0|c2=c0|c3=c0|c4=c0|c5=c0|c6=c0|c7=c0[7.1]; diff --git a/tests/ref/fate/mov-mp4-pcm b/tests/ref/fate/mov-mp4-pcm new file mode 100644 index 0000000000..b34f5e59e1 --- /dev/null +++ b/tests/ref/fate/mov-mp4-pcm @@ -0,0 +1,27 @@ +1573ecbd24a65a6ec23ef08a861614b3 *tests/data/fate/mov-mp4-pcm.mp4 +10589277 tests/data/fate/mov-mp4-pcm.mp4 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout_name 0: mono +#tb 1: 1/44100 +#media_type 1: audio +#codec_id 1: pcm_s16le +#sample_rate 1: 44100 +#channel_layout_name 1: stereo +#tb 2: 1/44100 +#media_type 2: audio +#codec_id 2: pcm_s16le +#sample_rate 2: 44100 +#channel_layout_name 2: 2.1 +#tb 3: 1/44100 +#media_type 3: audio +#codec_id 3: pcm_s16le +#sample_rate 3: 44100 +#channel_layout_name 3: 5.1 +#tb 4: 1/44100 +#media_type 4: audio +#codec_id 4: pcm_s16le +#sample_rate 4: 44100 +#channel_layout_name 4: 7.1 diff --git a/tests/ref/fate/mov-mp4-pcm-float b/tests/ref/fate/mov-mp4-pcm-float new file mode 100644 index 0000000000..851b79090c --- /dev/null +++ b/tests/ref/fate/mov-mp4-pcm-float @@ -0,0 +1,7 @@ +691a76a847e0f3720c09cca341971f19 *tests/data/fate/mov-mp4-pcm-float.mp4 +3175929 tests/data/fate/mov-mp4-pcm-float.mp4 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_f32le +#sample_rate 0: 44100 +#channel_layout_name 0: 3 channels (FL+LFE+BR)