From 7b6aae23e12f41cdfac7f1069debfe44d9a3d136 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 20 Aug 2014 05:52:44 +0000 Subject: [PATCH] electronicarts: read the framerate for MAD --- libavformat/electronicarts.c | 2 + tests/ref/fate/ea-mad | 194 +++++++++++++++++------------------ 2 files changed, 99 insertions(+), 97 deletions(-) diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index adcd45a6f2..255bb7b6ce 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -402,6 +402,8 @@ static int process_ea_header(AVFormatContext *s) case MADk_TAG: ea->video_codec = AV_CODEC_ID_MAD; + avio_skip(pb, 6); + ea->time_base = (AVRational) { avio_rl16(pb), 1000 }; break; case MVhd_TAG: diff --git a/tests/ref/fate/ea-mad b/tests/ref/fate/ea-mad index ce1df4af4b..1ea92fda42 100644 --- a/tests/ref/fate/ea-mad +++ b/tests/ref/fate/ea-mad @@ -1,97 +1,97 @@ -#tb 0: 1/90000 -0, 0, 0, 0, 535680, 0x889c32cf -0, 2970, 2970, 0, 535680, 0x0b1ef044 -0, 5940, 5940, 0, 535680, 0xa7d0818b -0, 8910, 8910, 0, 535680, 0xf392e4e1 -0, 11880, 11880, 0, 535680, 0x08480c69 -0, 14850, 14850, 0, 535680, 0x2b8af1ed -0, 17820, 17820, 0, 535680, 0x0d58e062 -0, 20790, 20790, 0, 535680, 0xd140ced0 -0, 23760, 23760, 0, 535680, 0xbd0e6652 -0, 26730, 26730, 0, 535680, 0xdc2f2a6b -0, 29700, 29700, 0, 535680, 0x97c31a38 -0, 32670, 32670, 0, 535680, 0x1a2bdf38 -0, 35640, 35640, 0, 535680, 0xb3af3ac4 -0, 38610, 38610, 0, 535680, 0x07a52577 -0, 41580, 41580, 0, 535680, 0x78407368 -0, 44550, 44550, 0, 535680, 0xd2a9efc3 -0, 47520, 47520, 0, 535680, 0x36df2f29 -0, 50490, 50490, 0, 535680, 0x9821d8f7 -0, 53460, 53460, 0, 535680, 0xf64321aa -0, 56430, 56430, 0, 535680, 0x53e4d9aa -0, 59400, 59400, 0, 535680, 0xdbd6f853 -0, 62370, 62370, 0, 535680, 0x5d40cf8b -0, 65340, 65340, 0, 535680, 0xe624af9d -0, 68310, 68310, 0, 535680, 0xd9dbb4cd -0, 71280, 71280, 0, 535680, 0xf14e72ec -0, 74250, 74250, 0, 535680, 0xb35c18f6 -0, 77220, 77220, 0, 535680, 0xc96d7757 -0, 80190, 80190, 0, 535680, 0xdfb937df -0, 83160, 83160, 0, 535680, 0x40cd71d7 -0, 86130, 86130, 0, 535680, 0x15e176d6 -0, 89100, 89100, 0, 535680, 0x7f891b24 -0, 92070, 92070, 0, 535680, 0xb87a8c32 -0, 95040, 95040, 0, 535680, 0x0c01541f -0, 98010, 98010, 0, 535680, 0x9eee99b3 -0, 100980, 100980, 0, 535680, 0xd65eb689 -0, 103950, 103950, 0, 535680, 0x6e733cfa -0, 106920, 106920, 0, 535680, 0xac536670 -0, 109890, 109890, 0, 535680, 0x002275b8 -0, 112860, 112860, 0, 535680, 0x6a5385cb -0, 115830, 115830, 0, 535680, 0xd129ade3 -0, 118800, 118800, 0, 535680, 0x32cab5d7 -0, 121770, 121770, 0, 535680, 0x08be1c8f -0, 124740, 124740, 0, 535680, 0x59e1fba0 -0, 127710, 127710, 0, 535680, 0x138aee3a -0, 130680, 130680, 0, 535680, 0x4cfbcd5e -0, 133650, 133650, 0, 535680, 0xf6cf0fb4 -0, 136620, 136620, 0, 535680, 0xb13a06de -0, 139590, 139590, 0, 535680, 0x59176f00 -0, 142560, 142560, 0, 535680, 0xf84b4ca3 -0, 145530, 145530, 0, 535680, 0x7fd09f73 -0, 148500, 148500, 0, 535680, 0x3be383b8 -0, 151470, 151470, 0, 535680, 0xa7118e51 -0, 154440, 154440, 0, 535680, 0xbd83120c -0, 157410, 157410, 0, 535680, 0x3bc9d256 -0, 160380, 160380, 0, 535680, 0xb6c87f87 -0, 163350, 163350, 0, 535680, 0xe80d110a -0, 166320, 166320, 0, 535680, 0xb3a83362 -0, 169290, 169290, 0, 535680, 0xfb39eb52 -0, 172260, 172260, 0, 535680, 0xbf6e1220 -0, 175230, 175230, 0, 535680, 0x9ecdfbae -0, 178200, 178200, 0, 535680, 0x069a65f5 -0, 181170, 181170, 0, 535680, 0x206e372c -0, 184140, 184140, 0, 535680, 0x58c83dd4 -0, 187110, 187110, 0, 535680, 0xc3562b03 -0, 190080, 190080, 0, 535680, 0xd1ed85a0 -0, 193050, 193050, 0, 535680, 0xb6205f4b -0, 196020, 196020, 0, 535680, 0xaedf8bfa -0, 198990, 198990, 0, 535680, 0xa48d5dea -0, 201960, 201960, 0, 535680, 0xff82e7c1 -0, 204930, 204930, 0, 535680, 0xc9560222 -0, 207900, 207900, 0, 535680, 0x0fafa549 -0, 210870, 210870, 0, 535680, 0x8d556ccb -0, 213840, 213840, 0, 535680, 0x802aac1f -0, 216810, 216810, 0, 535680, 0x7d0fa168 -0, 219780, 219780, 0, 535680, 0x1a9255c9 -0, 222750, 222750, 0, 535680, 0xb4ec7e35 -0, 225720, 225720, 0, 535680, 0x48fac072 -0, 228690, 228690, 0, 535680, 0x1e260135 -0, 231660, 231660, 0, 535680, 0xce4d5079 -0, 234630, 234630, 0, 535680, 0x13e5e4ed -0, 237600, 237600, 0, 535680, 0x592305ec -0, 240570, 240570, 0, 535680, 0x9e227508 -0, 243540, 243540, 0, 535680, 0x1d37e5ea -0, 246510, 246510, 0, 535680, 0x7eae7692 -0, 249480, 249480, 0, 535680, 0xf452e4b9 -0, 252450, 252450, 0, 535680, 0x1460e7e9 -0, 255420, 255420, 0, 535680, 0xc6d8a638 -0, 258390, 258390, 0, 535680, 0x854f5fb0 -0, 261360, 261360, 0, 535680, 0x854f5fb0 -0, 264330, 264330, 0, 535680, 0x70a02d87 -0, 267300, 267300, 0, 535680, 0x9a4ad464 -0, 270270, 270270, 0, 535680, 0x9a4ad464 -0, 273240, 273240, 0, 535680, 0x9a4ad464 -0, 276210, 276210, 0, 535680, 0x9a4ad464 -0, 279180, 279180, 0, 535680, 0x9a4ad464 -0, 282150, 282150, 0, 535680, 0x9a4ad464 +#tb 0: 33/1000 +0, 0, 0, 1, 535680, 0x889c32cf +0, 1, 1, 1, 535680, 0x0b1ef044 +0, 2, 2, 1, 535680, 0xa7d0818b +0, 3, 3, 1, 535680, 0xf392e4e1 +0, 4, 4, 1, 535680, 0x08480c69 +0, 5, 5, 1, 535680, 0x2b8af1ed +0, 6, 6, 1, 535680, 0x0d58e062 +0, 7, 7, 1, 535680, 0xd140ced0 +0, 8, 8, 1, 535680, 0xbd0e6652 +0, 9, 9, 1, 535680, 0xdc2f2a6b +0, 10, 10, 1, 535680, 0x97c31a38 +0, 11, 11, 1, 535680, 0x1a2bdf38 +0, 12, 12, 1, 535680, 0xb3af3ac4 +0, 13, 13, 1, 535680, 0x07a52577 +0, 14, 14, 1, 535680, 0x78407368 +0, 15, 15, 1, 535680, 0xd2a9efc3 +0, 16, 16, 1, 535680, 0x36df2f29 +0, 17, 17, 1, 535680, 0x9821d8f7 +0, 18, 18, 1, 535680, 0xf64321aa +0, 19, 19, 1, 535680, 0x53e4d9aa +0, 20, 20, 1, 535680, 0xdbd6f853 +0, 21, 21, 1, 535680, 0x5d40cf8b +0, 22, 22, 1, 535680, 0xe624af9d +0, 23, 23, 1, 535680, 0xd9dbb4cd +0, 24, 24, 1, 535680, 0xf14e72ec +0, 25, 25, 1, 535680, 0xb35c18f6 +0, 26, 26, 1, 535680, 0xc96d7757 +0, 27, 27, 1, 535680, 0xdfb937df +0, 28, 28, 1, 535680, 0x40cd71d7 +0, 29, 29, 1, 535680, 0x15e176d6 +0, 30, 30, 1, 535680, 0x7f891b24 +0, 31, 31, 1, 535680, 0xb87a8c32 +0, 32, 32, 1, 535680, 0x0c01541f +0, 33, 33, 1, 535680, 0x9eee99b3 +0, 34, 34, 1, 535680, 0xd65eb689 +0, 35, 35, 1, 535680, 0x6e733cfa +0, 36, 36, 1, 535680, 0xac536670 +0, 37, 37, 1, 535680, 0x002275b8 +0, 38, 38, 1, 535680, 0x6a5385cb +0, 39, 39, 1, 535680, 0xd129ade3 +0, 40, 40, 1, 535680, 0x32cab5d7 +0, 41, 41, 1, 535680, 0x08be1c8f +0, 42, 42, 1, 535680, 0x59e1fba0 +0, 43, 43, 1, 535680, 0x138aee3a +0, 44, 44, 1, 535680, 0x4cfbcd5e +0, 45, 45, 1, 535680, 0xf6cf0fb4 +0, 46, 46, 1, 535680, 0xb13a06de +0, 47, 47, 1, 535680, 0x59176f00 +0, 48, 48, 1, 535680, 0xf84b4ca3 +0, 49, 49, 1, 535680, 0x7fd09f73 +0, 50, 50, 1, 535680, 0x3be383b8 +0, 51, 51, 1, 535680, 0xa7118e51 +0, 52, 52, 1, 535680, 0xbd83120c +0, 53, 53, 1, 535680, 0x3bc9d256 +0, 54, 54, 1, 535680, 0xb6c87f87 +0, 55, 55, 1, 535680, 0xe80d110a +0, 56, 56, 1, 535680, 0xb3a83362 +0, 57, 57, 1, 535680, 0xfb39eb52 +0, 58, 58, 1, 535680, 0xbf6e1220 +0, 59, 59, 1, 535680, 0x9ecdfbae +0, 60, 60, 1, 535680, 0x069a65f5 +0, 61, 61, 1, 535680, 0x206e372c +0, 62, 62, 1, 535680, 0x58c83dd4 +0, 63, 63, 1, 535680, 0xc3562b03 +0, 64, 64, 1, 535680, 0xd1ed85a0 +0, 65, 65, 1, 535680, 0xb6205f4b +0, 66, 66, 1, 535680, 0xaedf8bfa +0, 67, 67, 1, 535680, 0xa48d5dea +0, 68, 68, 1, 535680, 0xff82e7c1 +0, 69, 69, 1, 535680, 0xc9560222 +0, 70, 70, 1, 535680, 0x0fafa549 +0, 71, 71, 1, 535680, 0x8d556ccb +0, 72, 72, 1, 535680, 0x802aac1f +0, 73, 73, 1, 535680, 0x7d0fa168 +0, 74, 74, 1, 535680, 0x1a9255c9 +0, 75, 75, 1, 535680, 0xb4ec7e35 +0, 76, 76, 1, 535680, 0x48fac072 +0, 77, 77, 1, 535680, 0x1e260135 +0, 78, 78, 1, 535680, 0xce4d5079 +0, 79, 79, 1, 535680, 0x13e5e4ed +0, 80, 80, 1, 535680, 0x592305ec +0, 81, 81, 1, 535680, 0x9e227508 +0, 82, 82, 1, 535680, 0x1d37e5ea +0, 83, 83, 1, 535680, 0x7eae7692 +0, 84, 84, 1, 535680, 0xf452e4b9 +0, 85, 85, 1, 535680, 0x1460e7e9 +0, 86, 86, 1, 535680, 0xc6d8a638 +0, 87, 87, 1, 535680, 0x854f5fb0 +0, 88, 88, 1, 535680, 0x854f5fb0 +0, 89, 89, 1, 535680, 0x70a02d87 +0, 90, 90, 1, 535680, 0x9a4ad464 +0, 91, 91, 1, 535680, 0x9a4ad464 +0, 92, 92, 1, 535680, 0x9a4ad464 +0, 93, 93, 1, 535680, 0x9a4ad464 +0, 94, 94, 1, 535680, 0x9a4ad464 +0, 95, 95, 1, 535680, 0x9a4ad464