From patchwork Fri May 1 07:53:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19414 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 C6B624494C1 for ; Fri, 1 May 2020 10:54:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D00168C7DE; Fri, 1 May 2020 10:54:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E84AA68C7BB for ; Fri, 1 May 2020 10:54:07 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id i10so10590951wrv.10 for ; Fri, 01 May 2020 00:54:07 -0700 (PDT) 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=dfRLcRg49Tqn61XV5O26QDcEhNxoOLW+mDi6emiSx5Q=; b=BTfi4pOociUEgXVQsv5l7SKlYf1/86U0ukIvISk7W09UmrXt7dy+xGht2jbxu0j9WJ TrB6YDRLpfQNcHMy1iESgkVJ1fysRmi/Gj5xs2nzemMjvhoCyNSfhw24lBR0qdNYMrJ/ DUg3DAi7QJE4LOfAYYwTqDEDGYxMj2mr19G2ePfF0AyxgRO7GlzZrdtdt2PiJA+CNgDz bm9BAun8nmGogFiNp2OizICm1flojfMu9HbaP+/JiZrCbg+/QyFB2mQzDfA8wHTtct07 IsVYYmKepY9GcLXQS4EV6lClQyHyg43GbJPYoo1DXFonka9g6tAXhwYvrjQcR+smGJEU D2JA== 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=dfRLcRg49Tqn61XV5O26QDcEhNxoOLW+mDi6emiSx5Q=; b=tGu4kTorVQjIP8CYXUPf9nbFjfAPvEUrDwhC37iHNpzJTHT4EAiA4DIMMRIOa7on00 H/y8ioW9dK/ii9Q31w5m9ilKIx+KzpEa2oq/ETLn4+AHUXf3E+7mvaAoNHIXXvBpKBu8 A0nTC1CXqJqbDT9TvHQGNXhyuiqMYw0wbZAJ1YFElLH5A742+pmr85rCYnMaQA5ykil5 Lru5ckfJuErUMI7Zpw8Difp3ZrjLQto5EssPJOMQPcq3vzBPfbT8D3sug/Wg/tVbNGwb DxeDi9/vrtFINWWiZiDNECoJQ1IKdPkQYSTfkwxeG1dtDcFtkt1FMD8S9tXHMHg0btPc yjlw== X-Gm-Message-State: AGi0PuazSDQf7L2RrCcr4e7m/hO3r4xbv5mDSkOT1TaChClVpsgh/K8r YiAwQN2IdLyS+z4EZRe88Pata5X0 X-Google-Smtp-Source: APiQypKlWuR1hJLzV1riZIVjsf5DUAG5yJpC62vsRX/1eJoppy1OdA8BFi4buR9dL6PeZWz1B9wNQQ== X-Received: by 2002:a5d:6582:: with SMTP id q2mr2817752wru.343.1588319646480; Fri, 01 May 2020 00:54:06 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id b85sm2770952wmb.21.2020.05.01.00.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 00:54:05 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 May 2020 09:53:54 +0200 Message-Id: <20200501075354.2260-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate/matroska: Add test for remuxing file with spherical metadata 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" Also, test modifying colorspace properties and the default_mode passthrough which is used here to create a file that has no default track at all. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 8 +++ tests/ref/fate/matroska-spherical-mono-remux | 66 ++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 tests/ref/fate/matroska-spherical-mono-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 1d2921194f..e03579def2 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -57,6 +57,14 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER OGG_DEMUXER \ += fate-webm-dash-chapters fate-webm-dash-chapters: CMD = transcode ogg $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg webm "-c copy -cluster_time_limit 1500 -dash 1 -dash_track_number 124 -reserve_index_space 400" "-c copy -t 0.5" "" -show_chapters +# This test the following features of the Matroska muxer: Writing projection +# stream side-data; not setting any track to default if the user requested it; +# and modifying and writing colorspace properties. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER MATROSKA_MUXER \ + H264_DECODER H264_PARSER) \ + += fate-matroska-spherical-mono-remux +fate-matroska-spherical-mono-remux: CMD = transcode matroska $(TARGET_SAMPLES)/mkv/spherical.mkv matroska "-map 0 -map 0 -c copy -disposition:0 -default+forced -disposition:1 -default -default_mode passthrough -color_primaries:1 bt709 -color_trc:1 smpte170m -colorspace:1 bt2020c -color_range:1 pc" "-map 0 -c copy -t 0" "" "-show_entries stream_side_data_list:stream_disposition=default,forced:stream=color_range,color_space,color_primaries,color_transfer" + 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-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux new file mode 100644 index 0000000000..c72fc692bc --- /dev/null +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -0,0 +1,66 @@ +1a3be6691ace86663faeea688e6bb95a *tests/data/fate/matroska-spherical-mono-remux.matroska +161562 tests/data/fate/matroska-spherical-mono-remux.matroska +#extradata 0: 43, 0x2b0e0d7b +#extradata 1: 43, 0x2b0e0d7b +#tb 0: 1/1000 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 1920x1080 +#sar 0: 0/1 +#tb 1: 1/1000 +#media_type 1: video +#codec_id 1: h264 +#dimensions 1: 1920x1080 +#sar 1: 0/1 +0, -80, 0, 40, 69118, 0x73cb52f0, S=2, 12, 0x00000000, 36, 0x2cf8035c +1, -80, 0, 40, 69118, 0x73cb52f0, S=2, 12, 0x00000000, 36, 0x2cf8035c +0, -40, 160, 40, 1103, 0x082a059f, F=0x0 +1, -40, 160, 40, 1103, 0x082a059f, F=0x0 +[STREAM] +color_range=unknown +color_space=unknown +color_transfer=unknown +color_primaries=unknown +DISPOSITION:default=0 +DISPOSITION:forced=1 +[SIDE_DATA] +side_data_type=Stereo 3D +type=2D +inverted=0 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Spherical Mapping +projection=tiled equirectangular +bound_left=148 +bound_top=73 +bound_right=147 +bound_bottom=72 +yaw=45 +pitch=30 +roll=15 +[/SIDE_DATA] +[/STREAM] +[STREAM] +color_range=pc +color_space=bt2020c +color_transfer=smpte170m +color_primaries=bt709 +DISPOSITION:default=0 +DISPOSITION:forced=0 +[SIDE_DATA] +side_data_type=Stereo 3D +type=2D +inverted=0 +[/SIDE_DATA] +[SIDE_DATA] +side_data_type=Spherical Mapping +projection=tiled equirectangular +bound_left=148 +bound_top=73 +bound_right=147 +bound_bottom=72 +yaw=45 +pitch=30 +roll=15 +[/SIDE_DATA] +[/STREAM]