From patchwork Tue Jan 10 15:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 39952 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4037962pzb; Tue, 10 Jan 2023 07:42:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzt0+CyF6v3o/utwlPIH4a0sYB5BXOg6LRys9/m+62+eDBY/J3xQ/zALxcP+yDVPHpKF1k X-Received: by 2002:a05:6402:6d8:b0:461:1998:217f with SMTP id n24-20020a05640206d800b004611998217fmr60866723edy.4.1673365354649; Tue, 10 Jan 2023 07:42:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673365354; cv=none; d=google.com; s=arc-20160816; b=Xc9/FosmqZAf546MZKlX8X0/1FbfbXKzyANFiYs+mZ8+hTZczCcLdKIdG94WBOPSKU QB3b1q/pHn+DawtNFIdyjUpvjkshvRKYi1SG0s6eAkqA5mepI2T7yf67Sr36fplXoif9 EipgxyR4PnlzCctocLlpdJps9KMkv+qnzkhsOgfMHQ/IzTgU90Vz9SG3qI8HrI+SJPN6 2tZAnN1+ijJS+PAS/tDHIJUqWOzKYkDTFpWTY32CHTbtkKqkoIm1yT04MtN01rGL7aKx vB6Up8vRB1+RzH63c/9Ca8DRxGSgsGnIXaLiWLRi14OucRMm9hhNrgSX2tWMn0Tad/+Q Jf9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=6ZCr1dodOFEUW3on1dOtYbhVPf0DjpdPmG9jG0UbRYs=; b=myLHRqiC8bQ89nNSQ/r+2cskCA5gbkd5uA/tva7Y/w+Czx76r5xBzK1QVtlUFlhGIk ymEBXXuAMEJjeTcFpk1BBcs9c9FKGHlw30u2dIPlR9MqR0oZ80FlFPz3LTpbvISbhh6f DyLXWs/8wp/bFwvQh2+TvlH9IJfOzr/OVP5Mr+mFKtzrd8z66MbJwkjzOU7XLEzV8IzX S0w5zb+xFIX4IIMpm+6sPTyI2G2iHsFNvTH4R8wNPOgsaQZiAwJcccVZYBRcCyMpLBun m4/066UbZXCM+eFx/N0+tacFRhwJzWqsv6mtaDaR4ece0fpb+2vsWG9g976BuLjhVKxR jNiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KqAG35ms; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y95-20020a50bb68000000b00473204b6c93si11822722ede.372.2023.01.10.07.42.33; Tue, 10 Jan 2023 07:42:34 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KqAG35ms; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1140F68BD26; Tue, 10 Jan 2023 17:42:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB10468B35D for ; Tue, 10 Jan 2023 17:42:13 +0200 (EET) Received: by mail-pf1-f176.google.com with SMTP id g20so9142586pfb.3 for ; Tue, 10 Jan 2023 07:42:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=iAciP99WkJqCFndKULMJDHw0y1Qqq4nHeDfqKAjwjHQ=; b=KqAG35msYm1StywZxJmQsc5BG63dfEXMcjtMMWlFTP4XyrHWlwncA7o3iHLQzNtpYj JDo1bYDgDQkjCkloddpxn+VEIH3H5Tce16NvKnGur+LCctQYGidNdxYDQS1czQHJY649 o36QgQeC+EXSEo9CSjIUBzZNHT279wUv4MWOcgFBlziLQ7qeVtWIzfWjR1PFHPgsx2xi ddISwGHb/bXayIr1E7wV+v0aAOmYKLfe6yO3WH8VPjol9rF0XeR4MZ6FhWdmS6rW9nZL rIXzyybi2ic8KSXY+f4YnAW/aIhulAj/2zCMAFBDZeefQA7nh0zcBcf4/7S1T2hRsNDy jeOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iAciP99WkJqCFndKULMJDHw0y1Qqq4nHeDfqKAjwjHQ=; b=5ieb3xxf7NWEPEf6jdv6WUD5R9EFkYmXGNyoCtRkQEd22CHhCGTDRsO4hcIFkfzFkT 38WhBW/74c0LSnlPjCetxAhs3SlpgTww0zXx6OLOEC7/2VikJttT0xRAwZ0w7BTx0iOy I47HIzi4z9tqBIM0n4KbdFHgKWxz917aT7cNoaBCGdJJF95lbFlxSr2Off5j1Evj14s6 xfamOhl0XTKZbNlrMJtDLLtEUtCp3iyEaLRB+TROwgPcDwmmoioyZRv5fSHSq+qM339w nm/lfyeWTTDRZQxUAHAs5oJRySv7CyXrbHzd/tuiERfUKfkSOiyHRa/GFHz+P+woS7HZ Z4TQ== X-Gm-Message-State: AFqh2kphpOjz5wTi0e1yNg5YTaq/ez5f2DzkruDSE0+cdZDEXlm0nfpQ u0XltD4AMHUUnjPPjG78rCrYKWk9SyE= X-Received: by 2002:a62:5bc6:0:b0:588:9c15:65c4 with SMTP id p189-20020a625bc6000000b005889c1565c4mr6202902pfb.3.1673365331214; Tue, 10 Jan 2023 07:42:11 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id r5-20020aa79ec5000000b00589605fb0a1sm3641558pfq.96.2023.01.10.07.42.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 07:42:10 -0800 (PST) From: Miguel Borges de Freitas X-Google-Original-From: Miguel Borges de Freitas Message-Id: <5985bf780ecddd2a608537c4cf91d4514660b8da.1673365329.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 10 Jan 2023 15:42:07 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/2] libavformat/matroskadec: set fixed duration for subtitles 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 Cc: Miguel Borges de Freitas , Miguel Borges de Freitas <92enen@gmail.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ijuO3dBMyFbq From: Miguel Borges de Freitas The matroska specification states the start time and duration of subtitle entries are encoded in the block TimeStamp and BlockDuration. Furthermore, for all subtitle formats except S_HDMV/PGS the BlockDuration must always be defined and have an absolute value even if it is simply 0. ffmpeg assumes that a duration of 0 means the duration is still unknown and tries to adjust based on the next packet pts. This is wrong for all formats except S_HDMV/PGS. Since changing the semantics of duration 0 is not an option (touches too many parts of the code) this change introduces AV_PKT_FLAG_FIXED_DURATION flag which decoders might use to flag the duration of a given packet should not be changed. Signed-off-by: Miguel Borges de Freitas --- libavcodec/packet.h | 5 +++++ libavformat/demux.c | 3 ++- libavformat/matroskadec.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/packet.h b/libavcodec/packet.h index f28e7e7011..699dcc6f79 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -446,6 +446,11 @@ typedef struct AVPacketList { * be discarded by the decoder. I.e. Non-reference frames. */ #define AV_PKT_FLAG_DISPOSABLE 0x0010 +/** + * Flag is used to indicate packets in which the duration is absolute + * and should not be changed. + */ +#define AV_PKT_FLAG_FIXED_DURATION 0x0020 enum AVSideDataParamChangeFlags { #if FF_API_OLD_CHANNEL_LAYOUT diff --git a/libavformat/demux.c b/libavformat/demux.c index 2dfd82a63c..471be5d3dd 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -914,7 +914,8 @@ static void update_initial_durations(AVFormatContext *s, AVStream *st, pktl->pkt.dts = cur_dts; if (!sti->avctx->has_b_frames) pktl->pkt.pts = cur_dts; - pktl->pkt.duration = duration; + if ((pktl->pkt.flags & AV_PKT_FLAG_FIXED_DURATION) != AV_PKT_FLAG_FIXED_DURATION) + pktl->pkt.duration = duration; } else break; cur_dts = pktl->pkt.dts + pktl->pkt.duration; diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..e887f43e1a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3673,6 +3673,10 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, pkt->pos = pos; pkt->duration = lace_duration; + if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE && + st->codecpar->codec_id != AV_CODEC_ID_HDMV_PGS_SUBTITLE) + pkt->flags |= AV_PKT_FLAG_FIXED_DURATION; + res = avpriv_packet_list_put(&matroska->queue, pkt, NULL, 0); if (res < 0) { av_packet_unref(pkt); From patchwork Tue Jan 10 15:42:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 39953 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp4038104pzb; Tue, 10 Jan 2023 07:42:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXvWRHJqErokkR9dY23x91yLZ1JLdWjF23U3InsqGu33idFfILNTaCl0LcMh6vuNunQBroED X-Received: by 2002:a17:907:d604:b0:7ad:d62d:9d31 with SMTP id wd4-20020a170907d60400b007add62d9d31mr62401736ejc.67.1673365365364; Tue, 10 Jan 2023 07:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673365365; cv=none; d=google.com; s=arc-20160816; b=r3U9wsMXrNCx3Lw2W89dBULIN1NE4oC8zkse2sCFIZ3dTZSVdrCZcUbHGZL4k/yr9q jMSk0QrCrSLzakjv90bwFztZ2RnoxYFMXdOl+3RH+fQg4YUWOoQvotVW7SvzUXYKcvDP wMAog1S3KqHjuvjx2c627fADIfdKUGHk3PVZlbNz5iKGaH0InBN+cVL+be8/OEKgs2TG uuCyuoqKB2+OynOI5O4L0VWNz9naUSHtvGpuzKN9a71v3er3Qmiu9ylOoPdKwC8eAwA2 VzZzhD83BqVS5YYqXeaPjwwXi8Syp6XofTmoyO4n34I761tYHvfFDGVaKjGbid9ESu3W tKQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=L3cS11bcH9GUjF79SZ0AUXFgxRRokQFcUIfUEUZs8fY=; b=jEX7pQWRzeecgJ4DvPLDIG5NLLmBV19pzTkWnE5Ph4/7c9+PwC1sdr3Bkae3cD5ymt VZ8SWacWtVkv+9aWhefVPSvGMLbFtbwbV/q6uYokdTXKJ3TByUXTrnYFO/dhu+j1/Kxg 0+rN/t+WKuL4SITjxxEV4GIj+T89CoplmEoMG08djIwADpTObWCplm0vOf+NIhEqx5Mw 4d3dMrMmW7/8nMKoIZZI8wR/ceXJJlq1CFRJjuEayFqzx9e1J3Q3f0PiM1zk6Nd6zeGJ 6yY4xnmuoY8sGabll9FhSz+q4jMmVfaCI2OzS/bg6B2xztPNaDnF9/miM308cOoDdNYK KGFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Rp71ijNI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wg10-20020a17090705ca00b007c18ffbf16esi898750ejb.433.2023.01.10.07.42.43; Tue, 10 Jan 2023 07:42:45 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Rp71ijNI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1522F68BD2E; Tue, 10 Jan 2023 17:42:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E830368BD19 for ; Tue, 10 Jan 2023 17:42:13 +0200 (EET) Received: by mail-pl1-f182.google.com with SMTP id d9so13564532pll.9 for ; Tue, 10 Jan 2023 07:42:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=KbxT4XkjEX73uy+VgxiBNGP62Yr9drgx8jEhCA8sTTg=; b=Rp71ijNIFWxAdcdquLxsOnvp13+pimC7omDgzGVnY3QaplulJ7f2yVx2GA3jvQlWWl mF3vEhgK1EZyLVnZM2nvXsNBDVHYx7ysfLOom8YWoacTz9MkzbUwPA0w+bh08+FIukJL ClTahj4bsxDZwds6hl0TfOhOmwYgFin+lwgvla0ZTqq0hzNGAQoWd9QAug02RShEOmOc +G5a9ZnoCPmVLfp/KF5ov4isLZeJcxCHDaqERrnM4m3BkLyWIbB4beKZqgfto2cVwTbe H8K6A7fT+9bit/841BfrHfSOrpVYpSnGGVIszhqj/CQPiOund26WOPgWr5VT0jl8pQs8 c7eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=KbxT4XkjEX73uy+VgxiBNGP62Yr9drgx8jEhCA8sTTg=; b=ZgNUOfg+4g5MhnfVFe5U6dVkFKV05RoiLGc1gsegCzpNPonb+Dd6luuUBw/47a6tSc vYWz2dx7BdOLeC+S1ntS3+T6+QpxHN3L9njK57AYpUPD2KJNYxg0sJnN0a/o13u4WBtf Xpz7BD2JukqO7dkW9K0ZRlhr7EZFpRgcbDqhokdD02H4dfYRmYicj7IV1COxN2OrmpKm Ivcz3L5Z2ugLkqKrBj1IDnlG6Bgs6DC+6HnXjitvc0KPHYbE+Z2G0tyWM/rQc98a7Ilr QnO0pjWiymv6aPTtuD0t35zDUykliRytZPpvWCOcRiOW9fjN04I87S9FoYHvFiErNLEk PF4A== X-Gm-Message-State: AFqh2krinjc/qo1X7yzZOVi4QpP3o/lB7A0fiQBKmoRH6AzUy9F+466C l3qP0Tde4SeAuOZyS6M6m+xHjrS5U6w= X-Received: by 2002:a17:90a:e387:b0:227:1ef2:1db7 with SMTP id b7-20020a17090ae38700b002271ef21db7mr5714680pjz.9.1673365332015; Tue, 10 Jan 2023 07:42:12 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id c10-20020a17090a674a00b002263faf8431sm5202208pjm.17.2023.01.10.07.42.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2023 07:42:11 -0800 (PST) From: Miguel Borges de Freitas X-Google-Original-From: Miguel Borges de Freitas Message-Id: <21e0647e3ce1e1f78fd2c0d371043d33018808d2.1673365329.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Tue, 10 Jan 2023 15:42:08 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/2] fate: update test reference data to include AV_PKT_FLAG_FIXED_DURATION 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 Cc: Miguel Borges de Freitas , Miguel Borges de Freitas <92enen@gmail.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OSCYfFCRWlyQ From: Miguel Borges de Freitas Updates some of the test reference data to include the new AV_PKT_FLAG_FIXED_DURATION (this is the case for most matroska subtitles) Signed-off-by: Miguel Borges de Freitas --- tests/ref/fate/matroska-dvbsub-remux | 84 ++++++++++---------- tests/ref/fate/matroska-zero-length-block | 4 +- tests/ref/fate/matroska-zlib-decompression | 2 +- tests/ref/fate/shortest-sub | 92 +++++++++++----------- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/tests/ref/fate/matroska-dvbsub-remux b/tests/ref/fate/matroska-dvbsub-remux index b7346b8f55..16e5ce9a34 100644 --- a/tests/ref/fate/matroska-dvbsub-remux +++ b/tests/ref/fate/matroska-dvbsub-remux @@ -8,45 +8,45 @@ #tb 1: 1/1000 #media_type 1: subtitle #codec_id 1: dvb_subtitle -0, 0, 0, 280, 14, 0x05f400e1 -1, 0, 0, 0, 14, 0x05f400e1 -0, 280, 280, 5000, 14, 0x066400f1 -1, 280, 280, 0, 14, 0x066400f1 -0, 5280, 5280, 5020, 14, 0x06d40101 -1, 5280, 5280, 0, 14, 0x06d40101 -0, 10300, 10300, 3600, 14, 0x07440111 -1, 10300, 10300, 0, 14, 0x07440111 -0, 13900, 13900, 220, 14, 0x07b40121 -1, 13900, 13900, 0, 14, 0x07b40121 -0, 14120, 14120, 1440, 14, 0x08240131 -1, 14120, 14120, 0, 14, 0x08240131 -0, 15560, 15560, 40, 14, 0x08940141 -1, 15560, 15560, 0, 14, 0x08940141 -0, 15600, 15600, 160, 944, 0x454c0939 -1, 15600, 15600, 0, 944, 0x454c0939 -0, 15760, 15760, 240, 630, 0x49dbb35f -1, 15760, 15760, 0, 630, 0x49dbb35f -0, 16000, 16000, 340, 344, 0xb1eb63ed -1, 16000, 16000, 0, 344, 0xb1eb63ed -0, 16340, 16340, 600, 966, 0xb8a61edf -1, 16340, 16340, 0, 966, 0xb8a61edf -0, 16940, 16940, 460, 470, 0x80597fba -1, 16940, 16940, 0, 470, 0x80597fba -0, 17400, 17400, 360, 1212, 0x554768d6 -1, 17400, 17400, 0, 1212, 0x554768d6 -0, 17760, 17760, 220, 4804, 0xab67ddbe -1, 17760, 17760, 0, 4804, 0xab67ddbe -0, 17980, 17980, 960, 1016, 0x15e42d56 -1, 17980, 17980, 0, 1016, 0x15e42d56 -0, 18940, 18940, 220, 456, 0x57917e6f -1, 18940, 18940, 0, 456, 0x57917e6f -0, 19160, 19160, 260, 830, 0xcff3efde -1, 19160, 19160, 0, 830, 0xcff3efde -0, 19420, 19420, 100, 860, 0xd89903b6 -1, 19420, 19420, 0, 860, 0xd89903b6 -0, 19520, 19520, 220, 4426, 0x01eb43f1 -1, 19520, 19520, 0, 4426, 0x01eb43f1 -0, 19740, 19740, 220, 1132, 0xedda51a8 -1, 19740, 19740, 0, 1132, 0xedda51a8 -0, 19960, 19960, 0, 466, 0x9c957e09 -1, 19960, 19960, 0, 466, 0x9c957e09 +0, 0, 0, 280, 14, 0x05f400e1, F=0x21 +1, 0, 0, 0, 14, 0x05f400e1, F=0x21 +0, 280, 280, 5000, 14, 0x066400f1, F=0x21 +1, 280, 280, 0, 14, 0x066400f1, F=0x21 +0, 5280, 5280, 5020, 14, 0x06d40101, F=0x21 +1, 5280, 5280, 0, 14, 0x06d40101, F=0x21 +0, 10300, 10300, 3600, 14, 0x07440111, F=0x21 +1, 10300, 10300, 0, 14, 0x07440111, F=0x21 +0, 13900, 13900, 220, 14, 0x07b40121, F=0x21 +1, 13900, 13900, 0, 14, 0x07b40121, F=0x21 +0, 14120, 14120, 1440, 14, 0x08240131, F=0x21 +1, 14120, 14120, 0, 14, 0x08240131, F=0x21 +0, 15560, 15560, 40, 14, 0x08940141, F=0x21 +1, 15560, 15560, 0, 14, 0x08940141, F=0x21 +0, 15600, 15600, 160, 944, 0x454c0939, F=0x21 +1, 15600, 15600, 0, 944, 0x454c0939, F=0x21 +0, 15760, 15760, 240, 630, 0x49dbb35f, F=0x21 +1, 15760, 15760, 0, 630, 0x49dbb35f, F=0x21 +0, 16000, 16000, 340, 344, 0xb1eb63ed, F=0x21 +1, 16000, 16000, 0, 344, 0xb1eb63ed, F=0x21 +0, 16340, 16340, 600, 966, 0xb8a61edf, F=0x21 +1, 16340, 16340, 0, 966, 0xb8a61edf, F=0x21 +0, 16940, 16940, 460, 470, 0x80597fba, F=0x21 +1, 16940, 16940, 0, 470, 0x80597fba, F=0x21 +0, 17400, 17400, 360, 1212, 0x554768d6, F=0x21 +1, 17400, 17400, 0, 1212, 0x554768d6, F=0x21 +0, 17760, 17760, 220, 4804, 0xab67ddbe, F=0x21 +1, 17760, 17760, 0, 4804, 0xab67ddbe, F=0x21 +0, 17980, 17980, 960, 1016, 0x15e42d56, F=0x21 +1, 17980, 17980, 0, 1016, 0x15e42d56, F=0x21 +0, 18940, 18940, 220, 456, 0x57917e6f, F=0x21 +1, 18940, 18940, 0, 456, 0x57917e6f, F=0x21 +0, 19160, 19160, 260, 830, 0xcff3efde, F=0x21 +1, 19160, 19160, 0, 830, 0xcff3efde, F=0x21 +0, 19420, 19420, 100, 860, 0xd89903b6, F=0x21 +1, 19420, 19420, 0, 860, 0xd89903b6, F=0x21 +0, 19520, 19520, 220, 4426, 0x01eb43f1, F=0x21 +1, 19520, 19520, 0, 4426, 0x01eb43f1, F=0x21 +0, 19740, 19740, 220, 1132, 0xedda51a8, F=0x21 +1, 19740, 19740, 0, 1132, 0xedda51a8, F=0x21 +0, 19960, 19960, 0, 466, 0x9c957e09, F=0x21 +1, 19960, 19960, 0, 466, 0x9c957e09, F=0x21 diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block index bef887d58b..f7799a9881 100644 --- a/tests/ref/fate/matroska-zero-length-block +++ b/tests/ref/fate/matroska-zero-length-block @@ -3,8 +3,8 @@ d9c8efb9d64addce3cac97e6c417d985 *tests/data/fate/matroska-zero-length-block.mat #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: subrip -0, 1000, 1000, 2000, 5, 0x05b801df -0, 3300, 3300, 3700, 16, 0x300705b2 +0, 1000, 1000, 2000, 5, 0x05b801df, F=0x21 +0, 3300, 3300, 3700, 16, 0x300705b2, F=0x21 [STREAM] TAG:DESCRIPTION=This track uses header removal compression and has a Block of size zero before reversing it. [/STREAM] diff --git a/tests/ref/fate/matroska-zlib-decompression b/tests/ref/fate/matroska-zlib-decompression index 0ea732346a..d830f3cf75 100644 --- a/tests/ref/fate/matroska-zlib-decompression +++ b/tests/ref/fate/matroska-zlib-decompression @@ -2,4 +2,4 @@ #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: dvd_subtitle -0, 1000, 1000, 1991, 191, 0x52f74934 +0, 1000, 1000, 1991, 191, 0x52f74934, F=0x21 diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub index 53f89925b9..3987ddd2f5 100644 --- a/tests/ref/fate/shortest-sub +++ b/tests/ref/fate/shortest-sub @@ -142,7 +142,7 @@ 0, 130000, 130000, 1000, 3, 0x00000000 0, 131000, 131000, 1000, 3, 0x00000000 0, 132000, 132000, 1000, 3, 0x00000000 -1, 132499, 132499, 0, 2238, 0xf8f81348 +1, 132499, 132499, 0, 2238, 0xf8f81348, F=0x21 0, 133000, 133000, 1000, 3, 0x00000000 0, 134000, 134000, 1000, 3, 0x00000000 0, 135000, 135000, 1000, 3, 0x00000000 @@ -158,7 +158,7 @@ 0, 145000, 145000, 1000, 3, 0x00000000 0, 146000, 146000, 1000, 3, 0x00000000 0, 147000, 147000, 1000, 3, 0x00000000 -1, 147355, 147355, 0, 3320, 0x7091f477 +1, 147355, 147355, 0, 3320, 0x7091f477, F=0x21 0, 148000, 148000, 1000, 3, 0x00000000 0, 149000, 149000, 1000, 3, 0x00000000 0, 150000, 150000, 1000, 3, 0x00000000 @@ -192,22 +192,22 @@ 0, 178000, 178000, 1000, 3, 0x00000000 0, 179000, 179000, 1000, 3, 0x00000000 0, 180000, 180000, 1000, 3, 0x00000000 -1, 180797, 180797, 0, 3626, 0xe4ff6eab +1, 180797, 180797, 0, 3626, 0xe4ff6eab, F=0x21 0, 181000, 181000, 1000, 3, 0x00000000 0, 182000, 182000, 1000, 3, 0x00000000 0, 183000, 183000, 1000, 3, 0x00000000 -1, 183433, 183433, 0, 4156, 0xc73645fe +1, 183433, 183433, 0, 4156, 0xc73645fe, F=0x21 0, 184000, 184000, 1000, 3, 0x00000000 0, 185000, 185000, 1000, 3, 0x00000000 -1, 185919, 185919, 0, 2019, 0xe9a5f34f -1, 185919, 185919, 0, 1213, 0x8a62d853 +1, 185919, 185919, 0, 2019, 0xe9a5f34f, F=0x21 +1, 185919, 185919, 0, 1213, 0x8a62d853, F=0x21 0, 186000, 186000, 1000, 3, 0x00000000 0, 187000, 187000, 1000, 3, 0x00000000 0, 188000, 188000, 1000, 3, 0x00000000 -1, 188663, 188663, 0, 2184, 0xfdcd0323 +1, 188663, 188663, 0, 2184, 0xfdcd0323, F=0x21 0, 189000, 189000, 1000, 3, 0x00000000 0, 190000, 190000, 1000, 3, 0x00000000 -1, 190014, 190014, 0, 2172, 0xb479f0a1 +1, 190014, 190014, 0, 2172, 0xb479f0a1, F=0x21 0, 191000, 191000, 1000, 3, 0x00000000 0, 192000, 192000, 1000, 3, 0x00000000 0, 193000, 193000, 1000, 3, 0x00000000 @@ -217,64 +217,64 @@ 0, 197000, 197000, 1000, 3, 0x00000000 0, 198000, 198000, 1000, 3, 0x00000000 0, 199000, 199000, 1000, 3, 0x00000000 -1, 199724, 199724, 0, 2080, 0xe8e7c3a2 +1, 199724, 199724, 0, 2080, 0xe8e7c3a2, F=0x21 0, 200000, 200000, 1000, 3, 0x00000000 0, 201000, 201000, 1000, 3, 0x00000000 -1, 201175, 201175, 0, 1972, 0xd2c87cd0 +1, 201175, 201175, 0, 1972, 0xd2c87cd0, F=0x21 0, 202000, 202000, 1000, 3, 0x00000000 -1, 202819, 202819, 0, 2856, 0xc9a42a11 +1, 202819, 202819, 0, 2856, 0xc9a42a11, F=0x21 0, 203000, 203000, 1000, 3, 0x00000000 0, 204000, 204000, 1000, 3, 0x00000000 -1, 204762, 204762, 0, 3570, 0x02035220 +1, 204762, 204762, 0, 3570, 0x02035220, F=0x21 0, 205000, 205000, 1000, 3, 0x00000000 0, 206000, 206000, 1000, 3, 0x00000000 -1, 206806, 206806, 0, 3270, 0x9a39c179 +1, 206806, 206806, 0, 3270, 0x9a39c179, F=0x21 0, 207000, 207000, 1000, 3, 0x00000000 0, 208000, 208000, 1000, 3, 0x00000000 -1, 208716, 208716, 0, 2968, 0x6c0b46de +1, 208716, 208716, 0, 2968, 0x6c0b46de, F=0x21 0, 209000, 209000, 1000, 3, 0x00000000 0, 210000, 210000, 1000, 3, 0x00000000 -1, 210051, 210051, 0, 2142, 0x9e64e867 +1, 210051, 210051, 0, 2142, 0x9e64e867, F=0x21 0, 211000, 211000, 1000, 3, 0x00000000 -1, 211644, 211644, 0, 4060, 0x274516cc +1, 211644, 211644, 0, 4060, 0x274516cc, F=0x21 0, 212000, 212000, 1000, 3, 0x00000000 0, 213000, 213000, 1000, 3, 0x00000000 0, 214000, 214000, 1000, 3, 0x00000000 -1, 214380, 214380, 0, 4214, 0xa6a068cb +1, 214380, 214380, 0, 4214, 0xa6a068cb, F=0x21 0, 215000, 215000, 1000, 3, 0x00000000 0, 216000, 216000, 1000, 3, 0x00000000 0, 217000, 217000, 1000, 3, 0x00000000 -1, 217225, 217225, 0, 3770, 0x3d3aaf6c +1, 217225, 217225, 0, 3770, 0x3d3aaf6c, F=0x21 0, 218000, 218000, 1000, 3, 0x00000000 0, 219000, 219000, 1000, 3, 0x00000000 -1, 219652, 219652, 0, 1862, 0xaa9a5a30 +1, 219652, 219652, 0, 1862, 0xaa9a5a30, F=0x21 0, 220000, 220000, 1000, 3, 0x00000000 0, 221000, 221000, 1000, 3, 0x00000000 0, 222000, 222000, 1000, 3, 0x00000000 0, 223000, 223000, 1000, 3, 0x00000000 -1, 223531, 223531, 0, 3222, 0x390690fb +1, 223531, 223531, 0, 3222, 0x390690fb, F=0x21 0, 224000, 224000, 1000, 3, 0x00000000 0, 225000, 225000, 1000, 3, 0x00000000 0, 226000, 226000, 1000, 3, 0x00000000 0, 227000, 227000, 1000, 3, 0x00000000 -1, 227510, 227510, 0, 4064, 0x13e132a4 +1, 227510, 227510, 0, 4064, 0x13e132a4, F=0x21 0, 228000, 228000, 1000, 3, 0x00000000 0, 229000, 229000, 1000, 3, 0x00000000 0, 230000, 230000, 1000, 3, 0x00000000 -1, 230872, 230872, 0, 3010, 0xc4a07cbd +1, 230872, 230872, 0, 3010, 0xc4a07cbd, F=0x21 0, 231000, 231000, 1000, 3, 0x00000000 0, 232000, 232000, 1000, 3, 0x00000000 0, 233000, 233000, 1000, 3, 0x00000000 -1, 233124, 233124, 0, 4950, 0xd30b9b64 +1, 233124, 233124, 0, 4950, 0xd30b9b64, F=0x21 0, 234000, 234000, 1000, 3, 0x00000000 0, 235000, 235000, 1000, 3, 0x00000000 0, 236000, 236000, 1000, 3, 0x00000000 0, 237000, 237000, 1000, 3, 0x00000000 -1, 237303, 237303, 0, 4184, 0x5115659c +1, 237303, 237303, 0, 4184, 0x5115659c, F=0x21 0, 238000, 238000, 1000, 3, 0x00000000 0, 239000, 239000, 1000, 3, 0x00000000 0, 240000, 240000, 1000, 3, 0x00000000 -1, 240106, 240106, 0, 3554, 0x14804a6c +1, 240106, 240106, 0, 3554, 0x14804a6c, F=0x21 0, 241000, 241000, 1000, 3, 0x00000000 0, 242000, 242000, 1000, 3, 0x00000000 0, 243000, 243000, 1000, 3, 0x00000000 @@ -308,7 +308,7 @@ 0, 271000, 271000, 1000, 3, 0x00000000 0, 272000, 272000, 1000, 3, 0x00000000 0, 273000, 273000, 1000, 3, 0x00000000 -1, 273556, 273556, 0, 2300, 0x53d23a41 +1, 273556, 273556, 0, 2300, 0x53d23a41, F=0x21 0, 274000, 274000, 1000, 3, 0x00000000 0, 275000, 275000, 1000, 3, 0x00000000 0, 276000, 276000, 1000, 3, 0x00000000 @@ -331,25 +331,25 @@ 0, 293000, 293000, 1000, 3, 0x00000000 0, 294000, 294000, 1000, 3, 0x00000000 0, 295000, 295000, 1000, 3, 0x00000000 -1, 295445, 295445, 0, 1544, 0x4e4ed1a0 +1, 295445, 295445, 0, 1544, 0x4e4ed1a0, F=0x21 0, 296000, 296000, 1000, 3, 0x00000000 0, 297000, 297000, 1000, 3, 0x00000000 0, 298000, 298000, 1000, 3, 0x00000000 0, 299000, 299000, 1000, 3, 0x00000000 0, 300000, 300000, 1000, 3, 0x00000000 -1, 300049, 300049, 0, 2478, 0x6e3e7b4d +1, 300049, 300049, 0, 2478, 0x6e3e7b4d, F=0x21 0, 301000, 301000, 1000, 3, 0x00000000 0, 302000, 302000, 1000, 3, 0x00000000 -1, 302018, 302018, 0, 2019, 0x5eb7c3d9 -1, 302035, 302035, 0, 405, 0x98a58922 +1, 302018, 302018, 0, 2019, 0x5eb7c3d9, F=0x21 +1, 302035, 302035, 0, 405, 0x98a58922, F=0x21 0, 303000, 303000, 1000, 3, 0x00000000 0, 304000, 304000, 1000, 3, 0x00000000 -1, 304203, 304203, 0, 2998, 0xee7c6a15 +1, 304203, 304203, 0, 2998, 0xee7c6a15, F=0x21 0, 305000, 305000, 1000, 3, 0x00000000 -1, 305947, 305947, 0, 2640, 0xf426b974 +1, 305947, 305947, 0, 2640, 0xf426b974, F=0x21 0, 306000, 306000, 1000, 3, 0x00000000 0, 307000, 307000, 1000, 3, 0x00000000 -1, 307957, 307957, 0, 2174, 0x40340514 +1, 307957, 307957, 0, 2174, 0x40340514, F=0x21 0, 308000, 308000, 1000, 3, 0x00000000 0, 309000, 309000, 1000, 3, 0x00000000 0, 310000, 310000, 1000, 3, 0x00000000 @@ -364,26 +364,26 @@ 0, 319000, 319000, 1000, 3, 0x00000000 0, 320000, 320000, 1000, 3, 0x00000000 0, 321000, 321000, 1000, 3, 0x00000000 -1, 321295, 321295, 0, 2760, 0x4ae1e9ad +1, 321295, 321295, 0, 2760, 0x4ae1e9ad, F=0x21 0, 322000, 322000, 1000, 3, 0x00000000 0, 323000, 323000, 1000, 3, 0x00000000 -1, 323356, 323356, 0, 2688, 0xdec1c1d6 +1, 323356, 323356, 0, 2688, 0xdec1c1d6, F=0x21 0, 324000, 324000, 1000, 3, 0x00000000 -1, 324640, 324640, 0, 3694, 0x3b5d80de +1, 324640, 324640, 0, 3694, 0x3b5d80de, F=0x21 0, 325000, 325000, 1000, 3, 0x00000000 0, 326000, 326000, 1000, 3, 0x00000000 0, 327000, 327000, 1000, 3, 0x00000000 -1, 327193, 327193, 0, 2276, 0x0dae2c53 +1, 327193, 327193, 0, 2276, 0x0dae2c53, F=0x21 0, 328000, 328000, 1000, 3, 0x00000000 -1, 328369, 328369, 0, 2019, 0x4d9cd2f2 -1, 328369, 328369, 0, 847, 0x1d3f4a3d +1, 328369, 328369, 0, 2019, 0x4d9cd2f2, F=0x21 +1, 328369, 328369, 0, 847, 0x1d3f4a3d, F=0x21 0, 329000, 329000, 1000, 3, 0x00000000 -1, 329946, 329946, 0, 1974, 0xb63e71b1 +1, 329946, 329946, 0, 1974, 0xb63e71b1, F=0x21 0, 330000, 330000, 1000, 3, 0x00000000 0, 331000, 331000, 1000, 3, 0x00000000 -1, 331230, 331230, 0, 3004, 0x69a86a37 +1, 331230, 331230, 0, 3004, 0x69a86a37, F=0x21 0, 332000, 332000, 1000, 3, 0x00000000 -1, 332924, 332924, 0, 2124, 0xf5c6dc9a +1, 332924, 332924, 0, 2124, 0xf5c6dc9a, F=0x21 0, 333000, 333000, 1000, 3, 0x00000000 0, 334000, 334000, 1000, 3, 0x00000000 0, 335000, 335000, 1000, 3, 0x00000000 @@ -394,12 +394,12 @@ 0, 340000, 340000, 1000, 3, 0x00000000 0, 341000, 341000, 1000, 3, 0x00000000 0, 342000, 342000, 1000, 3, 0x00000000 -1, 342600, 342600, 0, 1876, 0x3ed26066 +1, 342600, 342600, 0, 1876, 0x3ed26066, F=0x21 0, 343000, 343000, 1000, 3, 0x00000000 0, 344000, 344000, 1000, 3, 0x00000000 0, 345000, 345000, 1000, 3, 0x00000000 0, 346000, 346000, 1000, 3, 0x00000000 -1, 346771, 346771, 0, 2426, 0xccae6c39 +1, 346771, 346771, 0, 2426, 0xccae6c39, F=0x21 0, 347000, 347000, 1000, 3, 0x00000000 0, 348000, 348000, 1000, 3, 0x00000000 0, 349000, 349000, 1000, 3, 0x00000000 @@ -411,7 +411,7 @@ 0, 355000, 355000, 1000, 3, 0x00000000 0, 356000, 356000, 1000, 3, 0x00000000 0, 357000, 357000, 1000, 3, 0x00000000 -1, 357640, 357640, 0, 3240, 0x90cb9fd1 +1, 357640, 357640, 0, 3240, 0x90cb9fd1, F=0x21 0, 358000, 358000, 1000, 3, 0x00000000 0, 359000, 359000, 1000, 3, 0x00000000 -1, 359834, 359834, 0, 2482, 0xc68e6a8a +1, 359834, 359834, 0, 2482, 0xc68e6a8a, F=0x21