From patchwork Tue Dec 1 20:19:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 24221 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 9CEE744BA85 for ; Tue, 1 Dec 2020 22:31:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F47C689ADA; Tue, 1 Dec 2020 22:31:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 059196880DD for ; Tue, 1 Dec 2020 22:31:43 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 1D540296B65 for ; Tue, 1 Dec 2020 21:31:42 +0100 (CET) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id RInMbJrZekaq for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (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 mail.red.khirnov.net (Postfix) with ESMTPS id 28E4B296B5F for ; Tue, 1 Dec 2020 21:31:37 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 324463A02CB; Tue, 1 Dec 2020 21:20:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Dec 2020 21:19:44 +0100 Message-Id: <20201201201949.18834-4-anton@khirnov.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201201949.18834-1-anton@khirnov.net> References: <20201201201949.18834-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] lavf/mux: rewrite guessing the packet duration 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Factor out the code into a separate muxing-specific function. Stop accessing the deprecated AVStream-embedded codec context, use the average framerate (if specified) instead. --- libavformat/mux.c | 49 ++-- tests/ref/fate/asf-repldata | 28 +-- tests/ref/fate/ffmpeg-attached_pics | 2 +- tests/ref/fate/ffmpeg-streamloop | 2 +- tests/ref/fate/g2m2 | 320 +++++++++++++-------------- tests/ref/fate/iff-byterun1 | 2 +- tests/ref/fate/iff-ilbm | 2 +- tests/ref/fate/iv8-demux | 50 ++--- tests/ref/fate/mimic | 152 ++++++------- tests/ref/fate/mss2-pal | 4 +- tests/ref/fate/mss2-pals | 4 +- tests/ref/fate/mss2-rgb555 | 4 +- tests/ref/fate/mss2-rgb555s | 4 +- tests/ref/fate/nuv-rtjpeg | 16 +- tests/ref/fate/segment-mp4-to-ts | 58 ++--- tests/ref/fate/smjpeg-demux | 82 +++---- tests/ref/fate/vp9-tiling-pedestrian | 4 +- tests/ref/lavf-fate/vp8.ogg | 4 +- 18 files changed, 403 insertions(+), 384 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index d2a56d216b..84c56ac6ba 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -546,7 +546,7 @@ FF_DISABLE_DEPRECATION_WARNINGS static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) { int delay = FFMAX(st->codecpar->video_delay, st->internal->avctx->max_b_frames > 0); - int num, den, i; + int i; int frame_size; if (!s->internal->missing_ts_warning && @@ -564,20 +564,6 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_log(s, AV_LOG_DEBUG, "compute_muxer_pkt_fields: pts:%s dts:%s cur_dts:%s b:%d size:%d st:%d\n", av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); - if (pkt->duration < 0 && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { - av_log(s, AV_LOG_WARNING, "Packet with invalid duration %"PRId64" in stream %d\n", - pkt->duration, pkt->stream_index); - pkt->duration = 0; - } - - /* duration field */ - if (pkt->duration == 0) { - ff_compute_frame_duration(s, &num, &den, st, NULL, pkt); - if (den && num) { - pkt->duration = av_rescale(1, num * (int64_t)st->time_base.den * st->codec->ticks_per_frame, den * (int64_t)st->time_base.num); - } - } - if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && delay == 0) pkt->pts = pkt->dts; @@ -652,6 +638,37 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * FF_ENABLE_DEPRECATION_WARNINGS #endif +static void guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + if (pkt->duration < 0 && st->codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { + av_log(s, AV_LOG_WARNING, "Packet with invalid duration %"PRId64" in stream %d\n", + pkt->duration, pkt->stream_index); + pkt->duration = 0; + } + + if (pkt->duration) + return; + + switch (st->codecpar->codec_type) { + case AVMEDIA_TYPE_VIDEO: + if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { + pkt->duration = av_rescale_q(1, av_inv_q(st->avg_frame_rate), + st->time_base); + } else if (st->time_base.num * 1000LL > st->time_base.den) + pkt->duration = 1; + break; + case AVMEDIA_TYPE_AUDIO: { + int frame_size = av_get_audio_frame_duration2(st->codecpar, pkt->size); + if (frame_size && st->codecpar->sample_rate) { + pkt->duration = av_rescale_q(frame_size, + (AVRational){1, st->codecpar->sample_rate}, + st->time_base); + } + break; + } + } +} + /** * Shift timestamps and call muxer; the original pts/dts are not kept. * @@ -1118,6 +1135,8 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __FUNCTION__, pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); + guess_pkt_duration(s, st, pkt); + #if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret; diff --git a/tests/ref/fate/asf-repldata b/tests/ref/fate/asf-repldata index 94744569f2..59eaf0c2a8 100644 --- a/tests/ref/fate/asf-repldata +++ b/tests/ref/fate/asf-repldata @@ -3,17 +3,17 @@ #codec_id 0: msmpeg4v3 #dimensions 0: 640x480 #sar 0: 0/1 -0, 0, 0, 0, 23374, 0x8725b3b8 -0, 122, 122, 0, 13732, 0x3ac8531a, F=0x0 -0, 245, 245, 0, 615, 0xd31641b4, F=0x0 -0, 367, 367, 0, 6361, 0xf263af54, F=0x0 -0, 490, 490, 0, 320, 0xd6f2d6b8, F=0x0 -0, 612, 612, 0, 3750, 0xfcf1d501, F=0x0 -0, 735, 735, 0, 2541, 0xd9fc04f9, F=0x0 -0, 857, 857, 0, 205, 0x4d38a947, F=0x0 -0, 980, 980, 0, 2166, 0x2f1e7d74, F=0x0 -0, 1102, 1102, 0, 1667, 0x0cd84b61, F=0x0 -0, 1224, 1224, 0, 13645, 0x543bd032, F=0x0 -0, 1347, 1347, 0, 5953, 0xc3037c73, F=0x0 -0, 1469, 1469, 0, 36169, 0xca9f716d -0, 1592, 1592, 0, 3030, 0x9aba5683, F=0x0 +0, 0, 0, 122, 23374, 0x8725b3b8 +0, 122, 122, 122, 13732, 0x3ac8531a, F=0x0 +0, 245, 245, 122, 615, 0xd31641b4, F=0x0 +0, 367, 367, 122, 6361, 0xf263af54, F=0x0 +0, 490, 490, 122, 320, 0xd6f2d6b8, F=0x0 +0, 612, 612, 122, 3750, 0xfcf1d501, F=0x0 +0, 735, 735, 122, 2541, 0xd9fc04f9, F=0x0 +0, 857, 857, 122, 205, 0x4d38a947, F=0x0 +0, 980, 980, 122, 2166, 0x2f1e7d74, F=0x0 +0, 1102, 1102, 122, 1667, 0x0cd84b61, F=0x0 +0, 1224, 1224, 122, 13645, 0x543bd032, F=0x0 +0, 1347, 1347, 122, 5953, 0xc3037c73, F=0x0 +0, 1469, 1469, 122, 36169, 0xca9f716d +0, 1592, 1592, 122, 3030, 0x9aba5683, F=0x0 diff --git a/tests/ref/fate/ffmpeg-attached_pics b/tests/ref/fate/ffmpeg-attached_pics index ee2f20638e..48c7ced363 100644 --- a/tests/ref/fate/ffmpeg-attached_pics +++ b/tests/ref/fate/ffmpeg-attached_pics @@ -9,7 +9,7 @@ #sample_rate 1: 44100 #channel_layout 1: 3 #channel_layout_name 1: stereo -0, 0, 0, 0, 120000, 0x748cc771 +0, 0, 0, 1, 120000, 0x748cc771 1, 0, 0, 4096, 16384, 0x00000000 1, 4096, 4096, 4096, 16384, 0x29cd639d 1, 8192, 8192, 4096, 16384, 0xd52066e5 diff --git a/tests/ref/fate/ffmpeg-streamloop b/tests/ref/fate/ffmpeg-streamloop index d22199d583..705c4646c6 100644 --- a/tests/ref/fate/ffmpeg-streamloop +++ b/tests/ref/fate/ffmpeg-streamloop @@ -8,7 +8,7 @@ #dimensions 0: 320x240 #sar 0: 1/1 #stream#, dts, pts, duration, size, hash -0, -80, 0, 0, 5131, fb6a475e53addc2ffa79e1b75de81050 +0, -80, 0, 40, 5131, fb6a475e53addc2ffa79e1b75de81050 0, -40, 160, 40, 2479, fc64a1f7054d22741fffc68891ff4887 0, 0, 80, 40, 1354, 344ee1f5e8f0fe2785639dd530cf85ca 0, 40, 40, 40, 965, cbea2691414063d4e1199b781586cac4 diff --git a/tests/ref/fate/g2m2 b/tests/ref/fate/g2m2 index 42b7b6f2e1..d939b167e8 100644 --- a/tests/ref/fate/g2m2 +++ b/tests/ref/fate/g2m2 @@ -3,163 +3,163 @@ #codec_id 0: rawvideo #dimensions 0: 1024x768 #sar 0: 0/1 -0, 47, 47, 0, 2359296, 0xb4434e4f -0, 62, 62, 0, 2359296, 0x59cb5027 -0, 78, 78, 0, 2359296, 0xe9bc578d -0, 109, 109, 0, 2359296, 0x5d17554f -0, 125, 125, 0, 2359296, 0x6d685457 -0, 437, 437, 0, 2359296, 0x13205420 -0, 438, 438, 0, 2359296, 0xb8e15116 -0, 453, 453, 0, 2359296, 0x2ca55195 -0, 469, 469, 0, 2359296, 0x767d1c45 -0, 484, 484, 0, 2359296, 0x0af42016 -0, 500, 500, 0, 2359296, 0xa2083e69 -0, 516, 516, 0, 2359296, 0xb68a1308 -0, 531, 531, 0, 2359296, 0x4f334c0e -0, 547, 547, 0, 2359296, 0x98b74e4f -0, 562, 562, 0, 2359296, 0xd9de4e4f -0, 578, 578, 0, 2359296, 0xa17c4e4f -0, 594, 594, 0, 2359296, 0xa49a665d -0, 609, 609, 0, 2359296, 0xf5f87360 -0, 781, 781, 0, 2359296, 0x75747360 -0, 797, 797, 0, 2359296, 0x745d7360 -0, 812, 812, 0, 2359296, 0x33047360 -0, 828, 828, 0, 2359296, 0xf19c7360 -0, 844, 844, 0, 2359296, 0xb0437360 -0, 859, 859, 0, 2359296, 0xaf2c7360 -0, 875, 875, 0, 2359296, 0x2ea87360 -0, 891, 891, 0, 2359296, 0xee577360 -0, 953, 953, 0, 2359296, 0x6dd37360 -0, 1078, 1078, 0, 2359296, 0xab327965 -0, 1094, 1094, 0, 2359296, 0x5f8677d0 -0, 1109, 1109, 0, 2359296, 0x02135eb4 -0, 1125, 1125, 0, 2359296, 0x09784e4f -0, 1141, 1141, 0, 2359296, 0xa140a62d -0, 1156, 1156, 0, 2359296, 0xa140a62d -0, 1484, 1484, 0, 2359296, 0xa140a62d -0, 1516, 1516, 0, 2359296, 0xa140a62d -0, 1547, 1547, 0, 2359296, 0xa140a62d -0, 1641, 1641, 0, 2359296, 0xa140a62d -0, 1642, 1642, 0, 2359296, 0xa140a62d -0, 1656, 1656, 0, 2359296, 0xa140a62d -0, 1657, 1657, 0, 2359296, 0xa140a62d -0, 1672, 1672, 0, 2359296, 0xa140a62d -0, 1673, 1673, 0, 2359296, 0x92024e4f -0, 1687, 1687, 0, 2359296, 0xb1754dbe -0, 1688, 1688, 0, 2359296, 0x15ee5eb4 -0, 1703, 1703, 0, 2359296, 0xb1d9746e -0, 1719, 1719, 0, 2359296, 0xabe77360 -0, 1734, 1734, 0, 2359296, 0xaad07360 -0, 1750, 1750, 0, 2359296, 0x2a4c7360 -0, 1766, 1766, 0, 2359296, 0x69777360 -0, 1781, 1781, 0, 2359296, 0xe8e47360 -0, 2328, 2328, 0, 2359296, 0x29357360 -0, 3031, 3031, 0, 2359296, 0x69777360 -0, 3078, 3078, 0, 2359296, 0xa9b97360 -0, 3109, 3109, 0, 2359296, 0xd2697707 -0, 3141, 3141, 0, 2359296, 0x22a07965 -0, 3156, 3156, 0, 2359296, 0xf9327aa7 -0, 3172, 3172, 0, 2359296, 0xa5d277d0 -0, 3203, 3203, 0, 2359296, 0x97b6746e -0, 3328, 3328, 0, 2359296, 0x80bb746e -0, 4562, 4562, 0, 2359296, 0x530b719a -0, 4672, 4672, 0, 2359296, 0x4827665d -0, 4703, 4703, 0, 2359296, 0xc48c5eb4 -0, 5391, 5391, 0, 2359296, 0xe6465eb4 -0, 5578, 5578, 0, 2359296, 0xece455ec -0, 5594, 5594, 0, 2359296, 0xb5344dbe -0, 5609, 5609, 0, 2359296, 0xa140a62d -0, 5625, 5625, 0, 2359296, 0xa140a62d -0, 5641, 5641, 0, 2359296, 0xa140a62d -0, 5642, 5642, 0, 2359296, 0xa140a62d -0, 5656, 5656, 0, 2359296, 0xa140a62d -0, 5672, 5672, 0, 2359296, 0xa140a62d -0, 5703, 5703, 0, 2359296, 0xa140a62d -0, 5750, 5750, 0, 2359296, 0xa140a62d -0, 5766, 5766, 0, 2359296, 0xa140a62d -0, 5781, 5781, 0, 2359296, 0xa140a62d -0, 5797, 5797, 0, 2359296, 0xa140a62d -0, 5812, 5812, 0, 2359296, 0xa140a62d -0, 5875, 5875, 0, 2359296, 0xa140a62d -0, 5922, 5922, 0, 2359296, 0xa140a62d -0, 5984, 5984, 0, 2359296, 0xa140a62d -0, 6031, 6031, 0, 2359296, 0xa140a62d -0, 6047, 6047, 0, 2359296, 0xa140a62d -0, 6062, 6062, 0, 2359296, 0xa140a62d -0, 6406, 6406, 0, 2359296, 0xa140a62d -0, 6453, 6453, 0, 2359296, 0xa140a62d -0, 6469, 6469, 0, 2359296, 0xa140a62d -0, 6484, 6484, 0, 2359296, 0xa140a62d -0, 6500, 6500, 0, 2359296, 0xa140a62d -0, 6516, 6516, 0, 2359296, 0xa140a62d -0, 6531, 6531, 0, 2359296, 0xa140a62d -0, 6547, 6547, 0, 2359296, 0xa140a62d -0, 6562, 6562, 0, 2359296, 0x5c2a4cd9 -0, 6578, 6578, 0, 2359296, 0x28f94e4f -0, 6594, 6594, 0, 2359296, 0x9acb4820 -0, 6609, 6609, 0, 2359296, 0x9ec716e1 -0, 6625, 6625, 0, 2359296, 0xaf5f3fa4 -0, 6641, 6641, 0, 2359296, 0x7d633218 -0, 6642, 6642, 0, 2359296, 0x34fb2016 -0, 6656, 6656, 0, 2359296, 0x61351665 -0, 6812, 6812, 0, 2359296, 0xb23c1039 -0, 6828, 6828, 0, 2359296, 0x59290d69 -0, 6844, 6844, 0, 2359296, 0x639c132d -0, 6859, 6859, 0, 2359296, 0x0b252237 -0, 6875, 6875, 0, 2359296, 0xe66f2fc5 -0, 6891, 6891, 0, 2359296, 0xa8b33761 -0, 6906, 6906, 0, 2359296, 0x81a63f8b -0, 6969, 6969, 0, 2359296, 0x18074843 -0, 6984, 6984, 0, 2359296, 0x434a5195 -0, 7000, 7000, 0, 2359296, 0x6da15116 -0, 7001, 7001, 0, 2359296, 0xca755420 -0, 7016, 7016, 0, 2359296, 0xe6fc5457 -0, 7017, 7017, 0, 2359296, 0x271d53fd -0, 7031, 7031, 0, 2359296, 0xa15b554f -0, 7281, 7281, 0, 2359296, 0x49f6578d -0, 7282, 7282, 0, 2359296, 0x2c0c4e4f -0, 7297, 7297, 0, 2359296, 0x7e924e4f -0, 7298, 7298, 0, 2359296, 0x32ff4e4f -0, 7312, 7312, 0, 2359296, 0x23ad4e4f -0, 7313, 7313, 0, 2359296, 0x7ddc4e4f -0, 7328, 7328, 0, 2359296, 0xd0624e4f -0, 7329, 7329, 0, 2359296, 0x22f74e4f -0, 7781, 7781, 0, 2359296, 0x49fa4e4f -0, 7797, 7797, 0, 2359296, 0x6a5a5027 -0, 7812, 7812, 0, 2359296, 0x9f935027 -0, 7828, 7828, 0, 2359296, 0xc5e55027 -0, 7844, 7844, 0, 2359296, 0xd4cc5027 -0, 8250, 8250, 0, 2359296, 0xd2ab5027 -0, 8266, 8266, 0, 2359296, 0x68f04e4f -0, 8281, 8281, 0, 2359296, 0xd0b44e4f -0, 8297, 8297, 0, 2359296, 0xfced4e4f -0, 8298, 8298, 0, 2359296, 0x8b0d4e4f -0, 8312, 8312, 0, 2359296, 0x09db4e4f -0, 8328, 8328, 0, 2359296, 0x4d0f4e4f -0, 8329, 8329, 0, 2359296, 0xad824dbe -0, 8344, 8344, 0, 2359296, 0x9aca4dbe -0, 8345, 8345, 0, 2359296, 0x755a4dbe -0, 8359, 8359, 0, 2359296, 0xc6824d2d -0, 8360, 8360, 0, 2359296, 0x7c344c0e -0, 8375, 8375, 0, 2359296, 0x50f04c0e -0, 8391, 8391, 0, 2359296, 0xfa594c0e -0, 8406, 8406, 0, 2359296, 0x4d494c0e -0, 8422, 8422, 0, 2359296, 0xf6b24c0e -0, 8437, 8437, 0, 2359296, 0xcb6e4c0e -0, 8453, 8453, 0, 2359296, 0xbd024c0e -0, 8516, 8516, 0, 2359296, 0x245b4dbe -0, 8531, 8531, 0, 2359296, 0x47874e4f -0, 8547, 8547, 0, 2359296, 0xdead4e4f -0, 8562, 8562, 0, 2359296, 0x847e4e4f -0, 9344, 9344, 0, 2359296, 0x1a13e47c -0, 9345, 9345, 0, 2359296, 0x46b3e321 -0, 9876, 9876, 0, 2359296, 0x76c0e35d -0, 9922, 9922, 0, 2359296, 0xf6d9e519 -0, 9938, 9938, 0, 2359296, 0xac0fe4b3 -0, 9954, 9954, 0, 2359296, 0x3a3fe424 -0, 9955, 9955, 0, 2359296, 0xa97ce1a8 -0, 9969, 9969, 0, 2359296, 0x12fae01d -0, 9970, 9970, 0, 2359296, 0x65b4df14 -0, 9985, 9985, 0, 2359296, 0x82d0e032 -0, 9986, 9986, 0, 2359296, 0xa452e0cf -0, 10001, 10001, 0, 2359296, 0x22d6df37 +0, 47, 47, 1, 2359296, 0xb4434e4f +0, 62, 62, 1, 2359296, 0x59cb5027 +0, 78, 78, 1, 2359296, 0xe9bc578d +0, 109, 109, 1, 2359296, 0x5d17554f +0, 125, 125, 1, 2359296, 0x6d685457 +0, 437, 437, 1, 2359296, 0x13205420 +0, 438, 438, 1, 2359296, 0xb8e15116 +0, 453, 453, 1, 2359296, 0x2ca55195 +0, 469, 469, 1, 2359296, 0x767d1c45 +0, 484, 484, 1, 2359296, 0x0af42016 +0, 500, 500, 1, 2359296, 0xa2083e69 +0, 516, 516, 1, 2359296, 0xb68a1308 +0, 531, 531, 1, 2359296, 0x4f334c0e +0, 547, 547, 1, 2359296, 0x98b74e4f +0, 562, 562, 1, 2359296, 0xd9de4e4f +0, 578, 578, 1, 2359296, 0xa17c4e4f +0, 594, 594, 1, 2359296, 0xa49a665d +0, 609, 609, 1, 2359296, 0xf5f87360 +0, 781, 781, 1, 2359296, 0x75747360 +0, 797, 797, 1, 2359296, 0x745d7360 +0, 812, 812, 1, 2359296, 0x33047360 +0, 828, 828, 1, 2359296, 0xf19c7360 +0, 844, 844, 1, 2359296, 0xb0437360 +0, 859, 859, 1, 2359296, 0xaf2c7360 +0, 875, 875, 1, 2359296, 0x2ea87360 +0, 891, 891, 1, 2359296, 0xee577360 +0, 953, 953, 1, 2359296, 0x6dd37360 +0, 1078, 1078, 1, 2359296, 0xab327965 +0, 1094, 1094, 1, 2359296, 0x5f8677d0 +0, 1109, 1109, 1, 2359296, 0x02135eb4 +0, 1125, 1125, 1, 2359296, 0x09784e4f +0, 1141, 1141, 1, 2359296, 0xa140a62d +0, 1156, 1156, 1, 2359296, 0xa140a62d +0, 1484, 1484, 1, 2359296, 0xa140a62d +0, 1516, 1516, 1, 2359296, 0xa140a62d +0, 1547, 1547, 1, 2359296, 0xa140a62d +0, 1641, 1641, 1, 2359296, 0xa140a62d +0, 1642, 1642, 1, 2359296, 0xa140a62d +0, 1656, 1656, 1, 2359296, 0xa140a62d +0, 1657, 1657, 1, 2359296, 0xa140a62d +0, 1672, 1672, 1, 2359296, 0xa140a62d +0, 1673, 1673, 1, 2359296, 0x92024e4f +0, 1687, 1687, 1, 2359296, 0xb1754dbe +0, 1688, 1688, 1, 2359296, 0x15ee5eb4 +0, 1703, 1703, 1, 2359296, 0xb1d9746e +0, 1719, 1719, 1, 2359296, 0xabe77360 +0, 1734, 1734, 1, 2359296, 0xaad07360 +0, 1750, 1750, 1, 2359296, 0x2a4c7360 +0, 1766, 1766, 1, 2359296, 0x69777360 +0, 1781, 1781, 1, 2359296, 0xe8e47360 +0, 2328, 2328, 1, 2359296, 0x29357360 +0, 3031, 3031, 1, 2359296, 0x69777360 +0, 3078, 3078, 1, 2359296, 0xa9b97360 +0, 3109, 3109, 1, 2359296, 0xd2697707 +0, 3141, 3141, 1, 2359296, 0x22a07965 +0, 3156, 3156, 1, 2359296, 0xf9327aa7 +0, 3172, 3172, 1, 2359296, 0xa5d277d0 +0, 3203, 3203, 1, 2359296, 0x97b6746e +0, 3328, 3328, 1, 2359296, 0x80bb746e +0, 4562, 4562, 1, 2359296, 0x530b719a +0, 4672, 4672, 1, 2359296, 0x4827665d +0, 4703, 4703, 1, 2359296, 0xc48c5eb4 +0, 5391, 5391, 1, 2359296, 0xe6465eb4 +0, 5578, 5578, 1, 2359296, 0xece455ec +0, 5594, 5594, 1, 2359296, 0xb5344dbe +0, 5609, 5609, 1, 2359296, 0xa140a62d +0, 5625, 5625, 1, 2359296, 0xa140a62d +0, 5641, 5641, 1, 2359296, 0xa140a62d +0, 5642, 5642, 1, 2359296, 0xa140a62d +0, 5656, 5656, 1, 2359296, 0xa140a62d +0, 5672, 5672, 1, 2359296, 0xa140a62d +0, 5703, 5703, 1, 2359296, 0xa140a62d +0, 5750, 5750, 1, 2359296, 0xa140a62d +0, 5766, 5766, 1, 2359296, 0xa140a62d +0, 5781, 5781, 1, 2359296, 0xa140a62d +0, 5797, 5797, 1, 2359296, 0xa140a62d +0, 5812, 5812, 1, 2359296, 0xa140a62d +0, 5875, 5875, 1, 2359296, 0xa140a62d +0, 5922, 5922, 1, 2359296, 0xa140a62d +0, 5984, 5984, 1, 2359296, 0xa140a62d +0, 6031, 6031, 1, 2359296, 0xa140a62d +0, 6047, 6047, 1, 2359296, 0xa140a62d +0, 6062, 6062, 1, 2359296, 0xa140a62d +0, 6406, 6406, 1, 2359296, 0xa140a62d +0, 6453, 6453, 1, 2359296, 0xa140a62d +0, 6469, 6469, 1, 2359296, 0xa140a62d +0, 6484, 6484, 1, 2359296, 0xa140a62d +0, 6500, 6500, 1, 2359296, 0xa140a62d +0, 6516, 6516, 1, 2359296, 0xa140a62d +0, 6531, 6531, 1, 2359296, 0xa140a62d +0, 6547, 6547, 1, 2359296, 0xa140a62d +0, 6562, 6562, 1, 2359296, 0x5c2a4cd9 +0, 6578, 6578, 1, 2359296, 0x28f94e4f +0, 6594, 6594, 1, 2359296, 0x9acb4820 +0, 6609, 6609, 1, 2359296, 0x9ec716e1 +0, 6625, 6625, 1, 2359296, 0xaf5f3fa4 +0, 6641, 6641, 1, 2359296, 0x7d633218 +0, 6642, 6642, 1, 2359296, 0x34fb2016 +0, 6656, 6656, 1, 2359296, 0x61351665 +0, 6812, 6812, 1, 2359296, 0xb23c1039 +0, 6828, 6828, 1, 2359296, 0x59290d69 +0, 6844, 6844, 1, 2359296, 0x639c132d +0, 6859, 6859, 1, 2359296, 0x0b252237 +0, 6875, 6875, 1, 2359296, 0xe66f2fc5 +0, 6891, 6891, 1, 2359296, 0xa8b33761 +0, 6906, 6906, 1, 2359296, 0x81a63f8b +0, 6969, 6969, 1, 2359296, 0x18074843 +0, 6984, 6984, 1, 2359296, 0x434a5195 +0, 7000, 7000, 1, 2359296, 0x6da15116 +0, 7001, 7001, 1, 2359296, 0xca755420 +0, 7016, 7016, 1, 2359296, 0xe6fc5457 +0, 7017, 7017, 1, 2359296, 0x271d53fd +0, 7031, 7031, 1, 2359296, 0xa15b554f +0, 7281, 7281, 1, 2359296, 0x49f6578d +0, 7282, 7282, 1, 2359296, 0x2c0c4e4f +0, 7297, 7297, 1, 2359296, 0x7e924e4f +0, 7298, 7298, 1, 2359296, 0x32ff4e4f +0, 7312, 7312, 1, 2359296, 0x23ad4e4f +0, 7313, 7313, 1, 2359296, 0x7ddc4e4f +0, 7328, 7328, 1, 2359296, 0xd0624e4f +0, 7329, 7329, 1, 2359296, 0x22f74e4f +0, 7781, 7781, 1, 2359296, 0x49fa4e4f +0, 7797, 7797, 1, 2359296, 0x6a5a5027 +0, 7812, 7812, 1, 2359296, 0x9f935027 +0, 7828, 7828, 1, 2359296, 0xc5e55027 +0, 7844, 7844, 1, 2359296, 0xd4cc5027 +0, 8250, 8250, 1, 2359296, 0xd2ab5027 +0, 8266, 8266, 1, 2359296, 0x68f04e4f +0, 8281, 8281, 1, 2359296, 0xd0b44e4f +0, 8297, 8297, 1, 2359296, 0xfced4e4f +0, 8298, 8298, 1, 2359296, 0x8b0d4e4f +0, 8312, 8312, 1, 2359296, 0x09db4e4f +0, 8328, 8328, 1, 2359296, 0x4d0f4e4f +0, 8329, 8329, 1, 2359296, 0xad824dbe +0, 8344, 8344, 1, 2359296, 0x9aca4dbe +0, 8345, 8345, 1, 2359296, 0x755a4dbe +0, 8359, 8359, 1, 2359296, 0xc6824d2d +0, 8360, 8360, 1, 2359296, 0x7c344c0e +0, 8375, 8375, 1, 2359296, 0x50f04c0e +0, 8391, 8391, 1, 2359296, 0xfa594c0e +0, 8406, 8406, 1, 2359296, 0x4d494c0e +0, 8422, 8422, 1, 2359296, 0xf6b24c0e +0, 8437, 8437, 1, 2359296, 0xcb6e4c0e +0, 8453, 8453, 1, 2359296, 0xbd024c0e +0, 8516, 8516, 1, 2359296, 0x245b4dbe +0, 8531, 8531, 1, 2359296, 0x47874e4f +0, 8547, 8547, 1, 2359296, 0xdead4e4f +0, 8562, 8562, 1, 2359296, 0x847e4e4f +0, 9344, 9344, 1, 2359296, 0x1a13e47c +0, 9345, 9345, 1, 2359296, 0x46b3e321 +0, 9876, 9876, 1, 2359296, 0x76c0e35d +0, 9922, 9922, 1, 2359296, 0xf6d9e519 +0, 9938, 9938, 1, 2359296, 0xac0fe4b3 +0, 9954, 9954, 1, 2359296, 0x3a3fe424 +0, 9955, 9955, 1, 2359296, 0xa97ce1a8 +0, 9969, 9969, 1, 2359296, 0x12fae01d +0, 9970, 9970, 1, 2359296, 0x65b4df14 +0, 9985, 9985, 1, 2359296, 0x82d0e032 +0, 9986, 9986, 1, 2359296, 0xa452e0cf +0, 10001, 10001, 1, 2359296, 0x22d6df37 diff --git a/tests/ref/fate/iff-byterun1 b/tests/ref/fate/iff-byterun1 index 8e6f949f62..ccb852fb07 100644 --- a/tests/ref/fate/iff-byterun1 +++ b/tests/ref/fate/iff-byterun1 @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 5/6 -0, 0, 0, 0, 230400, 0x35e51c62 +0, 0, 0, 1, 230400, 0x35e51c62 diff --git a/tests/ref/fate/iff-ilbm b/tests/ref/fate/iff-ilbm index 38c43eb589..93e026da97 100644 --- a/tests/ref/fate/iff-ilbm +++ b/tests/ref/fate/iff-ilbm @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 1/1 -0, 0, 0, 0, 230400, 0x0929e342 +0, 0, 0, 1, 230400, 0x0929e342 diff --git a/tests/ref/fate/iv8-demux b/tests/ref/fate/iv8-demux index 518f3de974..5b4cf0d4b0 100644 --- a/tests/ref/fate/iv8-demux +++ b/tests/ref/fate/iv8-demux @@ -4,28 +4,28 @@ #codec_id 0: mpeg4 #dimensions 0: 704x576 #sar 0: 1/1 -0, 0, 0, 0, 20883, 0x347191e2 -0, 3600, 3600, 0, 20882, 0xe1573905 -0, 7200, 7200, 0, 20894, 0xd54f516a -0, 10800, 10800, 0, 20891, 0x1b5c5039 -0, 14400, 14400, 0, 20883, 0x8e785b4d -0, 18000, 18000, 0, 20870, 0xd26ca1f6 -0, 21600, 21600, 0, 21448, 0x946f5b2b -0, 25200, 25200, 0, 21433, 0xb18687c5 -0, 28800, 28800, 0, 20865, 0xc0eb3fce -0, 32399, 32399, 0, 20842, 0x9d0728ba -0, 35999, 35999, 0, 20878, 0xf60f5dee -0, 39600, 39600, 0, 20866, 0x3bde568f -0, 43200, 43200, 0, 20884, 0x22736993 -0, 46800, 46800, 0, 20860, 0xf56f2fca -0, 50400, 50400, 0, 20872, 0xf39e3cb3 -0, 53999, 53999, 0, 20835, 0xa3c4363b -0, 57600, 57600, 0, 20905, 0x552853d1 -0, 61200, 61200, 0, 20874, 0xed0b91ec -0, 64799, 64799, 0, 20877, 0xe1623e01 -0, 68399, 68399, 0, 20933, 0x19906564 -0, 72000, 72000, 0, 20891, 0x3d064fd3 -0, 75600, 75600, 0, 20834, 0xcb774dbc -0, 79200, 79200, 0, 20870, 0xbc536589 -0, 82800, 82800, 0, 21421, 0xc99a68e4 -0, 86400, 86400, 0, 12869, 0x5684e304 +0, 0, 0, 3600, 20883, 0x347191e2 +0, 3600, 3600, 3600, 20882, 0xe1573905 +0, 7200, 7200, 3600, 20894, 0xd54f516a +0, 10800, 10800, 3600, 20891, 0x1b5c5039 +0, 14400, 14400, 3600, 20883, 0x8e785b4d +0, 18000, 18000, 3600, 20870, 0xd26ca1f6 +0, 21600, 21600, 3600, 21448, 0x946f5b2b +0, 25200, 25200, 3600, 21433, 0xb18687c5 +0, 28800, 28800, 3600, 20865, 0xc0eb3fce +0, 32399, 32399, 3600, 20842, 0x9d0728ba +0, 35999, 35999, 3600, 20878, 0xf60f5dee +0, 39600, 39600, 3600, 20866, 0x3bde568f +0, 43200, 43200, 3600, 20884, 0x22736993 +0, 46800, 46800, 3600, 20860, 0xf56f2fca +0, 50400, 50400, 3600, 20872, 0xf39e3cb3 +0, 53999, 53999, 3600, 20835, 0xa3c4363b +0, 57600, 57600, 3600, 20905, 0x552853d1 +0, 61200, 61200, 3600, 20874, 0xed0b91ec +0, 64799, 64799, 3600, 20877, 0xe1623e01 +0, 68399, 68399, 3600, 20933, 0x19906564 +0, 72000, 72000, 3600, 20891, 0x3d064fd3 +0, 75600, 75600, 3600, 20834, 0xcb774dbc +0, 79200, 79200, 3600, 20870, 0xbc536589 +0, 82800, 82800, 3600, 21421, 0xc99a68e4 +0, 86400, 86400, 3600, 12869, 0x5684e304 diff --git a/tests/ref/fate/mimic b/tests/ref/fate/mimic index e36e6a8c91..06209481af 100644 --- a/tests/ref/fate/mimic +++ b/tests/ref/fate/mimic @@ -3,79 +3,79 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 0/1 -0, 0, 0, 0, 115200, 0xa974d407 -0, 548, 548, 0, 115200, 0x72618b84 -0, 1088, 1088, 0, 115200, 0x87768573 -0, 1759, 1759, 0, 115200, 0x5d218e3e -0, 2437, 2437, 0, 115200, 0x0c0db41c -0, 3076, 3076, 0, 115200, 0xb777fd48 -0, 3908, 3908, 0, 115200, 0x40765de7 -0, 4545, 4545, 0, 115200, 0x370a3c90 -0, 5092, 5092, 0, 115200, 0xc605785a -0, 6016, 6016, 0, 115200, 0x49468b23 -0, 6560, 6560, 0, 115200, 0x986b6fd4 -0, 7648, 7648, 0, 115200, 0x30f22ef8 -0, 8164, 8164, 0, 115200, 0xa90bd608 -0, 8836, 8836, 0, 115200, 0x9cf36518 -0, 9632, 9632, 0, 115200, 0x4ef1a679 -0, 9922, 9922, 0, 115200, 0x0df65873 -0, 10316, 10316, 0, 115200, 0xfecd4233 -0, 11104, 11104, 0, 115200, 0xee2f26cb -0, 11776, 11776, 0, 115200, 0x795f612d -0, 12321, 12321, 0, 115200, 0xbbb90125 -0, 12992, 12992, 0, 115200, 0x9230fb6e -0, 13805, 13805, 0, 115200, 0x11869996 -0, 14468, 14468, 0, 115200, 0x6b5c892b -0, 15136, 15136, 0, 115200, 0x88bdb9cd -0, 15937, 15937, 0, 115200, 0x364bc5a0 -0, 16608, 16608, 0, 115200, 0x6b66d817 -0, 17281, 17281, 0, 115200, 0xd3a41252 -0, 18089, 18089, 0, 115200, 0x0cf5612f -0, 18754, 18754, 0, 115200, 0x9752d055 -0, 19808, 19808, 0, 115200, 0x486e9f6f -0, 20484, 20484, 0, 115200, 0x3eab62f8 -0, 21031, 21031, 0, 115200, 0xa7f52762 -0, 21957, 21957, 0, 115200, 0xfd4c4bbc -0, 22498, 22498, 0, 115200, 0x194023f6 -0, 22880, 22880, 0, 115200, 0xd4668dad -0, 23680, 23680, 0, 115200, 0x6b20d64b -0, 24353, 24353, 0, 115200, 0xf2572aae -0, 24901, 24901, 0, 115200, 0xc3554f25 -0, 25695, 25695, 0, 115200, 0xeeb5073a -0, 26495, 26495, 0, 115200, 0xbd46291f -0, 27040, 27040, 0, 115200, 0x0526838d -0, 28107, 28107, 0, 115200, 0x85b2e864 -0, 28778, 28778, 0, 115200, 0xcfd894bc -0, 29316, 29316, 0, 115200, 0x644f10fb -0, 30240, 30240, 0, 115200, 0x556e4d88 -0, 30786, 30786, 0, 115200, 0x93243614 -0, 31983, 31983, 0, 115200, 0x754275c5 -0, 32929, 32929, 0, 115200, 0x7f648bf3 -0, 33600, 33600, 0, 115200, 0xece18c9b -0, 34271, 34271, 0, 115200, 0x385d52c1 -0, 35201, 35201, 0, 115200, 0xafc58e4a -0, 35743, 35743, 0, 115200, 0x50daf750 -0, 36384, 36384, 0, 115200, 0xf6bc67d1 -0, 37344, 37344, 0, 115200, 0xb64b6e07 -0, 38028, 38028, 0, 115200, 0x8751ed15 -0, 38657, 38657, 0, 115200, 0x329ce803 -0, 39334, 39334, 0, 115200, 0x40b2cb05 -0, 40129, 40129, 0, 115200, 0x60f3517d -0, 40802, 40802, 0, 115200, 0xe0d46fdf -0, 41472, 41472, 0, 115200, 0x204529fa -0, 42276, 42276, 0, 115200, 0xd5afaf22 -0, 42944, 42944, 0, 115200, 0xd3cb3d4c -0, 43616, 43616, 0, 115200, 0x87973a79 -0, 44421, 44421, 0, 115200, 0xe3b2f917 -0, 45092, 45092, 0, 115200, 0xf1923238 -0, 45632, 45632, 0, 115200, 0x51494d71 -0, 46561, 46561, 0, 115200, 0x58bc59bb -0, 47105, 47105, 0, 115200, 0xd0273fdb -0, 47776, 47776, 0, 115200, 0x6cc79700 -0, 48294, 48294, 0, 115200, 0xc8172d31 -0, 48960, 48960, 0, 115200, 0x8eb037ef -0, 49504, 49504, 0, 115200, 0xc0bc2d76 -0, 50053, 50053, 0, 115200, 0x663c467a -0, 50597, 50597, 0, 115200, 0xd085e950 -0, 51520, 51520, 0, 115200, 0x7d198d72 -0, 52092, 52092, 0, 115200, 0x6ebacda0 +0, 0, 0, 1, 115200, 0xa974d407 +0, 548, 548, 1, 115200, 0x72618b84 +0, 1088, 1088, 1, 115200, 0x87768573 +0, 1759, 1759, 1, 115200, 0x5d218e3e +0, 2437, 2437, 1, 115200, 0x0c0db41c +0, 3076, 3076, 1, 115200, 0xb777fd48 +0, 3908, 3908, 1, 115200, 0x40765de7 +0, 4545, 4545, 1, 115200, 0x370a3c90 +0, 5092, 5092, 1, 115200, 0xc605785a +0, 6016, 6016, 1, 115200, 0x49468b23 +0, 6560, 6560, 1, 115200, 0x986b6fd4 +0, 7648, 7648, 1, 115200, 0x30f22ef8 +0, 8164, 8164, 1, 115200, 0xa90bd608 +0, 8836, 8836, 1, 115200, 0x9cf36518 +0, 9632, 9632, 1, 115200, 0x4ef1a679 +0, 9922, 9922, 1, 115200, 0x0df65873 +0, 10316, 10316, 1, 115200, 0xfecd4233 +0, 11104, 11104, 1, 115200, 0xee2f26cb +0, 11776, 11776, 1, 115200, 0x795f612d +0, 12321, 12321, 1, 115200, 0xbbb90125 +0, 12992, 12992, 1, 115200, 0x9230fb6e +0, 13805, 13805, 1, 115200, 0x11869996 +0, 14468, 14468, 1, 115200, 0x6b5c892b +0, 15136, 15136, 1, 115200, 0x88bdb9cd +0, 15937, 15937, 1, 115200, 0x364bc5a0 +0, 16608, 16608, 1, 115200, 0x6b66d817 +0, 17281, 17281, 1, 115200, 0xd3a41252 +0, 18089, 18089, 1, 115200, 0x0cf5612f +0, 18754, 18754, 1, 115200, 0x9752d055 +0, 19808, 19808, 1, 115200, 0x486e9f6f +0, 20484, 20484, 1, 115200, 0x3eab62f8 +0, 21031, 21031, 1, 115200, 0xa7f52762 +0, 21957, 21957, 1, 115200, 0xfd4c4bbc +0, 22498, 22498, 1, 115200, 0x194023f6 +0, 22880, 22880, 1, 115200, 0xd4668dad +0, 23680, 23680, 1, 115200, 0x6b20d64b +0, 24353, 24353, 1, 115200, 0xf2572aae +0, 24901, 24901, 1, 115200, 0xc3554f25 +0, 25695, 25695, 1, 115200, 0xeeb5073a +0, 26495, 26495, 1, 115200, 0xbd46291f +0, 27040, 27040, 1, 115200, 0x0526838d +0, 28107, 28107, 1, 115200, 0x85b2e864 +0, 28778, 28778, 1, 115200, 0xcfd894bc +0, 29316, 29316, 1, 115200, 0x644f10fb +0, 30240, 30240, 1, 115200, 0x556e4d88 +0, 30786, 30786, 1, 115200, 0x93243614 +0, 31983, 31983, 1, 115200, 0x754275c5 +0, 32929, 32929, 1, 115200, 0x7f648bf3 +0, 33600, 33600, 1, 115200, 0xece18c9b +0, 34271, 34271, 1, 115200, 0x385d52c1 +0, 35201, 35201, 1, 115200, 0xafc58e4a +0, 35743, 35743, 1, 115200, 0x50daf750 +0, 36384, 36384, 1, 115200, 0xf6bc67d1 +0, 37344, 37344, 1, 115200, 0xb64b6e07 +0, 38028, 38028, 1, 115200, 0x8751ed15 +0, 38657, 38657, 1, 115200, 0x329ce803 +0, 39334, 39334, 1, 115200, 0x40b2cb05 +0, 40129, 40129, 1, 115200, 0x60f3517d +0, 40802, 40802, 1, 115200, 0xe0d46fdf +0, 41472, 41472, 1, 115200, 0x204529fa +0, 42276, 42276, 1, 115200, 0xd5afaf22 +0, 42944, 42944, 1, 115200, 0xd3cb3d4c +0, 43616, 43616, 1, 115200, 0x87973a79 +0, 44421, 44421, 1, 115200, 0xe3b2f917 +0, 45092, 45092, 1, 115200, 0xf1923238 +0, 45632, 45632, 1, 115200, 0x51494d71 +0, 46561, 46561, 1, 115200, 0x58bc59bb +0, 47105, 47105, 1, 115200, 0xd0273fdb +0, 47776, 47776, 1, 115200, 0x6cc79700 +0, 48294, 48294, 1, 115200, 0xc8172d31 +0, 48960, 48960, 1, 115200, 0x8eb037ef +0, 49504, 49504, 1, 115200, 0xc0bc2d76 +0, 50053, 50053, 1, 115200, 0x663c467a +0, 50597, 50597, 1, 115200, 0xd085e950 +0, 51520, 51520, 1, 115200, 0x7d198d72 +0, 52092, 52092, 1, 115200, 0x6ebacda0 diff --git a/tests/ref/fate/mss2-pal b/tests/ref/fate/mss2-pal index a2fb12fdfc..ae5de4ec1f 100644 --- a/tests/ref/fate/mss2-pal +++ b/tests/ref/fate/mss2-pal @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 9216, 0xd3c106ef -0, 100, 100, 0, 9216, 0x8871f7c2 +0, 0, 0, 1, 9216, 0xd3c106ef +0, 100, 100, 1, 9216, 0x8871f7c2 diff --git a/tests/ref/fate/mss2-pals b/tests/ref/fate/mss2-pals index a2fb12fdfc..ae5de4ec1f 100644 --- a/tests/ref/fate/mss2-pals +++ b/tests/ref/fate/mss2-pals @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 9216, 0xd3c106ef -0, 100, 100, 0, 9216, 0x8871f7c2 +0, 0, 0, 1, 9216, 0xd3c106ef +0, 100, 100, 1, 9216, 0x8871f7c2 diff --git a/tests/ref/fate/mss2-rgb555 b/tests/ref/fate/mss2-rgb555 index 10f1f03e7f..95661e776c 100644 --- a/tests/ref/fate/mss2-rgb555 +++ b/tests/ref/fate/mss2-rgb555 @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 6144, 0x4145b7ae -0, 100, 100, 0, 6144, 0x3b2b38de +0, 0, 0, 1, 6144, 0x4145b7ae +0, 100, 100, 1, 6144, 0x3b2b38de diff --git a/tests/ref/fate/mss2-rgb555s b/tests/ref/fate/mss2-rgb555s index 10f1f03e7f..95661e776c 100644 --- a/tests/ref/fate/mss2-rgb555s +++ b/tests/ref/fate/mss2-rgb555s @@ -3,5 +3,5 @@ #codec_id 0: rawvideo #dimensions 0: 64x48 #sar 0: 0/1 -0, 0, 0, 0, 6144, 0x4145b7ae -0, 100, 100, 0, 6144, 0x3b2b38de +0, 0, 0, 1, 6144, 0x4145b7ae +0, 100, 100, 1, 6144, 0x3b2b38de diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg index b6f3b080dc..bc5af1ca22 100644 --- a/tests/ref/fate/nuv-rtjpeg +++ b/tests/ref/fate/nuv-rtjpeg @@ -3,11 +3,11 @@ #codec_id 0: rawvideo #dimensions 0: 640x480 #sar 0: 1/1 -0, 118, 118, 0, 460800, 0x54aedafe -0, 152, 152, 0, 460800, 0xb7aa8b56 -0, 177, 177, 0, 460800, 0x283ea3b5 -0, 202, 202, 0, 460800, 0x283ea3b5 -0, 235, 235, 0, 460800, 0x10e577de -0, 269, 269, 0, 460800, 0x4e091ee2 -0, 302, 302, 0, 460800, 0x2ea88828 -0, 335, 335, 0, 460800, 0x4b7f4df0 +0, 118, 118, 1, 460800, 0x54aedafe +0, 152, 152, 1, 460800, 0xb7aa8b56 +0, 177, 177, 1, 460800, 0x283ea3b5 +0, 202, 202, 1, 460800, 0x283ea3b5 +0, 235, 235, 1, 460800, 0x10e577de +0, 269, 269, 1, 460800, 0x4e091ee2 +0, 302, 302, 1, 460800, 0x2ea88828 +0, 335, 335, 1, 460800, 0x4b7f4df0 diff --git a/tests/ref/fate/segment-mp4-to-ts b/tests/ref/fate/segment-mp4-to-ts index 847c1a297d..dfefb0af20 100644 --- a/tests/ref/fate/segment-mp4-to-ts +++ b/tests/ref/fate/segment-mp4-to-ts @@ -4,35 +4,35 @@ #codec_id 0: h264 #dimensions 0: 640x360 #sar 0: 1/1 -0, -7200, 0, 0, 22630, 0x9b109541, S=1, 1, 0x00e000e0 -0, -3600, 14400, 0, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 -0, 0, 7200, 0, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 -0, 3600, 3600, 0, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 -0, 7200, 10800, 0, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 -0, 10800, 28800, 0, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 -0, 14400, 21600, 0, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 -0, 18000, 18000, 0, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 -0, 21600, 25200, 0, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 -0, 25200, 43200, 0, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 -0, 28800, 36000, 0, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 -0, 32400, 32400, 0, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 -0, 36000, 39600, 0, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 -0, 39600, 57600, 0, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 -0, 43200, 50400, 0, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 -0, 46800, 46800, 0, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 -0, 50400, 54000, 0, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 -0, 54000, 72000, 0, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 -0, 57600, 64800, 0, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 -0, 61200, 61200, 0, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 -0, 64800, 68400, 0, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 -0, 68400, 86400, 0, 26555, 0x5629b584, S=1, 1, 0x00e000e0 -0, 72000, 79200, 0, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 -0, 75600, 75600, 0, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 -0, 79200, 82800, 0, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 -0, 82800, 100800, 0, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 -0, 86400, 93600, 0, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 -0, 90000, 90000, 0, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 -0, 93600, 97200, 0, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 +0, -7200, 0, 3600, 22630, 0x9b109541, S=1, 1, 0x00e000e0 +0, -3600, 14400, 3600, 4021, 0xbf7cdb02, F=0x0, S=1, 1, 0x00e000e0 +0, 0, 7200, 3600, 1096, 0x4f162690, F=0x0, S=1, 1, 0x00e000e0 +0, 3600, 3600, 3600, 687, 0x00394b95, F=0x0, S=1, 1, 0x00e000e0 +0, 7200, 10800, 3600, 445, 0x08c3d065, F=0x0, S=1, 1, 0x00e000e0 +0, 10800, 28800, 3600, 4212, 0x56d12b8f, F=0x0, S=1, 1, 0x00e000e0 +0, 14400, 21600, 3600, 1117, 0xd521260b, F=0x0, S=1, 1, 0x00e000e0 +0, 18000, 18000, 3600, 892, 0x4262bdbc, F=0x0, S=1, 1, 0x00e000e0 +0, 21600, 25200, 3600, 480, 0x3be1ef0b, F=0x0, S=1, 1, 0x00e000e0 +0, 25200, 43200, 3600, 4065, 0x40dee237, F=0x0, S=1, 1, 0x00e000e0 +0, 28800, 36000, 3600, 962, 0x31a4ceb1, F=0x0, S=1, 1, 0x00e000e0 +0, 32400, 32400, 3600, 651, 0xb2aa317a, F=0x0, S=1, 1, 0x00e000e0 +0, 36000, 39600, 3600, 543, 0x9c4e0024, F=0x0, S=1, 1, 0x00e000e0 +0, 39600, 57600, 3600, 4221, 0x77c23977, F=0x0, S=1, 1, 0x00e000e0 +0, 43200, 50400, 3600, 1040, 0x482cfa34, F=0x0, S=1, 1, 0x00e000e0 +0, 46800, 46800, 3600, 576, 0x2686136a, F=0x0, S=1, 1, 0x00e000e0 +0, 50400, 54000, 3600, 607, 0xc53c2339, F=0x0, S=1, 1, 0x00e000e0 +0, 54000, 72000, 3600, 4755, 0x2f642b58, F=0x0, S=1, 1, 0x00e000e0 +0, 57600, 64800, 3600, 1182, 0xbe1a4847, F=0x0, S=1, 1, 0x00e000e0 +0, 61200, 61200, 3600, 809, 0x8d948a4e, F=0x0, S=1, 1, 0x00e000e0 +0, 64800, 68400, 3600, 656, 0x4fa03c2b, F=0x0, S=1, 1, 0x00e000e0 +0, 68400, 86400, 3600, 26555, 0x5629b584, S=1, 1, 0x00e000e0 +0, 72000, 79200, 3600, 1141, 0x761b31e8, F=0x0, S=1, 1, 0x00e000e0 +0, 75600, 75600, 3600, 717, 0x57746351, F=0x0, S=1, 1, 0x00e000e0 +0, 79200, 82800, 3600, 693, 0x78b24263, F=0x0, S=1, 1, 0x00e000e0 +0, 82800, 100800, 3600, 3417, 0x560dbc89, F=0x0, S=1, 1, 0x00e000e0 +0, 86400, 93600, 3600, 1128, 0xc0f1383c, F=0x0, S=1, 1, 0x00e000e0 +0, 90000, 90000, 3600, 650, 0xc3ad485e, F=0x0, S=1, 1, 0x00e000e0 +0, 93600, 97200, 3600, 766, 0xd3e9757d, F=0x0, S=1, 1, 0x00e000e0 0, 97200, 115200, 3600, 4268, 0xec1235b5, F=0x0, S=1, 1, 0x00e000e0 0, 100800, 108000, 3600, 1119, 0x65f51fb7, F=0x0, S=1, 1, 0x00e000e0 0, 104400, 104400, 3600, 766, 0x213b78d3, F=0x0, S=1, 1, 0x00e000e0 diff --git a/tests/ref/fate/smjpeg-demux b/tests/ref/fate/smjpeg-demux index 042f9ff9ec..cb2da6909d 100644 --- a/tests/ref/fate/smjpeg-demux +++ b/tests/ref/fate/smjpeg-demux @@ -9,239 +9,239 @@ #sample_rate 1: 22050 #channel_layout 1: 4 #channel_layout_name 1: mono -0, 0, 0, 0, 734, 0x5a042c2c +0, 0, 0, 111, 734, 0x5a042c2c 1, 0, 0, 23, 260, 0x00000000 1, 23, 23, 23, 260, 0x00000000 1, 46, 46, 23, 260, 0xac9e0a9b 1, 69, 69, 23, 260, 0x89256f5b 1, 92, 92, 23, 260, 0x8e646e36 -0, 111, 111, 0, 763, 0xb5893f2f +0, 111, 111, 111, 763, 0xb5893f2f 1, 116, 116, 23, 260, 0x3ab972fc 1, 139, 139, 23, 260, 0xaea86bb2 1, 162, 162, 23, 260, 0x2366447a 1, 185, 185, 23, 260, 0x82c14f9c 1, 208, 208, 23, 260, 0xcdcf6fa8 -0, 222, 222, 0, 3023, 0x0f3907d3 +0, 222, 222, 111, 3023, 0x0f3907d3 1, 232, 232, 23, 260, 0xb3ed64bd 1, 255, 255, 23, 260, 0xac304b92 1, 278, 278, 23, 260, 0xc8bc553b 1, 301, 301, 23, 260, 0xd35572b4 1, 325, 325, 23, 260, 0x182f6190 -0, 333, 333, 0, 4800, 0x22e6e18a +0, 333, 333, 111, 4800, 0x22e6e18a 1, 348, 348, 23, 260, 0xbf9145c0 1, 371, 371, 23, 260, 0x0ec85a7e 1, 394, 394, 23, 260, 0x3684720e 1, 417, 417, 23, 260, 0xe985616a 1, 441, 441, 23, 260, 0x12b147dc -0, 444, 444, 0, 6417, 0x427adde5 +0, 444, 444, 111, 6417, 0x427adde5 1, 464, 464, 23, 260, 0xb8b55dd9 1, 487, 487, 23, 260, 0xfd4a7007 1, 510, 510, 23, 260, 0xfcc05c9a 1, 534, 534, 23, 260, 0x20f74aea -0, 555, 555, 0, 6776, 0x7a74c6ad +0, 555, 555, 111, 6776, 0x7a74c6ad 1, 557, 557, 23, 260, 0x025359ca 1, 580, 580, 23, 260, 0xace44ba1 1, 603, 603, 23, 260, 0x03506929 1, 626, 626, 23, 260, 0x8a926f17 1, 650, 650, 23, 260, 0x4a7061e7 -0, 666, 666, 0, 6808, 0x1f6eb7c3 +0, 666, 666, 111, 6808, 0x1f6eb7c3 1, 673, 673, 23, 260, 0xf8b66cc9 1, 696, 696, 23, 260, 0xe8c96dec 1, 719, 719, 23, 260, 0x672a54a6 1, 743, 743, 23, 260, 0xe97b5698 1, 766, 766, 23, 260, 0x377f684d -0, 777, 777, 0, 6726, 0x452087e6 +0, 777, 777, 111, 6726, 0x452087e6 1, 789, 789, 23, 260, 0xe9a66786 1, 812, 812, 23, 260, 0xf8e17080 1, 835, 835, 23, 260, 0x65eb662a 1, 859, 859, 23, 260, 0xd8d361e9 1, 882, 882, 23, 260, 0xb8115a0b -0, 888, 888, 0, 6829, 0xee82b109 +0, 888, 888, 111, 6829, 0xee82b109 1, 905, 905, 23, 260, 0xa5a85461 1, 928, 928, 23, 260, 0xf401663b 1, 952, 952, 23, 260, 0x042f714e 1, 975, 975, 23, 260, 0xdf195820 1, 998, 998, 23, 260, 0x0a67653c -0, 999, 999, 0, 7055, 0xf41f1108 +0, 999, 999, 111, 7055, 0xf41f1108 1, 1021, 1021, 23, 260, 0xe9b44d02 1, 1044, 1044, 23, 260, 0xbd4747b9 1, 1068, 1068, 23, 260, 0x3ef66738 1, 1091, 1091, 23, 260, 0x0f4a6e44 -0, 1111, 1111, 0, 6977, 0xf8fe1ede +0, 1111, 1111, 111, 6977, 0xf8fe1ede 1, 1114, 1114, 23, 260, 0xaa3d6eb6 1, 1137, 1137, 23, 260, 0xb9a46c4a 1, 1160, 1160, 23, 260, 0x4f974c2e 1, 1184, 1184, 23, 260, 0x9e714a00 1, 1207, 1207, 23, 260, 0x601a7152 -0, 1222, 1222, 0, 6942, 0x9ad105c6 +0, 1222, 1222, 111, 6942, 0x9ad105c6 1, 1230, 1230, 23, 260, 0xaf317064 1, 1253, 1253, 23, 260, 0x163d4829 1, 1277, 1277, 23, 260, 0xc56b4f1a 1, 1300, 1300, 23, 260, 0x7623729c 1, 1323, 1323, 23, 260, 0xa514694f -0, 1333, 1333, 0, 6926, 0xe239dad6 +0, 1333, 1333, 111, 6926, 0xe239dad6 1, 1346, 1346, 23, 260, 0x93ee4ad8 1, 1369, 1369, 23, 260, 0x6d8e573f 1, 1393, 1393, 23, 260, 0x13256d68 1, 1416, 1416, 23, 260, 0x187761a2 1, 1439, 1439, 23, 260, 0x426045e7 -0, 1444, 1444, 0, 6966, 0x81dcfab1 +0, 1444, 1444, 111, 6966, 0x81dcfab1 1, 1462, 1462, 23, 260, 0x7e7e5891 1, 1486, 1486, 23, 260, 0xd6926dcc 1, 1509, 1509, 23, 260, 0xf0196061 1, 1532, 1532, 23, 260, 0x7cac49a3 -0, 1555, 1555, 0, 6896, 0x31e6cc02 +0, 1555, 1555, 111, 6896, 0x31e6cc02 1, 1555, 1555, 23, 260, 0x24f4549a 1, 1578, 1578, 23, 260, 0x937f551d 1, 1602, 1602, 23, 260, 0x9bf462c5 1, 1625, 1625, 23, 260, 0xd1e07436 1, 1648, 1648, 23, 260, 0xdab36215 -0, 1666, 1666, 0, 6889, 0x1cc1006e +0, 1666, 1666, 111, 6889, 0x1cc1006e 1, 1671, 1671, 23, 260, 0xabc5662b 1, 1695, 1695, 23, 260, 0xa24f6bf1 1, 1718, 1718, 23, 260, 0x39e664b2 1, 1741, 1741, 23, 260, 0xf5dc54ca 1, 1764, 1764, 23, 260, 0xc3b16974 -0, 1777, 1777, 0, 6933, 0xc303f87f +0, 1777, 1777, 111, 6933, 0xc303f87f 1, 1787, 1787, 23, 260, 0x6cf46bca 1, 1811, 1811, 23, 260, 0x7a6b69b9 1, 1834, 1834, 23, 260, 0xc02f69b9 1, 1857, 1857, 23, 260, 0x7fc764a9 1, 1880, 1880, 23, 260, 0xd9705b09 -0, 1888, 1888, 0, 7034, 0xb4970a20 +0, 1888, 1888, 111, 7034, 0xb4970a20 1, 1904, 1904, 23, 260, 0x17b05f49 1, 1927, 1927, 23, 260, 0x10ad647c 1, 1950, 1950, 23, 260, 0xf9636d69 1, 1973, 1973, 23, 260, 0x622b5ad9 1, 1996, 1996, 23, 260, 0x175b646d -0, 1999, 1999, 0, 6961, 0xf064095d +0, 1999, 1999, 111, 6961, 0xf064095d 1, 2020, 2020, 23, 260, 0x722b5827 1, 2043, 2043, 23, 260, 0x83614974 1, 2066, 2066, 23, 260, 0x80366587 1, 2089, 2089, 23, 260, 0x050f6bf9 -0, 2111, 2111, 0, 7089, 0x5ba350f9 +0, 2111, 2111, 111, 7089, 0x5ba350f9 1, 2113, 2113, 23, 260, 0x949d6735 1, 2136, 2136, 23, 260, 0x62cd7184 1, 2159, 2159, 23, 260, 0x21e45713 1, 2182, 2182, 23, 260, 0x56314509 1, 2205, 2205, 23, 260, 0x7a1570d3 -0, 2222, 2222, 0, 7078, 0xa83f3e88 +0, 2222, 2222, 111, 7078, 0xa83f3e88 1, 2229, 2229, 23, 260, 0x205a6ffb 1, 2252, 2252, 23, 260, 0xead94483 1, 2275, 2275, 23, 260, 0x93c84f10 1, 2298, 2298, 23, 260, 0xdf45726f 1, 2321, 2321, 23, 260, 0x35016f1e -0, 2333, 2333, 0, 7147, 0xcda66cfc +0, 2333, 2333, 111, 7147, 0xcda66cfc 1, 2345, 2345, 23, 260, 0xa8114bcd 1, 2368, 2368, 23, 260, 0x14c45130 1, 2391, 2391, 23, 260, 0x97b07052 1, 2414, 2414, 23, 260, 0x039b6c77 1, 2438, 2438, 23, 260, 0x46f74635 -0, 2444, 2444, 0, 7173, 0xb7455859 +0, 2444, 2444, 111, 7173, 0xb7455859 1, 2461, 2461, 23, 260, 0x4116540d 1, 2484, 2484, 23, 260, 0x26747067 1, 2507, 2507, 23, 260, 0x37f16485 1, 2530, 2530, 23, 260, 0x631d4a33 1, 2554, 2554, 23, 260, 0x14ed598d -0, 2555, 2555, 0, 7213, 0x97b89994 +0, 2555, 2555, 111, 7213, 0x97b89994 1, 2577, 2577, 23, 260, 0x3f9349e7 1, 2600, 2600, 23, 260, 0x91295757 1, 2623, 2623, 23, 260, 0x95de72bc 1, 2647, 2647, 23, 260, 0xc7ee5ddb -0, 2666, 2666, 0, 7170, 0xca8b2948 +0, 2666, 2666, 111, 7170, 0xca8b2948 1, 2670, 2670, 23, 260, 0x38e965cd 1, 2693, 2693, 23, 260, 0xfae169e9 1, 2716, 2716, 23, 260, 0x9c226143 1, 2739, 2739, 23, 260, 0x1a804dbe 1, 2763, 2763, 23, 260, 0x4aeb633c -0, 2777, 2777, 0, 7174, 0xc7cc6bbb +0, 2777, 2777, 111, 7174, 0xc7cc6bbb 1, 2786, 2786, 23, 260, 0xa66e6bbb 1, 2809, 2809, 23, 260, 0x51d17109 1, 2832, 2832, 23, 260, 0x2bc86b9b 1, 2856, 2856, 23, 260, 0xe56e6378 1, 2879, 2879, 23, 260, 0x95665b47 -0, 2888, 2888, 0, 7235, 0xc2e68d2b +0, 2888, 2888, 111, 7235, 0xc2e68d2b 1, 2902, 2902, 23, 260, 0x1c255fdb 1, 2925, 2925, 23, 260, 0x3a2456cb 1, 2948, 2948, 23, 260, 0xe18e7270 1, 2972, 2972, 23, 260, 0x55b65c60 1, 2995, 2995, 23, 260, 0x62be6515 -0, 3000, 3000, 0, 7261, 0x8204a423 +0, 3000, 3000, 111, 7261, 0x8204a423 1, 3018, 3018, 23, 260, 0xdba25d09 1, 3041, 3041, 23, 260, 0xd7cc4e40 1, 3065, 3065, 23, 260, 0x335661be 1, 3088, 3088, 23, 260, 0xc3286de3 -0, 3111, 3111, 0, 7353, 0xacc7e7c0 +0, 3111, 3111, 111, 7353, 0xacc7e7c0 1, 3111, 3111, 23, 260, 0x47e76e35 1, 3134, 3134, 23, 260, 0x4b716f77 1, 3157, 3157, 23, 260, 0x0716519e 1, 3181, 3181, 23, 260, 0x032b4490 1, 3204, 3204, 23, 260, 0x15f067e8 -0, 3222, 3222, 0, 7065, 0x45035c5c +0, 3222, 3222, 111, 7065, 0x45035c5c 1, 3227, 3227, 23, 260, 0x16766ffa 1, 3250, 3250, 23, 260, 0xc94154ac 1, 3274, 3274, 23, 260, 0x74764bcd 1, 3297, 3297, 23, 260, 0x3fad6f8f 1, 3320, 3320, 23, 260, 0x5fa972a9 -0, 3333, 3333, 0, 7269, 0x72edbb76 +0, 3333, 3333, 111, 7269, 0x72edbb76 1, 3343, 3343, 23, 260, 0xde2a4b7b 1, 3366, 3366, 23, 260, 0xd8494408 1, 3390, 3390, 23, 260, 0x843d71a6 1, 3413, 3413, 23, 260, 0x87fd6b60 1, 3436, 3436, 23, 260, 0x1cc04a39 -0, 3444, 3444, 0, 7220, 0xb926772f +0, 3444, 3444, 111, 7220, 0xb926772f 1, 3459, 3459, 23, 260, 0x9ca24d94 1, 3482, 3482, 23, 260, 0x820a7087 1, 3506, 3506, 23, 260, 0x631166b2 1, 3529, 3529, 23, 260, 0x2f20492a 1, 3552, 3552, 23, 260, 0x932156d0 -0, 3555, 3555, 0, 7326, 0x0a66c632 +0, 3555, 3555, 111, 7326, 0x0a66c632 1, 3575, 3575, 23, 260, 0xdad54c90 1, 3599, 3599, 23, 260, 0xcce84fc9 1, 3622, 3622, 23, 260, 0xba317486 1, 3645, 3645, 23, 260, 0xf5a4626a -0, 3666, 3666, 0, 7225, 0xe39076ab +0, 3666, 3666, 111, 7225, 0xe39076ab 1, 3668, 3668, 23, 260, 0x324669fd 1, 3691, 3691, 23, 260, 0xc7d37113 1, 3715, 3715, 23, 260, 0xc6e0644f 1, 3738, 3738, 23, 260, 0x1b91522e 1, 3761, 3761, 23, 260, 0x9b84667d -0, 3777, 3777, 0, 7265, 0xe0209036 +0, 3777, 3777, 111, 7265, 0xe0209036 1, 3784, 3784, 23, 260, 0xed7e66eb 1, 3808, 3808, 23, 260, 0xaf806d1f 1, 3831, 3831, 23, 260, 0x13a66941 1, 3854, 3854, 23, 260, 0x13095a41 1, 3877, 3877, 23, 260, 0x5ba05491 -0, 3888, 3888, 0, 7337, 0x7a5dc093 +0, 3888, 3888, 111, 7337, 0x7a5dc093 1, 3900, 3900, 23, 260, 0xbf785887 1, 3924, 3924, 23, 260, 0x21965973 1, 3947, 3947, 23, 260, 0xd9aa7134 1, 3970, 3970, 23, 260, 0x3add62bc 1, 3993, 3993, 23, 260, 0xb9626260 -0, 4000, 4000, 0, 7246, 0x519a7a3c +0, 4000, 4000, 111, 7246, 0x519a7a3c 1, 4017, 4017, 23, 260, 0x5b08629f 1, 4040, 4040, 23, 260, 0x43a34659 1, 4063, 4063, 23, 260, 0x68575bda 1, 4086, 4086, 23, 260, 0xd98b715a 1, 4109, 4109, 23, 260, 0x7d816a77 -0, 4111, 4111, 0, 7266, 0x352c8078 +0, 4111, 4111, 111, 7266, 0x352c8078 1, 4133, 4133, 23, 260, 0x16af6ff1 1, 4156, 4156, 23, 260, 0x6d4557a7 1, 4179, 4179, 23, 260, 0x0743401a 1, 4202, 4202, 23, 260, 0x410563d8 -0, 4222, 4222, 0, 7323, 0xcaf69d7c +0, 4222, 4222, 111, 7323, 0xcaf69d7c 1, 4226, 4226, 23, 260, 0x561371d1 1, 4249, 4249, 23, 260, 0x3ef15872 1, 4272, 4272, 23, 260, 0x1dd04972 1, 4295, 4295, 23, 260, 0xed226c62 1, 4318, 4318, 23, 260, 0x20857046 -0, 4333, 4333, 0, 7309, 0x98c1e6f7 +0, 4333, 4333, 111, 7309, 0x98c1e6f7 1, 4342, 4342, 23, 260, 0xed7f4724 1, 4365, 4365, 23, 260, 0x7a7445cf 1, 4388, 4388, 23, 260, 0x06ad6a93 1, 4411, 4411, 23, 260, 0xdd1b6c91 1, 4435, 4435, 23, 260, 0x05b94d27 -0, 4444, 4444, 0, 7121, 0x913d5bd6 +0, 4444, 4444, 111, 7121, 0x913d5bd6 1, 4458, 4458, 23, 260, 0x12cc5062 1, 4481, 4481, 23, 260, 0x44526d0f 1, 4504, 4504, 23, 260, 0xf2ac6d95 diff --git a/tests/ref/fate/vp9-tiling-pedestrian b/tests/ref/fate/vp9-tiling-pedestrian index 4b25a2914a..173869faa9 100644 --- a/tests/ref/fate/vp9-tiling-pedestrian +++ b/tests/ref/fate/vp9-tiling-pedestrian @@ -7,5 +7,5 @@ #dimensions 0: 1920x1080 #sar 0: 1/1 #stream#, dts, pts, duration, size, hash -0, 0, 0, 0, 3110400, 1e6c2e768a5107e57e6d626f0511193a -0, 40, 40, 0, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d +0, 0, 0, 1, 3110400, 1e6c2e768a5107e57e6d626f0511193a +0, 40, 40, 1, 3110400, 972d3e2b5ee2e3b0907218a243e4cb7d diff --git a/tests/ref/lavf-fate/vp8.ogg b/tests/ref/lavf-fate/vp8.ogg index 1a40825569..06240160b5 100644 --- a/tests/ref/lavf-fate/vp8.ogg +++ b/tests/ref/lavf-fate/vp8.ogg @@ -1,3 +1,3 @@ -c56d8dce728d46d4f0ab4c7cc9f86abc *tests/data/lavf-fate/lavf.vp8.ogg +20f1e9b1714513a0ba85ca636e818784 *tests/data/lavf-fate/lavf.vp8.ogg 95009 tests/data/lavf-fate/lavf.vp8.ogg -tests/data/lavf-fate/lavf.vp8.ogg CRC=0x8c067a66 +tests/data/lavf-fate/lavf.vp8.ogg CRC=0xa5857a66