From patchwork Sat Dec 28 02:40:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17014 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0F786448EAB for ; Sat, 28 Dec 2019 04:40:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD0D768A610; Sat, 28 Dec 2019 04:40:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37A7568A607 for ; Sat, 28 Dec 2019 04:40:40 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id g17so27677452wro.2 for ; Fri, 27 Dec 2019 18:40:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yqQDX/8YCADsUQptya8NciKdWwmoYMpExJDon17gmDs=; b=YC6ugsP+n/EpIAWEhHmJucfPurU6YVRAzHnlFwzTU6bTOOqGm4mnXnNXLLKjwhcncW i6MWelab9zqHJ1VDQcxu3cr/vBcsSD9jLD8O6oxOXf1ZE/d+teXD4ETytPKZrLFR/neN SsbvRlckmkgk+xjkALvPTWu3ALQhix17Re0BuP1XAzYG8Nj97wdv9Dkh0JpidWwclQyo ye22ai+yHXRzGGXIhz8xWG9Rs/2yohkDh2946eJbeaRKV8dsbX+N07G/Q+++fTVkXTU2 RVqUw79SPXr3fS5I0Hd4V/ChL7b7iDV143nQHS0US67m/aCbPQceCu4MCXrpwB/CL42x GwUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yqQDX/8YCADsUQptya8NciKdWwmoYMpExJDon17gmDs=; b=oj+bGlDmIVfVYZnxcjHVwAPe8QgRjG8pRwEzoUykuBBBUXyt/i/dny3rskMDLTIFdt UrxVyGJK/8DpQCC5ayPkThgqiCd7JydAmYMrNOUODGwNRSsHI/IAwERTprjUbSgbZpBS EaQn8V+u/47qxCQRcbDpyZvb/6b84tKMjEqDjOkh0DjcMSwC26BBy2nnA1XkZWsTuCNo Up/Vj51fAAbrbD83+wcc+F4U1G9mnC0xVeCvy/nFZm1UDJUJUTRVv0cTOdYE0W7NMjXe x2WCfgP8sF48Th6laNscsVIM1epNc1P9q9yKmokJ5yuvprogo/Hxa6A0r5t+NEucfs4n 0L5Q== X-Gm-Message-State: APjAAAXHqLQsHXqHoQSPANEkjPM5CdgULLj/xZIQkzyZ1aWzS3fuHiTH 7VYcentTjIRAwNwXv8SWJrOxQjWC X-Google-Smtp-Source: APXvYqxnlN9W/o4icNJ2r/YMbgq7L3gSWpdtR2ImcIWVbj3tYBTceYJKWtBis9Gp7Z3poFcy+YPAdQ== X-Received: by 2002:adf:e78a:: with SMTP id n10mr55635537wrm.62.1577500839559; Fri, 27 Dec 2019 18:40:39 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id u14sm36609500wrm.51.2019.12.27.18.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Dec 2019 18:40:39 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Dec 2019 03:40:32 +0100 Message-Id: <20191228024033.18199-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fate/matroska: Add test for ProRes and bz2 compression X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This test tests that demuxing ProRes that is muxed like it should be in Matroska (i.e. with the first header ("icpf") atom stripped away) works; it also tests bz2 decompression as well as the handling of unknown-length clusters. Signed-off-by: Andreas Rheinhardt --- The samples have already been sent to James for uploading. tests/fate/matroska.mak | 5 +++++ .../fate/matroska-prores-header-insertion-bz2 | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/ref/fate/matroska-prores-header-insertion-bz2 diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 99145338ae..597be7346c 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -1,6 +1,11 @@ FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-prores-zlib fate-matroska-prores-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_zlib.mkv -c:v copy +# This tests that the matroska demuxer correctly adds the icpf header atom +# upon demuxing; it also tests bz2 decompression and unknown-length cluster. +FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER BZLIB) += fate-matroska-prores-header-insertion-bz2 +fate-matroska-prores-header-insertion-bz2: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/prores_bz2.mkv -map 0 -c copy + # This tests that the matroska demuxer supports modifying the colorspace # properties in remuxing (-c:v copy) # It also tests automatic insertion of the vp9_superframe bitstream filter diff --git a/tests/ref/fate/matroska-prores-header-insertion-bz2 b/tests/ref/fate/matroska-prores-header-insertion-bz2 new file mode 100644 index 0000000000..63a59f9b8d --- /dev/null +++ b/tests/ref/fate/matroska-prores-header-insertion-bz2 @@ -0,0 +1,16 @@ +#extradata 0: 4, 0x0402019c +#extradata 1: 4, 0x0402019c +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: prores +#dimensions 0: 720x480 +#sar 0: 186/157 +#tb 1: 1/1000 +#media_type 1: video +#codec_id 1: prores +#dimensions 1: 720x480 +#sar 1: 186/157 +0, 0, 0, 0, 4304, 0x3625b1fc +1, 0, 0, 0, 4304, 0x3625b1fc +0, 42, 42, 0, 4304, 0x3625b1fc +1, 42, 42, 0, 4304, 0x3625b1fc