From patchwork Sun Apr 25 07:03:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp2941343iob; Sun, 25 Apr 2021 00:05:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz18MzLJoPHWMBfZbcRX5Bk7uGFbkwCPuergjETyYMO6lrHVYfkXY1HilOD1zI9Z99Zi4V2 X-Received: by 2002:a17:906:9a53:: with SMTP id aj19mr476987ejc.74.1619334303188; Sun, 25 Apr 2021 00:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619334303; cv=none; d=google.com; s=arc-20160816; b=Dj7C1upakw2v5GQ+iW7/7fokTX+vLwqIUZMT+BQiEvcAKOpPdlZCKbGOQM0gORso28 eYP6cEvF5mOrbG9bLtasqBP4X1FVfTrHOw4rM8HqcRmnwX+Vp4PODH5JptupIQDl4vCQ y0PYt6b2rtVqmZ3FD40OR4heC4SKqZFojixquIYzwutvGmIpH97Wg5Y/57iQWu/eFBpk UmnbATI9G3OA1Yw6w/OEUX997eshIbn7IF6cptDqdGIKj/SO5aWbep+D4FOTKhVpDtoL 8DAI7DKZDdv/78HlG/zgoJcWXv0fs3fR4lq4QvWw2eLfVrhFjz0ymfEpWXByZsEQh1GK 5L3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Ua2Odmz5e7v5ZX1bHl7EYcWi/SehjrM80EGMRnRcz0I=; b=TnVspqmpkTQG2N6gtaOl+JuDVHAI2BVK+tXHT/RCX/ymRpbVkPFwgVb8hmX5Yz6xmO NR+nbM9SM/tbW+P/qxm9ciU2oOOa7llJpVWVtg/hmbrvlpL3rOsvlhZShkKHlkBxi4/J AbiZGM0y6S8YbEcxzh6DmD+vliXRz2QvpdhWPdyGRRGC1qbrOizoBIM1N4rPXwoWB0eV N0EwuIKDu2KIrvnbnmRiUobYRbj5et4SBsz9j7JrCD/GcGoXhZjBOlf7YhlcFD+/qJkd X24v/QKtB2wa38vDuGjGwvHMul37mDTJzXRDilT4s8o8+JQky+s82yWUgsVLssQIFCB5 h0rg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qp21si10320195ejb.407.2021.04.25.00.05.02; Sun, 25 Apr 2021 00:05:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F9F368806D; Sun, 25 Apr 2021 10:03:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04D53687FED for ; Sun, 25 Apr 2021 10:03:40 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E2DCD240692 for ; Sun, 25 Apr 2021 09:03:37 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0j_FDRNYDPOV for ; Sun, 25 Apr 2021 09:03:37 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:a640:2e1a:caa3:698c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 69520240696 for ; Sun, 25 Apr 2021 09:03:32 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 064593A1203; Sun, 25 Apr 2021 09:03:29 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Apr 2021 09:03:17 +0200 Message-Id: <20210425070320.14197-9-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210425070320.14197-1-anton@khirnov.net> References: <20210425070320.14197-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/12] fate-webm-webvtt-remux: print packet side data in ffprobe output X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kwW6OQRKGqog --- tests/fate/matroska.mak | 2 +- tests/ref/fate/webm-webvtt-remux | 336 +++++++++++++++++++++++++++++++ 2 files changed, 337 insertions(+), 1 deletion(-) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index becca28e1a..ca7193a055 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -136,7 +136,7 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WEBVTT_DEMUXER \ WEBM_MUXER MATROSKA_DEMUXER \ FRAMECRC_MUXER PIPE_PROTOCOL) \ += fate-webm-webvtt-remux -fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name" +fate-webm-webvtt-remux: CMD = transcode webvtt $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt webm "-map 0 -map 0 -map 0 -map 0 -c:s copy -disposition:0 original+descriptions+hearing_impaired -disposition:1 lyrics+default+metadata -disposition:2 comment+forced -disposition:3 karaoke+captions+dub" "-map 0:0 -map 0:1 -c copy" "" "-show_entries stream_disposition:stream=index,codec_name:packet=stream_index,pts:packet_side_data_list -show_data_hash CRC32" FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes) FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes) diff --git a/tests/ref/fate/webm-webvtt-remux b/tests/ref/fate/webm-webvtt-remux index 0737541be5..a0e9182f47 100644 --- a/tests/ref/fate/webm-webvtt-remux +++ b/tests/ref/fate/webm-webvtt-remux @@ -36,6 +36,342 @@ c5625f28e6968e12d91f125edef5f16c *tests/data/fate/webm-webvtt-remux.webm 1, 50000, 50000, 1134, 43, 0x534b0ee3 0, 3540123, 3540123, 1485555, 13, 0x216a04d8 1, 3540123, 3540123, 1485555, 13, 0x216a04d8 +[PACKET] +stream_index=0 +pts=11000 +[/PACKET] +[PACKET] +stream_index=1 +pts=11000 +[/PACKET] +[PACKET] +stream_index=2 +pts=11000 +[/PACKET] +[PACKET] +stream_index=3 +pts=11000 +[/PACKET] +[PACKET] +stream_index=0 +pts=13000 +[/PACKET] +[PACKET] +stream_index=1 +pts=13000 +[/PACKET] +[PACKET] +stream_index=2 +pts=13000 +[/PACKET] +[PACKET] +stream_index=3 +pts=13000 +[/PACKET] +[PACKET] +stream_index=0 +pts=16000 +[/PACKET] +[PACKET] +stream_index=1 +pts=16000 +[/PACKET] +[PACKET] +stream_index=2 +pts=16000 +[/PACKET] +[PACKET] +stream_index=3 +pts=16000 +[/PACKET] +[PACKET] +stream_index=0 +pts=18000 +[/PACKET] +[PACKET] +stream_index=1 +pts=18000 +[/PACKET] +[PACKET] +stream_index=2 +pts=18000 +[/PACKET] +[PACKET] +stream_index=3 +pts=18000 +[/PACKET] +[PACKET] +stream_index=0 +pts=20000 +[/PACKET] +[PACKET] +stream_index=1 +pts=20000 +[/PACKET] +[PACKET] +stream_index=2 +pts=20000 +[/PACKET] +[PACKET] +stream_index=3 +pts=20000 +[/PACKET] +[PACKET] +stream_index=0 +pts=22000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:884863d2 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=22000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:884863d2 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=22000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:884863d2 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=22000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:884863d2 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=24000 +[/PACKET] +[PACKET] +stream_index=1 +pts=24000 +[/PACKET] +[PACKET] +stream_index=2 +pts=24000 +[/PACKET] +[PACKET] +stream_index=3 +pts=24000 +[/PACKET] +[PACKET] +stream_index=0 +pts=27000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:38ea6650 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=27000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:38ea6650 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=27000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:38ea6650 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=27000 +[SIDE_DATA] +side_data_type=WebVTT ID +data_hash=CRC32:38ea6650 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=30000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=30000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=30000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=30000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=30500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:5a60fed3 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=30500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:5a60fed3 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=30500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:5a60fed3 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=30500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:5a60fed3 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=32000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=32000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=32000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=32000 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:c85a02f9 +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=32500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:36b6655e +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=1 +pts=32500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:36b6655e +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=2 +pts=32500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:36b6655e +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=3 +pts=32500 +[SIDE_DATA] +side_data_type=WebVTT Settings +data_hash=CRC32:36b6655e +[/SIDE_DATA] +[/PACKET] +[PACKET] +stream_index=0 +pts=35500 +[/PACKET] +[PACKET] +stream_index=1 +pts=35500 +[/PACKET] +[PACKET] +stream_index=2 +pts=35500 +[/PACKET] +[PACKET] +stream_index=3 +pts=35500 +[/PACKET] +[PACKET] +stream_index=0 +pts=50000 +[/PACKET] +[PACKET] +stream_index=1 +pts=50000 +[/PACKET] +[PACKET] +stream_index=2 +pts=50000 +[/PACKET] +[PACKET] +stream_index=3 +pts=50000 +[/PACKET] +[PACKET] +stream_index=0 +pts=3540123 +[/PACKET] +[PACKET] +stream_index=1 +pts=3540123 +[/PACKET] +[PACKET] +stream_index=2 +pts=3540123 +[/PACKET] +[PACKET] +stream_index=3 +pts=3540123 +[/PACKET] [STREAM] index=0 codec_name=webvtt