From patchwork Wed Jul 7 15:41:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangyu Sun X-Patchwork-Id: 28854 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6203988ios; Wed, 7 Jul 2021 08:49:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWYmVMf+TkA7v19b1ZwRFCGdIUCdxb3l106wtfaQY5Jhme65dZ4D31L7hu9UC3ohXdjl/Z X-Received: by 2002:a05:6402:34d3:: with SMTP id w19mr21197559edc.53.1625672963212; Wed, 07 Jul 2021 08:49:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625672963; cv=none; d=google.com; s=arc-20160816; b=XvJaUi5l6MVwwnxZX3o6vciIqBYlmEPp+1MJfmHc+k+anxJyyvjRFjuPNNBwJKFTST 0eTYaNJIXy4d0s6kHG5+wkO1rKxeEvjVTpAdjaAoTgKJwNijYiAZaUq4yGpStigIUj2p /OZBKTcXuwCcn26sO/yLoQvHbctn3Hcfh+ahyZhfzj+ZVn1Ft8qduwU3HC7v/V7BhVTk qRwoiNSqQsBQ2BDsaKB765w9DMK2KvpkNAbf1OvhcbUFpNTZhQ2naSvNQxmBUOSxxMZl a7Zb5S1iXYf/8z3aLtLJPsXcMi1LFgjiZUHWPC7wzmyjCXZRrpBKvxj34IR/EDUQldTJ dSNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=zg0FJmq32rv+zXTXI23oBTZuGMbJef0ppMIleTVl4OM=; b=tojU31iWxd6yW5e/dQO4evwX7SlKPeh6IqTHDqC81DiD5Cpa3Rgp5tgLHTjfCvvdvZ 4F6gtmi3l1PuLgE7oBltHMC6Ju9dxl5lIs4OnVduKEVLJK+cxYtk+mnEmPsJs8cffN1E rt8x1YcUJhtre0gd3SLcPeNp0T7mEq0lkjtIaBuNoPoQBtztwjpbjMFwNYatIF5PCgWK nrV4XDs2XCTMqGfVgvyJ7D+QAaDZXpyQCZZidhQRHqJfGH/GPRAzREAjdZfa8EVtVR7c AKCnHCc4KLlXKGRvPgcWGXNVwpvrnNvXJfeG6QXw4emZmSeXsTyoO3qMKGcyPCzTwBn5 hXSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="YCY/Hxep"; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a4si19887582edj.511.2021.07.07.08.49.18; Wed, 07 Jul 2021 08:49:23 -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=@gmail.com header.s=20161025 header.b="YCY/Hxep"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AF4468A758; Wed, 7 Jul 2021 18:49:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FC2768A704 for ; Wed, 7 Jul 2021 18:48:59 +0300 (EEST) Received: by mail-qv1-f46.google.com with SMTP id i4so768611qvq.10 for ; Wed, 07 Jul 2021 08:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vA2DaF4Ha0PX3+0h0zB9XgVetAMBIpapNAMbYsjgpEQ=; b=YCY/Hxepb+skGscOQmTRN9AoVkOzCAy6IZJeTFO4bxTDBQrxGAHN2+N8j+bftu4u/g FbvcW4FCeIMcMoFhAJv7VFsZ0lGe7DlH3GTQnK734GlvvqCsxQwRSBAnVdJDcVxWZ511 IWGHkbb627T1ARZCRb/ac5CjAjZ7DeaGkGycIgygXX12FVotMRUQVTbdUvSS6EacxghL IJ6Hi1oWauHC9UlKLekQuJYNcY0cHDranJz09gTxNEv0i3xJ7k85X1z5hRGmyTtuYjPC w3/Du5L9xExGcSFmzpz8zCvKSRDdY/TfUqsNNahSShkJPuwzOxU2W1SFTdQfriImD/uq rv1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=vA2DaF4Ha0PX3+0h0zB9XgVetAMBIpapNAMbYsjgpEQ=; b=eUUmc2zvbMXG11Rj/4Bl6RMNlZi+pk/7mgfSQWkI1AxpTrZsJ7PCDTFEVqTx2/mkng MnpWX9jm8oIo2sFY3w0xWkPepSie4n45BWW5WYmYFPvQEGboqBnbBZmipiLY6EbcuwiU YV/ByOpSr/V9pWzD6baAEz8Z1rVfP3ynHIzzlFGEuKBqu8dhWGazxVaxPf5Zg8LrbKSd 1Fucs+bpuzFqbz6aWC/Q7M6eftCvFzIC0e8SZ01436fGMchyqi3nyEcdi++xPGFcc/Xz RYjsnIhBS5xKOwDzt/qMDpdN55cS3qr4R0J8LlDvcPdPJrUwL5aXx7zCxkFvTsjzjfvk WGLw== X-Gm-Message-State: AOAM532jMl3fOA0ipmKyO1rMm/y+JmbSZZQtjdx3sPx1QqPSdqaOF6/M /mJZSGT+JpHnAASVETZPOaDuDDc9QFIe5A== X-Received: by 2002:a17:902:aa0b:b029:128:eb4c:15e5 with SMTP id be11-20020a170902aa0bb0290128eb4c15e5mr21297412plb.45.1625672496626; Wed, 07 Jul 2021 08:41:36 -0700 (PDT) Received: from localhost.localdomain ([98.42.211.210]) by smtp.gmail.com with ESMTPSA id co12sm6750829pjb.33.2021.07.07.08.41.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jul 2021 08:41:36 -0700 (PDT) From: Guangyu Sun X-Google-Original-From: Guangyu Sun To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 08:41:32 -0700 Message-Id: <20210707154134.59769-1-gsun@roblox.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/oggparsevorbis: Update end_trimming for the last packet 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WyjijsRhCnwk Without end_trimming, the last packet will contain unexpected samples used for padding. This commit partially fixes #6367 when the audio length is long enough. dd if=/dev/zero of=./silence.raw count=20 bs=500 oggenc --raw silence.raw --output=silence.ogg oggdec --raw --output silence.oggdec.raw silence.ogg ffmpeg -codec:a libvorbis -i silence.ogg -f s16le -codec:a pcm_s16le silence.libvorbis.ffmpeg.raw ffmpeg -i silence.ogg -f s16le -codec:a pcm_s16le silence.native.ffmpeg.raw ls -l *.raw The original test case in #6367 is still not fixed due to a remaining issue. The remaining issue is that ogg_stream->private is not kept during ogg_save()/ogg_restore(). Field final_duration in the private data is important to calculate end_trimming. Some common operations such as avformat_open_input() and avformat_find_stream_info() before reading packet will trigger ogg_save() and ogg_restore(). Luckily, final_duration will not get updated until the last ogg page. The save/restore mentioned above will not change final_duration most of the time. But if the audio length is short, those reads may be performed on the last ogg page, causing trouble keeping the correct value of final_duration. We probably need a more complicated patch to address this issue. Signed-off-by: Guangyu Sun --- libavformat/oggparsevorbis.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 0e8c25c030..c48658ceda 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -492,8 +492,12 @@ static int vorbis_packet(AVFormatContext *s, int idx) priv->final_pts = os->lastpts; priv->final_duration = 0; } - if (os->segp == os->nsegs) + if (os->segp == os->nsegs) { + int64_t skip = priv->final_pts + priv->final_duration + os->pduration - os->granule; + if (skip > 0) + os->end_trimming = skip; os->pduration = os->granule - priv->final_pts - priv->final_duration; + } priv->final_duration += os->pduration; } From patchwork Wed Jul 7 15:41:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangyu Sun X-Patchwork-Id: 28855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6224034ios; Wed, 7 Jul 2021 09:12:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwO5QzDr/IIUmCYZGk/837fGndnJsLB15vKCnmMy+d0CCPQReWiRA1UtxK7UnEa8eSOCJGJ X-Received: by 2002:a05:6402:34d3:: with SMTP id w19mr21346119edc.53.1625674356439; Wed, 07 Jul 2021 09:12:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625674356; cv=none; d=google.com; s=arc-20160816; b=f+WdHtyAnkSCk2RhZuXiVqnCRPBdwNVXFXnUogYMzAagFvB0+Vvx6BAd96kTry58KO Pc6ffrkQmc9EYSqo5NukFNH6s/84zK+sSw25L31E/0IQu5SyOw1ZOTdXs1qpzfkGdvgZ FeAKTSstUDmCcLhSNhy3uEVtMysxgI3Vz818/Un71G6/tiD3LEO/soXhUfmz48LLMvMo MsR38EGxD9+yk5Ve0hhArZx83Zr5T4O7tDrXxY4/LbZGOpAuyyXQrUqHo6IVoCZ622aU kfS9tap0Q42dtNHeuT0PNKcUaNvcIIbgdCvgeEDLfw2tntldXRTOzxu2FLK97xeda8Gr LJhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=tnBbaAzaRhkjV+QKh/KGH2VavVth7Cxowq5hcntjdR0=; b=V/ebwO0od6tV49hnKTKrXei51bbXUdgN2WTu3jZIpABVzIK8bWi2tg2W5WIcV/xZUc XsKiOZtM9PxEIT/7tMrI38mAjenFDfKuK883aESIHdcp5NIF7a0Xf4M/FOpI5+iuaSqt rgChrP1aq+c7d6yAfi0daweX9nv2HBaGvCoTEC/w7vrOHCXfd3ip1P0tPSRRTq7tRly7 cDxDwGAGIg9dYgih1aMnrY4flamGI2eS9tG6FTQUFoykW2kXPxyviy43XkEC6b1WRkCp Cy8T1Qp5xraU6lKGV7lMQ6ueCFgUzIuEqMay0v7Ra+kq/gFV4lGnnC7KgJtbuawdjBrf Y/XA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tbAzlPcO; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id el21si18308704ejc.403.2021.07.07.09.12.35; Wed, 07 Jul 2021 09:12:36 -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=@gmail.com header.s=20161025 header.b=tbAzlPcO; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7115B68A57A; Wed, 7 Jul 2021 19:12:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F17D968A57A for ; Wed, 7 Jul 2021 19:12:25 +0300 (EEST) Received: by mail-pl1-f176.google.com with SMTP id p17so805717plf.12 for ; Wed, 07 Jul 2021 09:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IXgFdaVDeBztTTJqVgTJKljUNvzlA3B+zgUNuKEXXek=; b=tbAzlPcOmlwmzlS69HbLVRajODXddL5BfHb3oFpWHcqYqPSh0f/1NOosfeWIV6DJaN PLeTDsZ3HZ/cZXwu83KNEx36+bKZ9ON39f+PKjbU1fek9SciCC3FSu0A1tc4oI17w6zj mVRjfrfy+cyvpOsu7h4L9FwGEOH7snBFEbZP0dSPF/mY8H/vSe0jrpb6tDsvc516kjOj 3EAqfo70aAFA/D34ceORQo1Y+g0gZNEG8jInqt6YW274vs8bbJhcyl2xo9kvWDkvaKEe mfmCY4E9bvAyRfZsRHz7brt3CBFm3oePkSpXuQf9cOJ+deplKWjRfllcMM4fsLun/RWe Cz6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IXgFdaVDeBztTTJqVgTJKljUNvzlA3B+zgUNuKEXXek=; b=qwVm76ZAOcO6myiPK+VX84jrEUZlM0dD/rDcOUwPsje8xFkiYvGrZcParvKEck3ieC Fo/5c7XAmwzWzPgSn36z3kVA5gBYYdH1emFELPltSb8msmAsGPptkzcOyqlDBWEVmYEg 0qVBUbkcfv3UEzkeZ+s3tAJo+SF3i4mqHDhLP1yZfb6L5y/uJIEeePXbfNHZVOtBjoDJ /E4s9ij+LOteJldutwrSjPtsp7ULwrDOlHL2P9ftXqfKsi3UTCRp1gvNoD5IZWrYsqms U37NemoVAAKriUK2dYaTglqIeXHZUzPnTYkD/3+bdREY+nnrf/PZqMuG6vxpLBwMnL8X Xj+w== X-Gm-Message-State: AOAM532wKxB2hPEaKbtntsICfRkwkZB5929lrpyiSHzVzIuGUOlsHvEO 0997aougK5OOkSDKqBYMknfqymNdBtBuiA== X-Received: by 2002:a17:902:d503:b029:129:586e:451d with SMTP id b3-20020a170902d503b0290129586e451dmr21782572plg.1.1625672497479; Wed, 07 Jul 2021 08:41:37 -0700 (PDT) Received: from localhost.localdomain ([98.42.211.210]) by smtp.gmail.com with ESMTPSA id co12sm6750829pjb.33.2021.07.07.08.41.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jul 2021 08:41:37 -0700 (PDT) From: Guangyu Sun X-Google-Original-From: Guangyu Sun To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 08:41:33 -0700 Message-Id: <20210707154134.59769-2-gsun@roblox.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210707154134.59769-1-gsun@roblox.com> References: <20210707154134.59769-1-gsun@roblox.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavcodec/vorbisenc: Add missing initial_padding 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7F7Up6fpeTlS Vorbis has priming samples at the beginning. If the initial_padding is not set in the encoder, the total sample count will be one frame fewer than it should be. The result is that we get a truncated version of encoding. initial_padding should be set to the frame_size used in vorbis_encode_frame(). Signed-off-by: Guangyu Sun --- libavcodec/vorbisenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 332c09f9a1..72c6ba1130 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1287,6 +1287,7 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) avctx->extradata_size = ret; avctx->frame_size = 64; + avctx->initial_padding = 1 << (venc->log2_blocksize[1] - 1); ff_af_queue_init(avctx, &venc->afq); From patchwork Wed Jul 7 15:41:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangyu Sun X-Patchwork-Id: 28853 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6202955ios; Wed, 7 Jul 2021 08:47:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMP+9ZjsQR/QWzF7bL/ih0X3cWXBwPq8W8a83z2UtjcvFQb3uYOsVLr1G9MCZ9Su2nj2zG X-Received: by 2002:a05:6402:1cbc:: with SMTP id cz28mr31642522edb.246.1625672877738; Wed, 07 Jul 2021 08:47:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625672877; cv=none; d=google.com; s=arc-20160816; b=AB+z5lyOdVSSqAv70kNIrJhy7uCfoL062qZE8Uo58wC79YKcn3M6Jyb23+FIInPjGc /MtlXK/ilWrFxlYIYY+GUE2DZGVagZ1iGavYPioYLYYtKFdU8CDbcu0irN8vdqdsFvmq Egr64Ugo0Qzlwj+Rm+2AVLKaqXN9oTNHCJRffCJyBErx+YqCBIbpgCm4+E8GxkMxPzqW hdLU7V/jB15t0iKAq7KwyyEt8wlyOSst+wR6CgJ72GhZGiEMx2uzE3+EqLY43TaoAAho WGpgkQPR+hQIFPfRJlXq/z7ofeCcsrxN8CZvQRvV4s6TgvYJbcf9pWMTALbIax++y8Me Rfdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=WEIcQvYx09+3P6A7le6Hr0GjC8h5dfgLAiZbiqcUuXw=; b=PogpeWl/ql7Lxl8G4aRKNIylvILeTaTvWZQO7/L+j6ulseQfn5+y3d1AVt+L2oVhTE YSMhORuVjh8rknqNDzTgdzJZ4R1hekJtJ2uTJx5UrHNVb18zeIIMsWNuRmyvwVzQURnH dvFT5OS14u6066C1bOahPGanOJG/9TZ8+HvDG+/3clLYyY8LEkUtC+s8MdzPWXAVJpfJ /2D4J1S9+WFivYyT7/RGw7tTO20XWkYUMteZe/vVitRjFGYyM8vcax1fkSErwl5x4phe cPdhtQ0bGnI/zFGesjc63rcG+QdnkYg1Crj1Yk34jm77PCjd5synegIqEPWWOTO1DX4b l1vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=orerz5bh; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eo22si19321508ejc.594.2021.07.07.08.47.56; Wed, 07 Jul 2021 08:47:57 -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=@gmail.com header.s=20161025 header.b=orerz5bh; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D25F868A701; Wed, 7 Jul 2021 18:47:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E96F68A4DC for ; Wed, 7 Jul 2021 18:47:47 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id p17so765858plf.12 for ; Wed, 07 Jul 2021 08:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LqlleCUmNbggR178B3qmQn8ZU8Zj55DOj/gBhYkO0/U=; b=orerz5bhcRI4lTw5vHJAEy1GsqkvHt6KODebPDQgt2bmqnZIGO/c105a9bHG+WlEql mLOQ4Bi5r1k9pjcJ2btOa1BKNl1x24dMwh6QHafUy04thU7a82OyBwLqlomJae9IL6mP wORLS+SgoWuCeaUs+j7CBG1GAySu2ltNOu6y9J2j8cB8JttxhCrxkWn2lRg7p8C80g3B X7WTQ6VBU9js+y4H7FRCnc23tIaVfWtsJOeDlHB8rxspQI2TW85kRGjNwtv0Oz51lBdd pzA4eSTWKX6ZirHag3HOFMvgx8yzCYghAbcZMQ4NECzizHAiC+bJU4D/RuyYX3nRn/qp q/LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LqlleCUmNbggR178B3qmQn8ZU8Zj55DOj/gBhYkO0/U=; b=pf53DzgHmU+KhMyJSYd+6CXGScQFHaNGIG+bk5BY2vS2yru1/5s3tfV9BHOTOJMJ+X 1Mcpd1zDwyocWKRjqEDjnz5vL7Oyn1y/DokTLo91ZthAB0eP5IByVboh+8J6hTIMJ3QQ I6FLtwdR09wtbmRuntJFQWcnmV7DNRSB4b3lwaFT1ouTV87qt9meg1ogNmJ/jJf6sgQB F9t0nrxzC71jpf1w/wHGfHpj9Ee1p1C26SOI3L3wcY6XVja1faLa0QUpjrvxNxbmtt5k S/mhN1udImDBdgQQbGVh5wgQBjOi6J3Qa9fiI74rmuEirmsAZ4gDyS8PwMGnrYWlrXNF D2Yg== X-Gm-Message-State: AOAM5310TEkCyiJ+/TD+/Z6D3n9f65SM5qe8nEeXdjE2GPUCbaibRbIr bfht6eZSuLMz5YQFYfCfgoos0ndv/mElhA== X-Received: by 2002:a17:902:ff13:b029:129:9a0b:c2dc with SMTP id f19-20020a170902ff13b02901299a0bc2dcmr10747341plj.45.1625672498246; Wed, 07 Jul 2021 08:41:38 -0700 (PDT) Received: from localhost.localdomain ([98.42.211.210]) by smtp.gmail.com with ESMTPSA id co12sm6750829pjb.33.2021.07.07.08.41.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jul 2021 08:41:37 -0700 (PDT) From: Guangyu Sun X-Google-Original-From: Guangyu Sun To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Jul 2021 08:41:34 -0700 Message-Id: <20210707154134.59769-3-gsun@roblox.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210707154134.59769-1-gsun@roblox.com> References: <20210707154134.59769-1-gsun@roblox.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] fate/oggvorbis: Fix tests after fixing AV_PKT_DATA_SKIP_SAMPLES 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GIJklgLING+D After fixing AV_PKT_DATA_SKIP_SAMPLES for reading vorbis packets from ogg, the actual decoded samples become fewer. Three fate tests are failing: fate-vorbis-20: The samples in 6.ogg are not frame aligned. 6.pcm file was generated by ffmpeg before the fix. After the fix, the decoded pcm file does not match anymore. The ref file 6.pcm needs to be updated. fate-webm-dash-chapters: The original vorbis_chapter_extension_demo.ogg is transmuxed to dash-webm. The ref file webm-dash-chapters needs to be updated. fate-vorbis-encode: This exposes another bug in the vorbis encoder that initial_padding is not correctly set. It is fixed in the previous patch. Signed-off-by: Guangyu Sun --- tests/fate/vorbis.mak | 2 +- tests/ref/fate/webm-dash-chapters | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 354cc57a0f..65fcadf33d 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -86,7 +86,7 @@ fate-vorbis-19: REF = $(SAMPLES)/vorbis/test-short2_small.pcm FATE_VORBIS += fate-vorbis-20 fate-vorbis-20: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/6.ogg -fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm +fate-vorbis-20: REF = $(SAMPLES)/vorbis/6_v2.pcm FATE_VORBIS_FFPROBE-$(CONFIG_OGG_DEMUXER) += fate-vorbis-1833-chapters fate-vorbis-1833-chapters: CMD = probechapters $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters index 20ddfc031d..45368dca85 100644 --- a/tests/ref/fate/webm-dash-chapters +++ b/tests/ref/fate/webm-dash-chapters @@ -1,5 +1,5 @@ -e7fde2ecc9683a7a5296dab33b028653 *tests/data/fate/webm-dash-chapters.webm -111220 tests/data/fate/webm-dash-chapters.webm +f94bcae96166ad246a4b76605a4b3874 *tests/data/fate/webm-dash-chapters.webm +111236 tests/data/fate/webm-dash-chapters.webm #extradata 0: 3469, 0xc6769ddc #tb 0: 1/1000 #media_type 0: audio