[FFmpeg-devel] [PATCH] nuvdemux: timestamps are signed or well wraped and starting before 0.
Michael Niedermayer
michaelni at gmx.at
Sun Nov 25 05:02:30 CET 2012
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
libavformat/nuv.c | 4 +-
tests/ref/fate/nuv-rtjpeg-fh | 100 +++++++++++++++++++++---------------------
2 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index c67c1fa..2b2f22c 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -229,7 +229,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
pkt->pos = pos;
pkt->flags |= hdr[2] == 0 ? AV_PKT_FLAG_KEY : 0;
- pkt->pts = AV_RL32(&hdr[4]);
+ pkt->pts = (int32_t)AV_RL32(&hdr[4]);
pkt->stream_index = ctx->v_id;
memcpy(pkt->data, hdr, copyhdrsize);
ret = avio_read(pb, pkt->data + copyhdrsize, size);
@@ -249,7 +249,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
ret = av_get_packet(pb, pkt, size);
pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pos = pos;
- pkt->pts = AV_RL32(&hdr[4]);
+ pkt->pts = (int32_t)AV_RL32(&hdr[4]);
pkt->stream_index = ctx->a_id;
if (ret < 0) return ret;
return 0;
diff --git a/tests/ref/fate/nuv-rtjpeg-fh b/tests/ref/fate/nuv-rtjpeg-fh
index 151ef88..beb6ccd 100644
--- a/tests/ref/fate/nuv-rtjpeg-fh
+++ b/tests/ref/fate/nuv-rtjpeg-fh
@@ -1,51 +1,51 @@
#tb 0: 1/50
-0, 0, 0, 1, 221184, 0xf48c94f6
-0, 2, 2, 1, 221184, 0x89b625b2
-0, 3, 3, 1, 221184, 0x37e04714
-0, 4, 4, 1, 221184, 0x4f4c5224
-0, 5, 5, 1, 221184, 0x9193c9f1
-0, 6, 6, 1, 221184, 0x5d1a6197
-0, 7, 7, 1, 221184, 0x40cd51e7
-0, 8, 8, 1, 221184, 0xb2c1a729
-0, 10, 10, 1, 221184, 0x998d6144
-0, 11, 11, 1, 221184, 0xf5d52311
-0, 12, 12, 1, 221184, 0xea9dd6bf
-0, 13, 13, 1, 221184, 0x0e2ed854
-0, 14, 14, 1, 221184, 0xe295ba58
-0, 15, 15, 1, 221184, 0x8aedbb69
-0, 16, 16, 1, 221184, 0x253c9aaa
-0, 17, 17, 1, 221184, 0x5eaf9fb1
-0, 18, 18, 1, 221184, 0xcdb5a0cb
-0, 19, 19, 1, 221184, 0xcdb5a0cb
-0, 20, 20, 1, 221184, 0x23f89994
-0, 21, 21, 1, 221184, 0x23f89994
-0, 22, 22, 1, 221184, 0x10dc98d6
-0, 23, 23, 1, 221184, 0x799b9d98
-0, 24, 24, 1, 221184, 0xb226996c
-0, 25, 25, 1, 221184, 0x0ac59a42
-0, 26, 26, 1, 221184, 0x87c2a654
-0, 27, 27, 1, 221184, 0xf4c1a711
-0, 28, 28, 1, 221184, 0xf60fa72e
-0, 29, 29, 1, 221184, 0xc8f8b6fc
-0, 30, 30, 1, 221184, 0xd709b813
-0, 31, 31, 1, 221184, 0x5fdfb76b
-0, 32, 32, 1, 221184, 0x5798b0aa
-0, 33, 33, 1, 221184, 0xf572b1c3
-0, 34, 34, 1, 221184, 0x14b0afdf
-0, 35, 35, 1, 221184, 0x0a66b5b8
-0, 36, 36, 1, 221184, 0xe316c620
-0, 37, 37, 1, 221184, 0xbc76c5c2
-0, 38, 38, 1, 221184, 0x77c7c5e5
-0, 39, 39, 1, 221184, 0xfc7ac63e
-0, 40, 40, 1, 221184, 0x05a29ffe
-0, 41, 41, 1, 221184, 0x9bffbf6c
-0, 42, 42, 1, 221184, 0x3c55be40
-0, 43, 43, 1, 221184, 0x6f46c14e
-0, 44, 44, 1, 221184, 0x9cf4ae70
-0, 45, 45, 1, 221184, 0xf205b2f8
-0, 46, 46, 1, 221184, 0x7180aff8
-0, 47, 47, 1, 221184, 0x125eaffe
-0, 48, 48, 1, 221184, 0x6970a32d
-0, 49, 49, 1, 221184, 0xaea79f62
-0, 50, 50, 1, 221184, 0x48d2a093
-0, 51, 51, 1, 221184, 0x10a59eb5
+0, 80, 80, 1, 221184, 0xf48c94f6
+0, 82, 82, 1, 221184, 0x89b625b2
+0, 83, 83, 1, 221184, 0x37e04714
+0, 84, 84, 1, 221184, 0x4f4c5224
+0, 85, 85, 1, 221184, 0x9193c9f1
+0, 86, 86, 1, 221184, 0x5d1a6197
+0, 87, 87, 1, 221184, 0x40cd51e7
+0, 88, 88, 1, 221184, 0xb2c1a729
+0, 90, 90, 1, 221184, 0x998d6144
+0, 91, 91, 1, 221184, 0xf5d52311
+0, 92, 92, 1, 221184, 0xea9dd6bf
+0, 93, 93, 1, 221184, 0x0e2ed854
+0, 94, 94, 1, 221184, 0xe295ba58
+0, 95, 95, 1, 221184, 0x8aedbb69
+0, 96, 96, 1, 221184, 0x253c9aaa
+0, 97, 97, 1, 221184, 0x5eaf9fb1
+0, 98, 98, 1, 221184, 0xcdb5a0cb
+0, 99, 99, 1, 221184, 0xcdb5a0cb
+0, 100, 100, 1, 221184, 0x23f89994
+0, 101, 101, 1, 221184, 0x23f89994
+0, 102, 102, 1, 221184, 0x10dc98d6
+0, 103, 103, 1, 221184, 0x799b9d98
+0, 104, 104, 1, 221184, 0xb226996c
+0, 105, 105, 1, 221184, 0x0ac59a42
+0, 106, 106, 1, 221184, 0x87c2a654
+0, 107, 107, 1, 221184, 0xf4c1a711
+0, 108, 108, 1, 221184, 0xf60fa72e
+0, 109, 109, 1, 221184, 0xc8f8b6fc
+0, 110, 110, 1, 221184, 0xd709b813
+0, 111, 111, 1, 221184, 0x5fdfb76b
+0, 112, 112, 1, 221184, 0x5798b0aa
+0, 113, 113, 1, 221184, 0xf572b1c3
+0, 114, 114, 1, 221184, 0x14b0afdf
+0, 115, 115, 1, 221184, 0x0a66b5b8
+0, 116, 116, 1, 221184, 0xe316c620
+0, 117, 117, 1, 221184, 0xbc76c5c2
+0, 118, 118, 1, 221184, 0x77c7c5e5
+0, 119, 119, 1, 221184, 0xfc7ac63e
+0, 120, 120, 1, 221184, 0x05a29ffe
+0, 121, 121, 1, 221184, 0x9bffbf6c
+0, 122, 122, 1, 221184, 0x3c55be40
+0, 123, 123, 1, 221184, 0x6f46c14e
+0, 124, 124, 1, 221184, 0x9cf4ae70
+0, 125, 125, 1, 221184, 0xf205b2f8
+0, 126, 126, 1, 221184, 0x7180aff8
+0, 127, 127, 1, 221184, 0x125eaffe
+0, 128, 128, 1, 221184, 0x6970a32d
+0, 129, 129, 1, 221184, 0xaea79f62
+0, 130, 130, 1, 221184, 0x48d2a093
+0, 131, 131, 1, 221184, 0x10a59eb5
--
1.7.9.5
More information about the ffmpeg-devel
mailing list