From patchwork Wed Feb 17 10:13:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25692 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 32D06449181 for ; Wed, 17 Feb 2021 12:14:39 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A16A68A72F; Wed, 17 Feb 2021 12:14:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4D1868A68F for ; Wed, 17 Feb 2021 12:14:34 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id g6so16726041wrs.11 for ; Wed, 17 Feb 2021 02:14:34 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=72xaCGzBzN2PRgKxNZpcpvAm9+GGqZ93rW1RmI6sETM=; b=EnfFyNZMm/QqbJ2kE41kf8TU8peiqc6NITD262YWyd9S+SiyGN8RfshDxQgIlD7I4V DhdcUxbr1ZPlbUDJRdgcwp0Y2JaaPiMxWbZrZa0+rKVcQNizTnO6vx8U1Hdb7IDaFS8i A4nEprxr8e9RvcRLe99verH5eJ0E48QuO7S5HzPGCCYJs+UWTQEPsN8Nu/W2ISNnkl+E mK7nkCTLuZdKr2petOiFX5nrbu+eNCYG/cBWVG8YQ86RMxSZMrHEXUvYxIi73vfq+d1G MVW2XSLC95oHoCVPl0T4pr9XXFoRHiw8eYNmvVIFXIkpd3fVWK2hQCdSs76NmjTzqOeo 4qwQ== 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:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=72xaCGzBzN2PRgKxNZpcpvAm9+GGqZ93rW1RmI6sETM=; b=fc4nO64Lm+BMknIm8UkwNMxr3CEL69vUkfNLT6zcLHh3q7HHV+mawAwfRL9UjTMqBN nVJ8nDHW2f58G8dy6ljomGs4gzHuyLmFh1bJy6lusmFHoju97ZfV8Jq8/fJH5zqv1QV7 HR0vuPsShf+Ecw7pZBxhajDvQ6gJT381wXlIS8HaYAitSNscQY1t4O5sL3ZXFhpw7F42 hV7tQiReTijmL6Ilnu7t9SmDxTfo5NLb4jUeBJAqG7kDu8sPwClRve2VN4+xF2EDsrvJ QwLiyh6bEQ0wJnb388Kd+SZZ6lcHWywLOYULtfVYWHxI+YGX+CEDCvPQf9hgiGz8KQ6a AFUA== X-Gm-Message-State: AOAM5308yoJEJPFjOfoBgSscYPmnkIlnD+0JiQVyJ4RNHwolCPj/cpoD V/hXFxXlSrYEQjZUo6Vq1jh+i1zfjyU= X-Google-Smtp-Source: ABdhPJxh1HnWAkJwAV1lNleePXgTPy0jdDamxLfc6bVFfdWaz0ovpTP9Cl/FpdnRAGFWAmhViy1K/w== X-Received: by 2002:adf:f905:: with SMTP id b5mr27534899wrr.129.1613556874105; Wed, 17 Feb 2021 02:14:34 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v12sm3502828wrv.69.2021.02.17.02.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 02:14:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 11:13:54 +0100 Message-Id: <20210217101356.1723370-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/19] fate/matroska: Add test for remuxing VP8 with alpha 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 provides coverage for writing BlockGroups with BlockAdditional and ReferenceBlock elements. It also tests setting the hearing impaired disposition (it fits given that this video has no audio so one needs to be able to read lips to understand anything). Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 10 ++++++++ tests/ref/fate/matroska-vp8-alpha-remux | 33 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 tests/ref/fate/matroska-vp8-alpha-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index be68082c21..4c10fe663f 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -90,6 +90,16 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ += fate-matroska-mastering-display-metadata fate-matroska-mastering-display-metadata: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf matroska "-map 0 -map 0:0 -c:v:0 copy -c:v:1 ffv1 -c:a:0 copy -bsf:a:0 noise=amount=3 -filter:a:1 aresample -c:a:1 pcm_s16be -bsf:a:1 noise=dropamount=4" "-map 0 -c copy" "" "-show_entries stream_side_data_list:stream=index,codec_name" +# Tests writing BlockAdditional and BlockGroups with ReferenceBlock elements; +# it also tests setting a track as suitable for hearing impaired. +# It also tests the capability of the VP8 parser to set the keyframe flag +# (the input file lacks ReferenceBlock elements making everything a keyframe). +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MATROSKA_DEMUXER \ + VP8_PARSER MATROSKA_MUXER \ + FRAMECRC_MUXER PIPE_PROTOCOL) \ + += fate-matroska-vp8-alpha-remux +fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list" + 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-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux new file mode 100644 index 0000000000..0b6c779323 --- /dev/null +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -0,0 +1,33 @@ +d06be833da8e8d9d00bf334e0dfe8a58 *tests/data/fate/matroska-vp8-alpha-remux.matroska +237192 tests/data/fate/matroska-vp8-alpha-remux.matroska +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: vp8 +#dimensions 0: 320x213 +#sar 0: 1/1 +0, 0, 0, 33, 2108, 0x59b92a34, S=2, 1900, 0x8fb3adc5, 12, 0x00000000 +0, 32, 32, 33, 142, 0x2f2a3fed, F=0x0, S=1, 160, 0xa13346af +0, 65, 65, 33, 157, 0x17804767, F=0x0, S=1, 209, 0x64115f15 +0, 99, 99, 33, 206, 0x537262ca, F=0x0, S=1, 317, 0x44a09dd0 +0, 132, 132, 33, 259, 0x73ff74b6, F=0x0, S=1, 384, 0x2ee2c588 +0, 165, 165, 33, 320, 0x0fcf8ce4, F=0x0, S=1, 415, 0xff68c953 +0, 199, 199, 33, 377, 0x8fffb5f5, F=0x0, S=1, 475, 0x4166f3eb +[STREAM] +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=1 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[SIDE_DATA] +side_data_type=Stereo 3D +type=2D +inverted=0 +[/SIDE_DATA] +[/STREAM]