From patchwork Sat Jul 10 00:12:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangyu Sun X-Patchwork-Id: 28881 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1183769ios; Fri, 9 Jul 2021 17:18:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWFF9gHGR8GYAwEx0k9RMbROZBi0eBEfnWPZYQyU7nceQkPu/fOrrkfWyTYlxXgz5CGZwg X-Received: by 2002:a05:6402:30ba:: with SMTP id df26mr6265843edb.310.1625876337499; Fri, 09 Jul 2021 17:18:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625876337; cv=none; d=google.com; s=arc-20160816; b=YreJ+5fzH05S7eWHmH9KxvVsgkf95T8B07BSRxRxqZDwQttYUaNLspaFVzdNPomw+z 9Ks3EnqBxo2aDwWrW2n9HGD2F65r0P8QTpDRK6d7jDTH8doX8iL6YCYCcbQcOpklCraF ehu2hDfaSEn5PtCg9eXjW8tqkPYFaJuie6nzC6kxP7V2nns/1YfHD5YqpDuSRq6MY2c8 nm89UPFkMQ7vZO4O2oTRF4/QuoSb2ph+xiuukHPHjtXIaRVx/1BEBAdTNQQHKbFXGA0B WHHU3GAnm/lhrIybB7Tlr8Y2aPXujN7drPzvD+MuN+8R7zrhKJsjXsWwPv471m/1B5eF gWCg== 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=yh76G0fymJUVYoenvTDstHrgT4FHl39+CJvb+79/C0o=; b=dcrdjASNJ+S0dyTCiZkMairFh83PKih7lHr1DFs2Rj1a5pfyoKIGIFlpNLo4UekSK/ PRRCoGwYu/7B1mtP8UuDfLsVOGv6zLZwuHd6OAiI+K30ikbJ8JcT6ioUqA0d5NfnnQyu UNhrF+vW4wZ0HCG6huLEn/RAY6uXdh3Gy7B2HavpFrJ3b1pfLrMhj8AelUuueKyG0zAl JtGEKoV4m8F6nSxfL80a3+5T2xIHAYqS/Yb5v1Cq//ZDGgSE8G8hZR3y3kb9m8/oUehM hVoFrbIZz8P8vFC24k0QHAJHb+QzNs4qFIoBC098MxzRaaT3pZkVG/sfA/RgeuPBjJ6B r42w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=P3RfX47S; 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 p18si9184440edr.268.2021.07.09.17.18.56; Fri, 09 Jul 2021 17:18: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=P3RfX47S; 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 B304068A7A9; Sat, 10 Jul 2021 03:18:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2F7D68A2AE for ; Sat, 10 Jul 2021 03:18:46 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id b8-20020a17090a4888b02901725eedd346so6962360pjh.4 for ; Fri, 09 Jul 2021 17:18:46 -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=Yw8xYKq2zkSxlh7kIwwn57+VLbhPUwFCdz9qX8PzKrc=; b=P3RfX47ShKOStck1ZlDR5QkfaRYob1zPc+TMGr9diSozbMXjlxeI7IirdeA4Tl6FAE 67pj5YQFxzvF81IN9kRvOorPSCYRQ2mrqbm3q2WTZr0P9wx/mLZaMK1NWGcEHiaVEays Cbnkd5ITyf7eg8cqVpkLh4G7Y/lb4qQ7NcNI5ThoTajh1qqjzivJG1ySnnldGmN+9BpG HClni6lpxKrUm/+mcMrSwygCcw+r54HkEYifNa0gdHL0fshxmYq92GJurt1N8jLnmf5Y SwnNMMhhruKH4qbaLDF4GpscJd5u5yEgSkPZLlGYIHucmwnfJanDmBy/EMv/CRfDq8dP hbKA== 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=Yw8xYKq2zkSxlh7kIwwn57+VLbhPUwFCdz9qX8PzKrc=; b=QoR+BB6WiFaQTgJO1RQy1N+t/5AI2CxNCEIo2HNcWkS4wqtMjbMU1GzHH8K6bSjPg5 uRZ+Ptiqgn026GxTy5KmkHt8u7Y9zkjZTKhnLJkc1jDUn4RVrFrnw7Wzm71x6UaLSleT dSMU90bJUELi0PFJxVmtZvJepTuX0nXrUzMQ08BorUHKVY2edS0DOaupaC4Upc3DPlKV /zJGWyBZbGNAQZE/Tbm61t7jIAA/fo+jL0NP7seIvyODkEsnSbQJIpI44rB723igy4zs N3Z2e7hl6BZShdDwyZmfI7m1cSTnUbF7Mb8DfvTY5UIv2uvXs6jt9egi+GwWD3pS00fA 2rjQ== X-Gm-Message-State: AOAM532+GRe8/GvQug8et6nSY+j6lK4A7IoX52fdXzKfQZ1xojTI40cg kpG5O7V83tMxZO7Nt7E9NhJ3V5it5tdqaw== X-Received: by 2002:a17:902:e80f:b029:129:a9d6:a8af with SMTP id u15-20020a170902e80fb0290129a9d6a8afmr19248285plg.10.1625875924722; Fri, 09 Jul 2021 17:12:04 -0700 (PDT) Received: from localhost.localdomain ([98.42.211.210]) by smtp.gmail.com with ESMTPSA id u9sm13938404pjm.34.2021.07.09.17.12.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jul 2021 17:12:04 -0700 (PDT) From: Guangyu Sun X-Google-Original-From: Guangyu Sun To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jul 2021 17:12:03 -0700 Message-Id: <20210710001203.2484-1-gsun@roblox.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: CqO/mbCVguwZ 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. Ideally the ref file 6.pcm should be updated but it is probably not worth it including another copy of the same file, only smaller. SIZE_TOLERANCE is added for this test case. 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 | 1 + tests/ref/fate/webm-dash-chapters | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 354cc57a0f..b9b7405e87 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -87,6 +87,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: SIZE_TOLERANCE = 9948 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