From patchwork Sat Dec 7 16:35:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16662 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 A9A2944A2A8 for ; Sat, 7 Dec 2019 18:35:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8850068B56C; Sat, 7 Dec 2019 18:35:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F65B68B0D5 for ; Sat, 7 Dec 2019 18:35:21 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id s14so10442811wmh.4 for ; Sat, 07 Dec 2019 08:35:21 -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=FJFvrm60mu6CklzlV1FEhB3a+yTAcIrPPd+sU+aqsGY=; b=MRsqdnOGNgxc4VlagM0x8i1TezMXf+3fFNKDwvSxBSQ2qZgDEKi8P6QAq2BsAlzrTg PPnhvYbZ49n5RPKE4Tod/JNckBQOLItZ5FU0Y6yU9IBbjQkFuOmpdl4K9Xz9zT/5fauP R0PYpHveO1Q2YDib0pfLXFS5iiv4VpEMnojOLh1WrF9+fKCeG+hN2mWePO9vrJ6ViaoQ hjxw7ryRh0r2T8jntSxg7B8Rn+fvR4q5XKgrSoKrIgtFdkemFfhaqJ2Fqli7Bd6R/Qja C59qY5ogdpdYDoMe0bigWvqPfgLDuFzLAmWxidnoJ5aYO9A8n7YuDCmiK5lsw8ExjE/2 IQQw== 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=FJFvrm60mu6CklzlV1FEhB3a+yTAcIrPPd+sU+aqsGY=; b=mbhwp0a51eGMj62nxWtaB+x//8fLVWHuFVir58e1CDTkfQaU4r/NMFmMdirSkrW+td KriuKulFUapLjMOy2Skf8VWaDQ5incYH1zE1VaGK0FwraYWejA6Z2tFEqkfV7no7ouLO pmiRbreAyl8cIk74KOH1HbdW/MlPqkkHDgEV1JyeEOA7lD7J/R3VNxlX/19Eid+yHV1f MvwZ/6jGBHtXC75N0kileLlKY5ZhmunKxeya6RU8nIPc5+7zHx/5pbYOYCIpFhRgxMlb YMPraFNfO+32hWsDI8HQCN/i0zoOArPFQFT5gonKiPg4bfCXwywrUMVXQZ61yyLWSFV0 x4/Q== X-Gm-Message-State: APjAAAV1YXP342Tto80nHuyQipfyR0zZVDMZyunnaQcY/CW54CYNDLIt 7F9iTt0X5WF02YkYEe2HRUtAWOw2 X-Google-Smtp-Source: APXvYqyZHjq2YC69vA9QlbytRShUiVmsGRRkbY6ZKINAOJ2QAFoxhryddYAlbAz3ZSP/+iDccj+s0Q== X-Received: by 2002:a7b:c38c:: with SMTP id s12mr16390207wmj.96.1575736520711; Sat, 07 Dec 2019 08:35:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id k4sm7515489wmk.26.2019.12.07.08.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Dec 2019 08:35:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 17:35:10 +0100 Message-Id: <20191207163510.13808-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Add a fate test for CodecPrivate 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 contains a track with zlib compressed CodecPrivate in addition to compressed frames; the former was unchecked before. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 5 +++++ tests/ref/fate/matroska-zlib-decompression | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 tests/ref/fate/matroska-zlib-decompression diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 25f5df82c8..04ac11aea5 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -12,6 +12,11 @@ fate-matroska-remux: REF = e5457e5fa606d564a54914bd12f426c8 FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER VORBIS_PARSER) += fate-matroska-xiph-lacing fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.mka -c:a copy +# This tests that the matroska demuxer supports decompressing +# zlib compressed tracks (both the CodecPrivate as well as the actual frames). +FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB FRAMECRC_MUXER FILE_PROTOCOL PIPE_PROTOCOL) += fate-matroska-zlib-decompression +fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy + FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv diff --git a/tests/ref/fate/matroska-zlib-decompression b/tests/ref/fate/matroska-zlib-decompression new file mode 100644 index 0000000000..0ea732346a --- /dev/null +++ b/tests/ref/fate/matroska-zlib-decompression @@ -0,0 +1,5 @@ +#extradata 0: 348, 0x5f625922 +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: dvd_subtitle +0, 1000, 1000, 1991, 191, 0x52f74934