From 045c5283c323a668fb0a989a3483d980fedd8f65 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 12 Oct 2011 03:38:08 +0200 Subject: cdg: set timestamps Signed-off-by: Michael Niedermayer --- libavformat/cdg.c | 1 + tests/ref/fate/cdgraphics | 351 +++++++++++++++++++++++----------------------- 2 files changed, 177 insertions(+), 175 deletions(-) diff --git a/libavformat/cdg.c b/libavformat/cdg.c index b547bbeebe..1f1442b100 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -52,6 +52,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE); pkt->stream_index = 0; + pkt->dts=pkt->pts= s->streams[0]->cur_dts; return ret; } diff --git a/tests/ref/fate/cdgraphics b/tests/ref/fate/cdgraphics index 0f9e74eec8..6391b00348 100644 --- a/tests/ref/fate/cdgraphics +++ b/tests/ref/fate/cdgraphics @@ -35,265 +35,266 @@ 0, 10200, 194400, 0xd015dba1 0, 10500, 194400, 0x6a39f18b 0, 10800, 194400, 0x7b8cf983 -0, 11100, 194400, 0x07a20f7c -0, 11400, 194400, 0xa63e2962 +0, 11100, 194400, 0x7b8cf983 +0, 11400, 194400, 0x07a20f7c 0, 11700, 194400, 0xa63e2962 -0, 12000, 194400, 0x2dd54447 -0, 12300, 194400, 0x90735e2d +0, 12000, 194400, 0xa63e2962 +0, 12300, 194400, 0x2dd54447 0, 12600, 194400, 0x90735e2d -0, 12900, 194400, 0x90d98506 -0, 13200, 194400, 0xe5b08ffb +0, 12900, 194400, 0x90735e2d +0, 13200, 194400, 0x90d98506 0, 13500, 194400, 0xe5b08ffb -0, 13800, 194400, 0x7a0d95f5 -0, 14100, 194400, 0xff6bacde +0, 13800, 194400, 0xe5b08ffb +0, 14100, 194400, 0x7a0d95f5 0, 14400, 194400, 0xff6bacde -0, 14700, 194400, 0xd998c2c8 -0, 15000, 194400, 0x3d1ddfab +0, 14700, 194400, 0xff6bacde +0, 15000, 194400, 0xd998c2c8 0, 15300, 194400, 0x3d1ddfab -0, 15600, 194400, 0x817de4a6 -0, 15900, 194400, 0xfa3ef694 +0, 15600, 194400, 0x3d1ddfab +0, 15900, 194400, 0x817de4a6 0, 16200, 194400, 0xfa3ef694 -0, 16500, 194400, 0x0b5bfb8f -0, 16800, 194400, 0x00f62376 +0, 16500, 194400, 0xfa3ef694 +0, 16800, 194400, 0x0b5bfb8f 0, 17100, 194400, 0x00f62376 -0, 17400, 194400, 0x2f6b2d6c -0, 17700, 194400, 0x40cb4752 +0, 17400, 194400, 0x00f62376 +0, 17700, 194400, 0x2f6b2d6c 0, 18000, 194400, 0x40cb4752 -0, 18300, 194400, 0xd8456435 -0, 18600, 194400, 0x459f6a2f +0, 18300, 194400, 0x40cb4752 +0, 18600, 194400, 0xd8456435 0, 18900, 194400, 0x459f6a2f -0, 19200, 194400, 0x9b678910 -0, 19500, 194400, 0x8791a1f7 +0, 19200, 194400, 0x459f6a2f +0, 19500, 194400, 0x9b678910 0, 19800, 194400, 0x8791a1f7 -0, 20100, 194400, 0xdb4ac5d3 -0, 20400, 194400, 0xb223c8d0 +0, 20100, 194400, 0x8791a1f7 +0, 20400, 194400, 0xdb4ac5d3 0, 20700, 194400, 0xb223c8d0 -0, 21000, 194400, 0x4a9ce7b1 -0, 21300, 194400, 0x187eeaae +0, 21000, 194400, 0xb223c8d0 +0, 21300, 194400, 0x4a9ce7b1 0, 21600, 194400, 0x187eeaae -0, 21900, 194400, 0xc712f8a0 -0, 22200, 194400, 0x549c00a7 +0, 21900, 194400, 0x187eeaae +0, 22200, 194400, 0xc712f8a0 0, 22500, 194400, 0x549c00a7 -0, 22800, 194400, 0x4d991295 -0, 23100, 194400, 0xc41b2681 +0, 22800, 194400, 0x549c00a7 +0, 23100, 194400, 0x4d991295 0, 23400, 194400, 0xc41b2681 -0, 23700, 194400, 0xed5a3077 -0, 24000, 194400, 0x85ad4463 +0, 23700, 194400, 0xc41b2681 +0, 24000, 194400, 0xed5a3077 0, 24300, 194400, 0x85ad4463 -0, 24600, 194400, 0xb98f4760 -0, 24900, 194400, 0x87ef5e49 +0, 24600, 194400, 0x85ad4463 +0, 24900, 194400, 0xb98f4760 0, 25200, 194400, 0x87ef5e49 -0, 25500, 194400, 0x830a6146 -0, 25800, 194400, 0xe33a792e +0, 25500, 194400, 0x87ef5e49 +0, 25800, 194400, 0x830a6146 0, 26100, 194400, 0xe33a792e -0, 26400, 194400, 0x83517a2d -0, 26700, 194400, 0xa97e9314 +0, 26400, 194400, 0xe33a792e +0, 26700, 194400, 0x83517a2d 0, 27000, 194400, 0xa97e9314 -0, 27300, 194400, 0x39059611 -0, 27600, 194400, 0xbf4eb9ed +0, 27300, 194400, 0xa97e9314 +0, 27600, 194400, 0x39059611 0, 27900, 194400, 0xbf4eb9ed -0, 28200, 194400, 0xe5afc4e2 -0, 28500, 194400, 0x35d4cdd9 +0, 28200, 194400, 0xbf4eb9ed +0, 28500, 194400, 0xe5afc4e2 0, 28800, 194400, 0x35d4cdd9 -0, 29100, 194400, 0xb376e1c5 -0, 29400, 194400, 0x6128e3c3 +0, 29100, 194400, 0x35d4cdd9 +0, 29400, 194400, 0xb376e1c5 0, 29700, 194400, 0x6128e3c3 -0, 30000, 194400, 0x30b7f7af -0, 30300, 194400, 0xf1effaac +0, 30000, 194400, 0x6128e3c3 +0, 30300, 194400, 0x30b7f7af 0, 30600, 194400, 0xf1effaac -0, 30900, 194400, 0x483914a1 -0, 31200, 194400, 0xbd48199c +0, 30900, 194400, 0xf1effaac +0, 31200, 194400, 0x483914a1 0, 31500, 194400, 0xbd48199c -0, 31800, 194400, 0x382f2d88 -0, 32100, 194400, 0x5a573085 +0, 31800, 194400, 0xbd48199c +0, 32100, 194400, 0x382f2d88 0, 32400, 194400, 0x5a573085 -0, 32700, 194400, 0x89733580 -0, 33000, 194400, 0xd1325a5b +0, 32700, 194400, 0x5a573085 +0, 33000, 194400, 0x89733580 0, 33300, 194400, 0xd1325a5b -0, 33600, 194400, 0x655b6253 -0, 33900, 194400, 0x55146352 +0, 33600, 194400, 0xd1325a5b +0, 33900, 194400, 0x655b6253 0, 34200, 194400, 0x55146352 -0, 34500, 194400, 0xda527c39 -0, 34800, 194400, 0xb0cd7e37 +0, 34500, 194400, 0x55146352 +0, 34800, 194400, 0xda527c39 0, 35100, 194400, 0xb0cd7e37 -0, 35400, 194400, 0x25e7991c -0, 35700, 194400, 0x5c22a411 +0, 35400, 194400, 0xb0cd7e37 +0, 35700, 194400, 0x25e7991c 0, 36000, 194400, 0x5c22a411 -0, 36300, 194400, 0x1e2abdf7 -0, 36600, 194400, 0x8308bff5 +0, 36300, 194400, 0x5c22a411 +0, 36600, 194400, 0x1e2abdf7 0, 36900, 194400, 0x8308bff5 -0, 37200, 194400, 0xfdbfd6de -0, 37500, 194400, 0xd4d4d9db +0, 37200, 194400, 0x8308bff5 +0, 37500, 194400, 0xfdbfd6de 0, 37800, 194400, 0xd4d4d9db -0, 38100, 194400, 0xa449fbb9 -0, 38400, 194400, 0x3dcafdb7 +0, 38100, 194400, 0xd4d4d9db +0, 38400, 194400, 0xa449fbb9 0, 38700, 194400, 0x3dcafdb7 -0, 39000, 194400, 0x6f1f01c2 -0, 39300, 194400, 0xf54a1da6 +0, 39000, 194400, 0x3dcafdb7 +0, 39300, 194400, 0x6f1f01c2 0, 39600, 194400, 0xf54a1da6 -0, 39900, 194400, 0x88d11fa4 -0, 40200, 194400, 0x59642d96 +0, 39900, 194400, 0xf54a1da6 +0, 40200, 194400, 0x88d11fa4 0, 40500, 194400, 0x59642d96 -0, 40800, 194400, 0x8ba44182 -0, 41100, 194400, 0x88f56360 +0, 40800, 194400, 0x59642d96 +0, 41100, 194400, 0x8ba44182 0, 41400, 194400, 0x88f56360 -0, 41700, 194400, 0xfb246d56 -0, 42000, 194400, 0xad128043 +0, 41700, 194400, 0x88f56360 +0, 42000, 194400, 0xfb246d56 0, 42300, 194400, 0xad128043 -0, 42600, 194400, 0x3a4f8a39 -0, 42900, 194400, 0x563d9d26 +0, 42600, 194400, 0xad128043 +0, 42900, 194400, 0x3a4f8a39 0, 43200, 194400, 0x563d9d26 -0, 43500, 194400, 0x6ff8a320 -0, 43800, 194400, 0xcdb9b70c +0, 43500, 194400, 0x563d9d26 +0, 43800, 194400, 0x6ff8a320 0, 44100, 194400, 0xcdb9b70c -0, 44400, 194400, 0x99c2bd06 -0, 44700, 194400, 0x4b47cef4 +0, 44400, 194400, 0xcdb9b70c +0, 44700, 194400, 0x99c2bd06 0, 45000, 194400, 0x4b47cef4 -0, 45300, 194400, 0x10b9dce6 -0, 45600, 194400, 0xdd39f1d1 +0, 45300, 194400, 0x4b47cef4 +0, 45600, 194400, 0x10b9dce6 0, 45900, 194400, 0xdd39f1d1 -0, 46200, 194400, 0xbcf104cd -0, 46500, 194400, 0x85ec17ba +0, 46200, 194400, 0xdd39f1d1 +0, 46500, 194400, 0xbcf104cd 0, 46800, 194400, 0x85ec17ba -0, 47100, 194400, 0x069219b8 -0, 47400, 194400, 0x84dd3899 +0, 47100, 194400, 0x85ec17ba +0, 47400, 194400, 0x069219b8 0, 47700, 194400, 0x84dd3899 -0, 48000, 194400, 0xacca4190 -0, 48300, 194400, 0xcf5b5d74 +0, 48000, 194400, 0x84dd3899 +0, 48300, 194400, 0xacca4190 0, 48600, 194400, 0xcf5b5d74 -0, 48900, 194400, 0x4b8c626f -0, 49200, 194400, 0xf0817958 +0, 48900, 194400, 0xcf5b5d74 +0, 49200, 194400, 0x4b8c626f 0, 49500, 194400, 0xf0817958 -0, 49800, 194400, 0xc0887e53 -0, 50100, 194400, 0x42e6854c +0, 49800, 194400, 0xf0817958 +0, 50100, 194400, 0xc0887e53 0, 50400, 194400, 0x42e6854c -0, 50700, 194400, 0x036c9140 -0, 51000, 194400, 0x0f21a62b +0, 50700, 194400, 0x42e6854c +0, 51000, 194400, 0x036c9140 0, 51300, 194400, 0x0f21a62b -0, 51600, 194400, 0xcdaeaa27 -0, 51900, 194400, 0xe425bc15 +0, 51600, 194400, 0x0f21a62b +0, 51900, 194400, 0xcdaeaa27 0, 52200, 194400, 0xe425bc15 -0, 52500, 194400, 0x8e18c20f -0, 52800, 194400, 0x767cd5fb +0, 52500, 194400, 0xe425bc15 +0, 52800, 194400, 0x8e18c20f 0, 53100, 194400, 0x767cd5fb -0, 53400, 194400, 0x554ae6ea -0, 53700, 194400, 0xeac1f9d7 +0, 53400, 194400, 0x767cd5fb +0, 53700, 194400, 0x554ae6ea 0, 54000, 194400, 0xeac1f9d7 -0, 54300, 194400, 0x0b32fed2 -0, 54600, 194400, 0xe30c19c6 +0, 54300, 194400, 0xeac1f9d7 +0, 54600, 194400, 0x0b32fed2 0, 54900, 194400, 0xe30c19c6 -0, 55200, 194400, 0x6a8a23bc -0, 55500, 194400, 0x26bf36a9 +0, 55200, 194400, 0xe30c19c6 +0, 55500, 194400, 0x6a8a23bc 0, 55800, 194400, 0x26bf36a9 -0, 56100, 194400, 0x1e4f3fa0 -0, 56400, 194400, 0x231f5986 +0, 56100, 194400, 0x26bf36a9 +0, 56400, 194400, 0x1e4f3fa0 0, 56700, 194400, 0x231f5986 -0, 57000, 194400, 0xf557756a -0, 57300, 194400, 0x6bce805f +0, 57000, 194400, 0x231f5986 +0, 57300, 194400, 0xf557756a 0, 57600, 194400, 0x6bce805f -0, 57900, 194400, 0xcd80924d -0, 58200, 194400, 0x65dc9f40 +0, 57900, 194400, 0x6bce805f +0, 58200, 194400, 0xcd80924d 0, 58500, 194400, 0x65dc9f40 -0, 58800, 194400, 0x2ab7af30 -0, 59100, 194400, 0xd43cb728 +0, 58800, 194400, 0x65dc9f40 +0, 59100, 194400, 0x2ab7af30 0, 59400, 194400, 0xd43cb728 -0, 59700, 194400, 0x05d9c916 -0, 60000, 194400, 0x43cad10e +0, 59700, 194400, 0xd43cb728 +0, 60000, 194400, 0x05d9c916 0, 60300, 194400, 0x43cad10e -0, 60600, 194400, 0x06b5e0fe -0, 60900, 194400, 0xa142f0ee +0, 60600, 194400, 0x43cad10e +0, 60900, 194400, 0x06b5e0fe 0, 61200, 194400, 0xa142f0ee -0, 61500, 194400, 0xed7f03ea -0, 61800, 194400, 0xf26019d4 +0, 61500, 194400, 0xa142f0ee +0, 61800, 194400, 0xed7f03ea 0, 62100, 194400, 0xf26019d4 -0, 62400, 194400, 0x3b7f29c4 -0, 62700, 194400, 0x30282ebf +0, 62400, 194400, 0xf26019d4 +0, 62700, 194400, 0x3b7f29c4 0, 63000, 194400, 0x30282ebf -0, 63300, 194400, 0xaeff4aa3 -0, 63600, 194400, 0x1d355697 +0, 63300, 194400, 0x30282ebf +0, 63600, 194400, 0xaeff4aa3 0, 63900, 194400, 0x1d355697 -0, 64200, 194400, 0x2ead6f7e -0, 64500, 194400, 0xf1b67776 +0, 64200, 194400, 0x1d355697 +0, 64500, 194400, 0x2ead6f7e 0, 64800, 194400, 0xf1b67776 -0, 65100, 194400, 0x93b38b62 -0, 65400, 194400, 0x9469905d +0, 65100, 194400, 0xf1b67776 +0, 65400, 194400, 0x93b38b62 0, 65700, 194400, 0x9469905d -0, 66000, 194400, 0x27bf9756 -0, 66300, 194400, 0xd016a548 +0, 66000, 194400, 0x9469905d +0, 66300, 194400, 0x27bf9756 0, 66600, 194400, 0xd016a548 -0, 66900, 194400, 0x6889b835 -0, 67200, 194400, 0x6a05be2f +0, 66900, 194400, 0xd016a548 +0, 67200, 194400, 0x6889b835 0, 67500, 194400, 0x6a05be2f -0, 67800, 194400, 0xe0a1ce1f -0, 68100, 194400, 0x8fdbd617 +0, 67800, 194400, 0x6a05be2f +0, 68100, 194400, 0xe0a1ce1f 0, 68400, 194400, 0x8fdbd617 -0, 68700, 194400, 0xd68fe805 -0, 69000, 194400, 0x0d1dfbf1 +0, 68700, 194400, 0x8fdbd617 +0, 69000, 194400, 0xd68fe805 0, 69300, 194400, 0x0d1dfbf1 -0, 69600, 194400, 0x0fe70bf0 -0, 69900, 194400, 0x0a8f13e8 +0, 69600, 194400, 0x0d1dfbf1 +0, 69900, 194400, 0x0fe70bf0 0, 70200, 194400, 0x0a8f13e8 -0, 70500, 194400, 0x0ca42bd0 -0, 70800, 194400, 0x6f3838c3 +0, 70500, 194400, 0x0a8f13e8 +0, 70800, 194400, 0x0ca42bd0 0, 71100, 194400, 0x6f3838c3 -0, 71400, 194400, 0x045448b3 -0, 71700, 194400, 0x764349b2 +0, 71400, 194400, 0x6f3838c3 +0, 71700, 194400, 0x045448b3 0, 72000, 194400, 0x764349b2 -0, 72300, 194400, 0xed1651aa -0, 72600, 194400, 0xbb376398 +0, 72300, 194400, 0x764349b2 +0, 72600, 194400, 0xed1651aa 0, 72900, 194400, 0xbb376398 -0, 73200, 194400, 0xd0d5718a -0, 73500, 194400, 0xcd977e7d +0, 73200, 194400, 0xbb376398 +0, 73500, 194400, 0xd0d5718a 0, 73800, 194400, 0xcd977e7d -0, 74100, 194400, 0x8cb39665 -0, 74400, 194400, 0xb935b04b +0, 74100, 194400, 0xcd977e7d +0, 74400, 194400, 0x8cb39665 0, 74700, 194400, 0xb935b04b -0, 75000, 194400, 0x0292be3d -0, 75300, 194400, 0x4f21c833 +0, 75000, 194400, 0xb935b04b +0, 75300, 194400, 0x0292be3d 0, 75600, 194400, 0x4f21c833 -0, 75900, 194400, 0xa5c7d823 -0, 76200, 194400, 0xfb8ee01b +0, 75900, 194400, 0x4f21c833 +0, 76200, 194400, 0xa5c7d823 0, 76500, 194400, 0xfb8ee01b -0, 76800, 194400, 0xea53ee0d -0, 77100, 194400, 0x803efcfe +0, 76800, 194400, 0xfb8ee01b +0, 77100, 194400, 0xea53ee0d 0, 77400, 194400, 0x803efcfe -0, 77700, 194400, 0x2c0e0aff -0, 78000, 194400, 0x3df318f1 +0, 77700, 194400, 0x803efcfe +0, 78000, 194400, 0x2c0e0aff 0, 78300, 194400, 0x3df318f1 -0, 78600, 194400, 0xc4cb26e3 -0, 78900, 194400, 0x92a033d6 +0, 78600, 194400, 0x3df318f1 +0, 78900, 194400, 0xc4cb26e3 0, 79200, 194400, 0x92a033d6 -0, 79500, 194400, 0x1b2048c1 -0, 79800, 194400, 0x236858b1 +0, 79500, 194400, 0x92a033d6 +0, 79800, 194400, 0x1b2048c1 0, 80100, 194400, 0x236858b1 -0, 80400, 194400, 0x482f6d9c -0, 80700, 194400, 0x9ee97891 +0, 80400, 194400, 0x236858b1 +0, 80700, 194400, 0x482f6d9c 0, 81000, 194400, 0x9ee97891 -0, 81300, 194400, 0xe0dc8683 -0, 81600, 194400, 0x461b9079 +0, 81300, 194400, 0x9ee97891 +0, 81600, 194400, 0xe0dc8683 0, 81900, 194400, 0x461b9079 -0, 82200, 194400, 0xd346a960 -0, 82500, 194400, 0xa384b554 +0, 82200, 194400, 0x461b9079 +0, 82500, 194400, 0xd346a960 0, 82800, 194400, 0xa384b554 -0, 83100, 194400, 0x3246cf3a -0, 83400, 194400, 0xa53fe722 +0, 83100, 194400, 0xa384b554 +0, 83400, 194400, 0x3246cf3a 0, 83700, 194400, 0xa53fe722 -0, 84000, 194400, 0xe620fd0c -0, 84300, 194400, 0xd6370414 +0, 84000, 194400, 0xa53fe722 +0, 84300, 194400, 0xe620fd0c 0, 84600, 194400, 0xd6370414 -0, 84900, 194400, 0xf57f1404 -0, 85200, 194400, 0x8c6420f7 +0, 84900, 194400, 0xd6370414 +0, 85200, 194400, 0xf57f1404 0, 85500, 194400, 0x8c6420f7 -0, 85800, 194400, 0xd4be3add -0, 86100, 194400, 0xa8dc4ec9 +0, 85800, 194400, 0x8c6420f7 +0, 86100, 194400, 0xd4be3add 0, 86400, 194400, 0xa8dc4ec9 -0, 86700, 194400, 0xda1563b4 -0, 87000, 194400, 0xd51873a4 +0, 86700, 194400, 0xa8dc4ec9 +0, 87000, 194400, 0xda1563b4 0, 87300, 194400, 0xd51873a4 -0, 87600, 194400, 0x68588196 -0, 87900, 194400, 0x40d18e89 +0, 87600, 194400, 0xd51873a4 +0, 87900, 194400, 0x68588196 0, 88200, 194400, 0x40d18e89 -0, 88500, 194400, 0x1b75a275 -0, 88800, 194400, 0xedd1a572 +0, 88500, 194400, 0x40d18e89 +0, 88800, 194400, 0x1b75a275 0, 89100, 194400, 0xedd1a572 -0, 89400, 194400, 0x55daad6a +0, 89400, 194400, 0xedd1a572 +0, 89700, 194400, 0x55daad6a -- cgit v1.2.3