From patchwork Wed Jul 26 03:45:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42981 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp262512pzd; Tue, 25 Jul 2023 20:46:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFGxYjWnT5hx/MEPCW+gAoeylFe23h5wdfPqxsi6XQipxe11BaenBM6MMjWla+FooWOofOg X-Received: by 2002:a17:906:305a:b0:992:ef60:ab0d with SMTP id d26-20020a170906305a00b00992ef60ab0dmr551778ejd.69.1690343172025; Tue, 25 Jul 2023 20:46:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690343172; cv=none; d=google.com; s=arc-20160816; b=yOocdBmm/axS/ks9mi/ahRYunvyOpN0E1Nv3trl3u9zT2MgCMAuy+c+hw4HluqwNn7 zJpWX7ReznjYzF9dvHwYQtsIo9mE9HZETUZDGxG6FNjap9CUeX4HNXI9TVroJpDVFZ0m vzufzq7MkNZvQLVBkc7nVvqGK4pixrKNl6scr1MXvl5bQ6bMvTQTV2MuDkHlrdDIWzLd UoASAW4YieoQGjEOn+gmw3275fTpXxTzQWw3Wq5I7w9I3RwNFCLAuhBHTqR7crW28nLz 4pWU+QtDqY5Qy6mPcVRMatBeinWA00XZSJV+GuHAYIX2WI8boEAzM26ZSIPFdCCCkOX9 gPGw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=a9w2zLQG7HjWkUpD8QKet3N1LB2pLGVjDu3Dyp36/co=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=lRJCm9++DFTlECxbvrsz5NGuAoQ9PlEz4EO4TwSyjPSdAkF6WTC5Glzy/BThNGI6pK ixnqQPv+nPaJ1pdGqHtZVPettAj7mczdifUs882/sZpqzZ7CZEDW+OxKTil8SWi7gPuT DS9bJs0ZblYR+OiENDp74Em1MGOyv3aNpJXWvBVoKHc2CgmpZ6fwMhp48Fwv386mtvFR 9mqK0yOWFMGmzkjdS4vXBjcvcojVWlOCJFsVdgCBxxkz2VO+0G4qHSbGZCDqG/L4rwcG Te1+EuEb1/pR1Lqd1RJ+0/4SRd4/sXtntxP3oE27RR7GKsKnBSKkbifk7PMflR7oafAc 4pDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=a5mb10Ou; 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 pj17-20020a170906d79100b00991f1e4b044si8476618ejb.336.2023.07.25.20.46.03; Tue, 25 Jul 2023 20:46:12 -0700 (PDT) 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=a5mb10Ou; 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 5E10568C805; Wed, 26 Jul 2023 06:45:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C69168C649 for ; Wed, 26 Jul 2023 06:45:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1690343141; bh=BX+tMZcseGCpcPRgqM4QckCBXl+4CZ6SXVa7p56FIcc=; h=From:To:Cc:Subject:Date; b=a5mb10Ou6HmwOqeyWRhuEAS7h5GxWcvA5nLQAIE2txVFa/epmOxnmWFCEs0xdF75a Z2S0hcPCGzl3DL0drXrqFiodlcfxQQn+Re9T4K1xjqLhZCvtLpei6vN4yGj9rex8uR IVOs1n9Icx4omka/AGOJquLaHmX24vbJ2XMBiFZU= Received: from zhilizhao-PC5.tencent.com ([119.147.10.199]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B68AB0A2; Wed, 26 Jul 2023 11:45:40 +0800 X-QQ-mid: xmsmtpt1690343140ts9g34x7j Message-ID: X-QQ-XMAILINFO: OdIVOfqOaVcrRDD42snjaB+YGE629ai8cD/iMd+A3jYNlR3kEfe/A7vxHiMjSD y7Yv7PgUe6FIBgzm99hR0+TdiNLhf9bqfcMq7mkw2yl0kvJsTIGDOYL9YHSrIzsDMzp5LizZCrEb sh03nEgrEtaGfzfs6F0Q/N5DcOxbedzlMUSk2G0BJVFAPHNbOaLIDPqzI6xA5Mq/u9a0+1s9s51l DI56JiQLWIsRp9cLDHxRXx1L2VP19u+mFmz+DNCuTMi5Qo3di0G2aKCEbuHWR4ymB5RmBqtCKv0D Mu2jd3kEjjz8KuFR/r0V5oyqIjLZhh06ITAQL+/RuechPnlGmLJERThXgdh4QvI4i7BJHFs9zVTb kjCTHTjhOUXcwSY5KDIACvU589tILfj6+0uGs01cSosYI05tOLc5Cg91o8Y7DpsKCR07YhFjVLyt N4+RIUhI5qCyF0uYbnqkSmNzl7pwc9byWiunPyji00i6gMrwnVBdcni7Xcyh6JVXg89TPl/H41zO kGuZrilE4HAvybtD03Vgj1Z22Fddb/kstUy21e85vIwG6spXQs91phIPN0g500AtmFPlLyv0DH/R sWEAd/lUV1ktcJ6+xyGG0+xc6Mducki4xO+7KZ5aHtr28EzQBaaVbawwEjR92SnrQUacCj8t/S8y /w8TcK3tD675tSgAHsCBlDusgWDSIRGGy33NdXEb19/tM6zlp2EonAVpGOlVF1iqSzqURKsXSgyS vpc17GiyZiKTO49nNldaeuLAd9F0tw7XPxYCudDzyN5dbveP39VllNRtDjKBBtB3OS3+GhKf1h+g V0erjz38Tw/6CcDe9snohtHLGesg8dpdNF8g5G+n4y4SiRDQe4CeGtD4EHlgAPp/+4ibuxXY9N+3 Mx88jCrY+YeSV2wmVhOGyXhS5wGmVQoKRNIrI0ymAbSuSTirLcA89FOa+eAPFMsJc6SFjbzpXauz +iM5AGmIGuk3428Kus8p2SKJ9/J7zf X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 11:45:38 +0800 X-OQ-MSGID: <20230726034539.29616-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/movenc: fix sample size being zero in pcmC 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: Pl8FC5Ii82ru From: Zhao Zhili bits_per_raw_sample might not set when remux raw PCM. Fix #10433. --- libavformat/movenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f1cc80b1b3..7ef6cef46a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1225,6 +1225,7 @@ static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra { int64_t pos = avio_tell(pb); int format_flags; + int sample_size; avio_wb32(pb, 0); /* size */ ffio_wfourcc(pb, "pcmC"); @@ -1237,7 +1238,11 @@ static int mov_write_pcmc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra 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); + sample_size = track->par->bits_per_raw_sample; + if (!sample_size) + sample_size = av_get_exact_bits_per_sample(track->par->codec_id); + av_assert0(sample_size); + avio_w8(pb, sample_size); return update_size(pb, pos); } From patchwork Wed Jul 26 03:45:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42982 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp262545pzd; Tue, 25 Jul 2023 20:46:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlFgT9VL7xwTi9KHrEhKheH219ecF0KfqWAdE46txCsm6OiM3LOc4jthNdd0NYA7uSLgkHnF X-Received: by 2002:a17:907:78c9:b0:994:5577:aef1 with SMTP id kv9-20020a17090778c900b009945577aef1mr636168ejc.7.1690343175297; Tue, 25 Jul 2023 20:46:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690343175; cv=none; d=google.com; s=arc-20160816; b=ItlLNJnAf9t4fzp+OcYaDcRhJQoThEongIRgccJ+6gzcba+A4kOCE7OSOWsWgohN3t wpI0m8TtfAwyPeCSf9/CPc/8hgQtq7ML61hmyjF8HDM6SpPlEVhxrn4wjhQAUg0Saa6I rJc0ulMym4bhq+dCxYyFnl+Plny7aC6sO7C1FwWGxOVvmGMK0O34HFU3cJOAchXFAo9i skbPzktbISprKI2l86D5kEC9D5g5YXICfZjM6LX2AM4vzKWTH0/73X5mHiuaXoNuc6ZY 8k0fWWiRBYkYmKKuqUE1RPl2yH81h35qO9HbLoj99ScHVZLpCx6DDKBmGs5XyY0mkfwQ bIMw== 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=9DnqNLn1JYgJwmf911iPpEAwR/jrTTbNPVEwuBd+Xio=; fh=fgsEC5uuZOuzV7r9mTXgvURIGbxpRO08JRnNlycBIXw=; b=k21qIgZcDlt/pA1OBuZ8w49DmYPBCVfNHOBw/mCSIX9wpRoom6HgwOR1TQBduFbY3r 4Cllsn1uSv0BFh4zvCjBSMtdIpwKQOJvuwcQ5Lz9jjipEJ9QHTUB1iBKADHgcxqkgTad K1EYWzaRDNr13EdxldjLjsDIDundCN8IVCrBcPQ7rCqF8mxLjDl6tFjVA/3YmKdrGsI7 dJZK8D3SCTcrU8tHxbZJNtYYGKh+Q6J7vi1bPVEWRXmtWkWAk4i8diTtgU5lkx4EgHuc hlkVGm2cODboxpubUuMA4OGOOf1GQK5CWvdECiASoQ8UM9wPPRUTirm/5LMcuS55mU2J 4ZEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=xHruWwhi; 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 a23-20020a1709064a5700b00991f8bce3cbsi8890165ejv.722.2023.07.25.20.46.14; Tue, 25 Jul 2023 20:46:15 -0700 (PDT) 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=xHruWwhi; 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 AA60D68C85F; Wed, 26 Jul 2023 06:45:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B4F68C795 for ; Wed, 26 Jul 2023 06:45:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1690343142; bh=h+HVsTc5S9HsKHcxndqbJMEgKMOtYZaPLTpOhA2lClM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xHruWwhiyPQFiMYe8oaYfX3KIWAPCLPXAZBwr4f1ca9H/ZjnPuQKwWr8mj/89+Ee7 R39Vjp9Yr7V3BViJOjQmKst8ofKAZcaDy2F2z6PAJQZvPj21JYmdp4RirBzTo92crZ 8/NOSOx/6BxjfaCUEnLJzp+9V3tmVaAs4f7IoNBE= Received: from zhilizhao-PC5.tencent.com ([119.147.10.199]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id B68AB0A2; Wed, 26 Jul 2023 11:45:40 +0800 X-QQ-mid: xmsmtpt1690343141t4yq7u01u Message-ID: X-QQ-XMAILINFO: NvKyM24IHTKSBs6B8jgtCCc0EVGDa5HWv4NELZ+ry5TjEA9oMJUg/ReXC0i9Xc nhB12NNiSuem2o0ZZT2ZdN0gklOqMzFCJQ2kDPWNHa65CMtueDRicHLIwWKCp38/M7AwGZEUovOc eM8hDgz9mu5U1Q2kkr/D7R1SLoUL6ik90sh90SCxIJAeEnhmsf3tqov99REKMgORDgtZ8bRJ9eCz tt6rfZlfBrEERyof6G+f2crbpbDeRUZT16nbswCMkz9wIzZyZlWJx1pQ8mkx+GjN3HWQMSGmJmyx FxfSQsRcLQ1J3dMIg62N7J+SboLF02N2LX5yBRJc17oiztF6B2IGZ2kTR4E/BV8df0poF6vbMyr/ r2C+PqlXWNnWvzp43IwJ309uldTqCuxODlDY4S0JSj2GJ2nJXUgr+7GIDnoD5PsqFK8agTMR7AU/ avkXc7bDOD4WH+97JCTMb1HcUbn/RGMeu7iphB6jNvkkuvsFw4VjbDXI5CCq2EAJ9dTmxox80rq7 VRIEkZzedkVHAWTDFVx3QFIo6Q2qP3l8HrbC7jox1rJ1wa2GEi/F+Gg4L6CD25I88IeF67W2D74D cKEmnbmBUd+V+0Wrqgvi8MVfo6QRlx6debX3S8k2bviemYvh1oMm/XrP9qt/rUhibmEQIzMsl728 6cvFgUN6K5MqrNjNa8eJuvyKG4k4JSgue1zSlBwSE8FiysbRbzxxq473RMpntcj/1pQdhtH5dPAA jcKELr2VLFPrexFojlFmhT/UPAmTNN2tnkUyT2GhFB0ly4pXhmKl5dRzlkfwswWRvB9bdsjc6Ul1 x/2cvQ3+XoC9AL3tdbW/HvZCkYZWQjTzuKAtXBQ4DMIlh/sRKo6JvUUkGVPN852hyPkzuK9DGCxa X5RaDuOLMfyQKLD7QZAyUFEzbP25I2ghtu0zKlNM/AfdHLJo2z/I1DsrIgbCe914FuhboveC+4od egaX1MwPNTbQ4xgE5OuwmEB1WP41jC/iOqVo1KyvW6jd7+IhMSrw== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 11:45:39 +0800 X-OQ-MSGID: <20230726034539.29616-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230726034539.29616-1-quinkblack@foxmail.com> References: <20230726034539.29616-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fate/mov: add remux PCM to 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: YkvoBHzUcHnR From: Zhao Zhili --- tests/fate/mov.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index d795445691..6cb493ceab 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -17,6 +17,7 @@ FATE_MOV = fate-mov-3elist \ fate-mov-bbi-elst-starts-b \ fate-mov-neg-firstpts-discard-frames \ fate-mov-stream-shorter-than-movie \ + fate-mov-pcm-remux \ # FIXME: Uncomment these two lines once the test files are uploaded to the fate # server. # fate-mov-avif-demux-still-image-1-item \ @@ -177,6 +178,11 @@ FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ 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-mov-pcm-remux: tests/data/asynth-44100-1.wav +fate-mov-pcm-remux: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -map 0 -c copy -fflags +bitexact -f mp4 +fate-mov-pcm-remux: CMP = oneline +fate-mov-pcm-remux: REF = e76115bc392d702da38f523216bba165 + 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)