From patchwork Sun Dec 8 20:44:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16673 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 14E3A44A320 for ; Sun, 8 Dec 2019 22:45:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB83F68B213; Sun, 8 Dec 2019 22:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE69A68B19A for ; Sun, 8 Dec 2019 22:45:03 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id q9so13263436wmj.5 for ; Sun, 08 Dec 2019 12:45:03 -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=V2moWzJx7X+fdOAlY69UuTNmhhwJXgiEe/oXajR98PE=; b=gmLVyx+k+5hJFGvyncLrVqb947A16ktan0cg0YyKHo1ifn9QOHgl1AdEGktEgKW4Ns QIUsgbWin2IWeWFaEJTnbTLa7uk7J3I/fKUpon75/4VAyFcafYnOpV7/CCYrYsbi2jpF 7HlZpx8k4Ldqo789TSf+n6xFkkYRJ6TVDEG3apRNjI6pkov/aAtHrlhIegVv+GUEyytN vkmqQcA7lwK620JzbNj7y9zaoZfnUyqmppxYMBNM5oSFvW530Avfi1TG1rRl9mybJqEC /53z1WE5MW/M2tcSP8vwChXwL1K+FcU0+MNxUWARLc5C8KZYxNkwOE4cG0TNu5LgquIU 6Jtg== 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=V2moWzJx7X+fdOAlY69UuTNmhhwJXgiEe/oXajR98PE=; b=ZoqMFyvkoyXIICScUZIQY3/7IeDKHpXwV4wS9+mmpGyD2BDbdMNJgvpR5TRX/vtTv+ k8pM9MifC0LSEFcoUlMTobMerrYX1NaAUtBbjs6enko3ZKpAAT/jHzU1bZKF4Kc6H5kP ZxuGyYoLCAAYhIYa+2XJ87L9/7ur8+/fzJ3UTMBoUggpTgMyWXtzFJSzeCD2VXfgpH8W Pnmr8CW7DIcA1dOD3LwVmPPl3hKEJtufO4zvUTpaiB3pB5Uq1w6pqgrIZ2pnR9ba00p9 LcUAWWYWQ2sJwcvWGiF6PKqZ6uzKs2F9+JxMnjzkc+TnA7IsaiLJBUIvD0vWuMAng1Ms SH4w== X-Gm-Message-State: APjAAAUdSCT1JWcl9NvZS0/yVQ3zLRz7P/SzYDkA19b0wOtSmO6fqMJF eTtbe9urlEMQnXb+pI04PkXStP8Q X-Google-Smtp-Source: APXvYqyDnKXnCRUqCzwbrqwgwTh3jCERU23vQTKY6vpmR8t5hlVZYHlqTrzmimueHTjQx7ovesuIDw== X-Received: by 2002:a1c:486:: with SMTP id 128mr21952394wme.163.1575837902853; Sun, 08 Dec 2019 12:45:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id l204sm11537412wmf.2.2019.12.08.12.45.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Dec 2019 12:45:02 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 8 Dec 2019 21:44:53 +0100 Message-Id: <20191208204453.8665-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate/matroska: Add a test for propagating flac channel layouts 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" contained in Vorbis comments in the CodecPrivate of flac tracks. Moreover, it also tests header removal compression. Signed-off-by: Andreas Rheinhardt --- Sample already sent to James to take care of uploading it. tests/fate/matroska.mak | 6 ++++ tests/ref/fate/matroska-flac-channel-mapping | 38 ++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 tests/ref/fate/matroska-flac-channel-mapping diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 36fec6e991..99145338ae 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -17,6 +17,12 @@ fate-matroska-xiph-lacing: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/xiph_lacing.m FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-zlib-decompression fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy +# This tests that the matroska demuxer correctly propagates +# the channel layout contained in vorbis comments in the CodecPrivate +# of flac tracks. It also tests header removal compression. +FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER FLAC_PARSER) += fate-matroska-flac-channel-mapping +fate-matroska-flac-channel-mapping: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/flac_channel_layouts.mka -map 0 -c:a 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-flac-channel-mapping b/tests/ref/fate/matroska-flac-channel-mapping new file mode 100644 index 0000000000..6d901600e5 --- /dev/null +++ b/tests/ref/fate/matroska-flac-channel-mapping @@ -0,0 +1,38 @@ +#extradata 0: 34, 0x7a7909e5 +#extradata 1: 34, 0x7a7909e5 +#tb 0: 651/31250000 +#media_type 0: audio +#codec_id 0: flac +#sample_rate 0: 48000 +#channel_layout 0: 3f +#channel_layout_name 0: 5.1 +#tb 1: 651/31250000 +#media_type 1: audio +#codec_id 1: flac +#sample_rate 1: 48000 +#channel_layout 1: 60f +#channel_layout_name 1: 5.1(side) +0, 0, 0, 4096, 26, 0x50f80431 +1, 0, 0, 4096, 26, 0x50f80431 +0, 4096, 4096, 4096, 26, 0x50d30416 +1, 4096, 4096, 4096, 26, 0x50d30416 +0, 8192, 8192, 4096, 26, 0x51ee046f +1, 8192, 8192, 4096, 26, 0x51ee046f +0, 12288, 12288, 4096, 26, 0x521d0458 +1, 12288, 12288, 4096, 26, 0x521d0458 +0, 16385, 16385, 4096, 26, 0x531c043d +1, 16385, 16385, 4096, 26, 0x531c043d +0, 20481, 20481, 4096, 26, 0x53cf0442 +1, 20481, 20481, 4096, 26, 0x53cf0442 +0, 24577, 24577, 4096, 26, 0x536a0473 +1, 24577, 24577, 4096, 26, 0x536a0473 +0, 28673, 28673, 4096, 26, 0x5321046c +1, 28673, 28673, 4096, 26, 0x5321046c +0, 32770, 32770, 4096, 26, 0x51b00449 +1, 32770, 32770, 4096, 26, 0x51b00449 +0, 36866, 36866, 4096, 26, 0x518b042e +1, 36866, 36866, 4096, 26, 0x518b042e +0, 40962, 40962, 4096, 26, 0x50f60447 +1, 40962, 40962, 4096, 26, 0x50f60447 +0, 45059, 45059, 3072, 28, 0x72540504 +1, 45059, 45059, 3072, 28, 0x72540504