Author: reimar Date: Tue Nov 8 22:19:39 2011 New Revision: 34332 Log: Add support for decoding EA CMV files. Added: trunk/tests/ref/ea-cmv/ trunk/tests/ref/ea-cmv/TITLE.CMV.md5 Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Nov 8 22:12:37 2011 (r34331) +++ trunk/etc/codecs.conf Tue Nov 8 22:19:39 2011 (r34332) @@ -45,6 +45,14 @@ videocodec ffcdgraphics dll cdgraphics out BGR8 +videocodec ffeacmv + info "FFmpeg EA CMV" + status working + fourcc MVIf ; internal MPlayer FourCC + driver ffmpeg + dll eacmv + out BGR8 + videocodec ffmvi1 info "FFmpeg Motion Pixels" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Tue Nov 8 22:12:37 2011 (r34331) +++ trunk/libmpdemux/mp_taglists.c Tue Nov 8 22:19:39 2011 (r34332) @@ -109,6 +109,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')}, + { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')}, { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')}, { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')}, { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, Added: trunk/tests/ref/ea-cmv/TITLE.CMV.md5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/ea-cmv/TITLE.CMV.md5 Tue Nov 8 22:19:39 2011 (r34332) @@ -0,0 +1,194 @@ +c8fdb91590aebb13e3734998959ea956 frame00000000 +fc3643db417fd9d2c4eb63da7eaf77d2 frame00000001 +57402e2a5a3ac93746d21037672885dd frame00000002 +61ef5fffa042e9993781a37c5531a871 frame00000003 +75f917299f01b3642db41d513eef5816 frame00000004 +6d48ca87000f9f1d1832abda52da6bef frame00000005 +a0cf1cded26df66501455694fa5ba8e5 frame00000006 +bff5ac15e7353c25aa86e38ade57bbe2 frame00000007 +e41f333ee37a0072ee8eb6a36f5580f4 frame00000008 +152a028f1d8f1715e6fc8563e5a67211 frame00000009 +0f81152c9d6965eab3a7ba3ede0fc873 frame00000010 +ddcd2eba8edca8ec1c642be63ea788e2 frame00000011 +c3b67150d67e06919846c0e44c805917 frame00000012 +4bbd4f4884d36bf8b7a1bb56dc77b8f0 frame00000013 +5704586d6b53470f036fea13217d21d2 frame00000014 +8c6255551bc04c892801ed9c27706805 frame00000015 +0eb5ffc68710eb18b3a2fff7ca302ab4 frame00000016 +eec92e61d9e80e2c2f0d64ed755c32cd frame00000017 +6aeac450be1d6a4627ab4420fefd02be frame00000018 +5f81210200e9560fcbcd9266fc1ad505 frame00000019 +08eff969fef18f8f3e47394e75a74eb5 frame00000020 +fddddaaafcef9af660e93ace637dfb08 frame00000021 +2b4389e619ad364eb2b901e878dcc608 frame00000022 +aff2db5a9efa8da5d1393bdbd9e33fe1 frame00000023 +dbdf1c8c3c4c18ceab1a45fe9e5faca6 frame00000024 +b6d6769f30def334c3842139e05d6b90 frame00000025 +5d90047ab752253d4cfff9da73a642ee frame00000026 +2de929bde2b951b9a77bf0cf7e152b29 frame00000027 +ace109898a230d26640899591062d665 frame00000028 +831a39bf88bfd026a42d3cba7ada2b35 frame00000029 +b1c7ac31c1639996384a1a090241314c frame00000030 +1514a1e8f4333409b5299ffde9663fb6 frame00000031 +db350b2e7a46df233e499d2e1d2c418c frame00000032 +e5cbf3a631bf09a57393771ea904beac frame00000033 +a9dd667e39733c329d7b30a1dcef6eac frame00000034 +8f44d48534083f1b7b652f06eae907ba frame00000035 +a5f4f7da0cc30d938ecc06db561ea052 frame00000036 +a330d84923a0e16ba658826c5480d4e0 frame00000037 +6110552f910639dc47529774c8fd1fb2 frame00000038 +d4f2ff77f618d3d92a44837ef7725418 frame00000039 +3c42e1ecc82f0960e13abf002732ad06 frame00000040 +9c2631957f316c277886909ac2521c0e frame00000041 +7eed3bf4954306e4306bf8235289b136 frame00000042 +ef98ec30be11a96cb09f1419187162e6 frame00000043 +66d5e017f5461177f67877685b4d4126 frame00000044 +fe40cf071f0ba12e8285b21c9881fe63 frame00000045 +8e38aae3a8cadaba0d40dadbeafa8f77 frame00000046 +626f2918df7771423abe17dee517fb1a frame00000047 +12bc85ea0465ed731c0b782ebce1fd32 frame00000048 +a8efe64e9de02f2eb1b7f5875140a9f3 frame00000049 +a3e5d895660c89e85b071ace53b8df63 frame00000050 +b9dc832c9e4147779f1d18bc922710ea frame00000051 +e41103032d9134ed170e46c0767d7974 frame00000052 +6ae0c08016ada22593a24110071fe2ac frame00000053 +1f38a5e2bc23fc57639c8551774a9c88 frame00000054 +96a0adc3eaa81cfc8d698b1b8502da4e frame00000055 +1707801a41c2f569afd4dcb265623754 frame00000056 +60cd1b89071930bf2a3fb2a4a7895580 frame00000057 +6fc34f921806a03a24d6d99c8eb12eec frame00000058 +fb7f869a2c626dced6c32d105053cc58 frame00000059 +cc5d8e47c5c6816cbbf68b1322b1ad0b frame00000060 +25823ffcc1e4bb6e511e3eb4e417b6f7 frame00000061 +2d7f5c4c38016c7a025982abd2acf745 frame00000062 +aea93f3cc42b76df3ce1e4ccb751adf2 frame00000063 +50eb9b232346d0ea452e69fc77330625 frame00000064 +03c0329160c9a3d2d8e3dc837b8da3b8 frame00000065 +46d9c24bd399a08f665641749cb590c6 frame00000066 +7d1d32ef97a22f39e1262a0c2aef1767 frame00000067 +7820062cdcc236b845f9e1acfc30de78 frame00000068 +b36a6c33fdfb03e33bbdddb13014f793 frame00000069 +b21ecd12d5000e60b45de5dc914e445c frame00000070 +d7c4922aa156843770580e30b5374110 frame00000071 +33430c8a9b3394afea68aac2b4fed0b1 frame00000072 +ab51e4d0556895301a6d594b42c833b4 frame00000073 +2251cefe0a3685a5b69bd47de9604847 frame00000074 +caa458ee05fdc982fb718a730d886a25 frame00000075 +896367d52622b55e758ca54078206aa8 frame00000076 +a94b73f730a8919ef9ff4ddded903d86 frame00000077 +9d9b87edb79eecaa8c86206eeda0d08b frame00000078 +c49c525de92c97dbb9f2b54675523d48 frame00000079 +307d1e0ddc972e0ac6ad57a6fd0fb159 frame00000080 +a32350b66dd8d297b284d4d3f977bdcb frame00000081 +f8973296053ae0e410e83112f1d473a0 frame00000082 +4f980558f793c2465547e98a455f6dc5 frame00000083 +a4048fec65b744d020919b09271811a6 frame00000084 +2603acbeaebbb35fa5900cd5007b7bef frame00000085 +e180e828f6176e617bc8637ff3ceae9c frame00000086 +dd97f644acda2631180387414fb6db37 frame00000087 +f79ec681e6649642fbdb66b5dd990896 frame00000088 +6cd08f27857f69577b56b0400d36195f frame00000089 +64ad896a8669802e0de3f00293069bf2 frame00000090 +1bcedf463beee4c901203a0be70f2d4c frame00000091 +fd35f2d3b5be30f1fd048b83194b7d30 frame00000092 +dbf36d606a1f26c9466f588ba10cea7f frame00000093 +28cf19012e2d37a292cf856b49823265 frame00000094 +ca3e087f0ab5d02ef0df83fa61427b19 frame00000095 +0740b8a52bb24fecfa73290a90543145 frame00000096 +c7aea9c7bec1fd66ff2e6a9ef8b910bf frame00000097 +b33553b55051900e23ec3d248b6759a1 frame00000098 +190b45a10436450e2842fa0e82ebcd13 frame00000099 +745e00858bafdff44591010c869db1ba frame00000100 +48bf00d2d710c53f2ecf6869ea99d298 frame00000101 +df3229f3b4e9c54e4ac4cfdfc5dbed7e frame00000102 +3f72ffc16a32ffcc2da8b4fef37afe20 frame00000103 +dc5109f69b294a142451f7cef10732c5 frame00000104 +190d6f5ea933b729b99d8415474bfbd7 frame00000105 +381baa0770a8a95dd1e25adf2d29020d frame00000106 +d8cbfc3a33ee0824cb78c6d726ed3b18 frame00000107 +ab2aa23039f56f22aa389cdd1a95170f frame00000108 +cacc058d912030405888d9e68222f6e9 frame00000109 +d71bcfd12eed67c3d613e882860505a8 frame00000110 +0feda1be1d83be528d466c144a4caea2 frame00000111 +50493ccd98911e18604bca3d8f452847 frame00000112 +9cdc45887e1bdd42a8efab5fc0811984 frame00000113 +5d8ffa2cf9325157e119d9bf0b2e8538 frame00000114 +d3d9cffef4938f4b44eeefe700c79e31 frame00000115 +ddd2784a313c5508e7f6e744cd26fc20 frame00000116 +8c5de9ddf91f24c410ce87d0741a043d frame00000117 +f9f10972c4894f8808c1b501ca9f01e4 frame00000118 +15dce9011efc8dd7560f2f1f7c85fff0 frame00000119 +c959013d97adfb9f91bc83d2692539ba frame00000120 +8f1e36732febfc2141765db16d301bd9 frame00000121 +3a8e855c3af4b6ced3f7b61187d7981d frame00000122 +dfba400bfa353284884af657aead7a2e frame00000123 +1dbf2a5cd47939714144b6c7430ec86d frame00000124 +f054a972b2970ced10790e71455ce11a frame00000125 +837580031e0676cc37fa4491d6d20d5a frame00000126 +5d223b47af7f7532734ce78b8c797bba frame00000127 +523ba5177daa31557b47e8b939ec1c68 frame00000128 +d8d997ac448c222b093545ff543733c0 frame00000129 +8c838b5f53607dea9efacea2935840a5 frame00000130 +e404257026760b4eaf6868c00ebb5f7f frame00000131 +f9dd86280585a90ce0ebbe343d5fbf63 frame00000132 +a3e62b33719e14d54bc73a245183c812 frame00000133 +b05f0d845cd3c7dc0c2099c0e8680fb3 frame00000134 +f700ba69da887bf256690665b5d06ca4 frame00000135 +9c4ff1b487a3e41fc7303bad6e94fb9a frame00000136 +9ad989e72df9d6b897b5af34a28fb347 frame00000137 +78726e8a0d388ed5277708117a720a96 frame00000138 +faac1046924da0963e2ccb59c81fbc79 frame00000139 +e1af5e2d789e79311f943eea05518512 frame00000140 +33b19865a4d33c2201eaa0cfc8914ffd frame00000141 +e2d761999e858199daf1d170501e59cc frame00000142 +4a4df4f8cf34679c4b8e6aef67e1e304 frame00000143 +4ea30fdbfdfa06581dd1380caf0dae8a frame00000144 +dad7b3c523d30434b333f5c018939ba2 frame00000145 +4939d2218adbfab9bd8b10d53cf12d7c frame00000146 +6c092b233b62917b75e49377c0f4516f frame00000147 +25fe7fb6bff180647d0ccbb5ecd60c53 frame00000148 +e11991c8f8842d635bf821c2a8dcc602 frame00000149 +87be04743423f31aa0b6da8dfdfbf95b frame00000150 +653b866436143e9cae5e862c2d2553c7 frame00000151 +b08357bede70c47ba1b819c60844c3e4 frame00000152 +9276d18cdff34a689810a0fde9592800 frame00000153 +7df55ffbc6689be787c35b5ffcc609e5 frame00000154 +83081279b58c83175bf39186a63e77f9 frame00000155 +f94dacca5a1cbdb9c0655f53f70e26fb frame00000156 +9882f3d8c6d33f29447f3af80bcd1bf0 frame00000157 +81fd7d0539a01e5abdacb0fdef48c9c1 frame00000158 +0b2565611d6dbbb273d905e6499b8ce4 frame00000159 +85c2251aafd89f7349dab7d147be2caf frame00000160 +7c0eece5a2b1ce563262374278b39f4d frame00000161 +d2734609b86a37cf63d5050b02a16427 frame00000162 +1a51df82c9f15e8371e60a68de49861c frame00000163 +675cbf17f5d207a5baf1e8175395dba0 frame00000164 +4692422ecc3697ce023994aa9641831f frame00000165 +892dc0cf0ee3546a48dac8993f7a647d frame00000166 +fd55775938958ee4c4170042d5f6aac1 frame00000167 +781def68dc8ee592abedb4c6542cd0b3 frame00000168 +7bb3f871763141fbcfd8499a61a7fe1c frame00000169 +11100a0c0d77cfadd7101b9e8abe2194 frame00000170 +06a1b46b970eeea86afc36198c88138b frame00000171 +67630e8930d6134e07eaa6b96e341fa2 frame00000172 +86db456ded3aeb4dbbc1ac0472f58e1d frame00000173 +972219a3131aa2d5b99cb2583b32f6b6 frame00000174 +ae2471a709010a46da6dc83f9ab1d480 frame00000175 +e068a052beac9131ad701331cbe3c7fd frame00000176 +c91634d7ac278de8dfedcd53b2d5be74 frame00000177 +9bd0e0f51c29b60be1668f7bde0b5e64 frame00000178 +2b09a96d69dd042ce66fe75fea58ec92 frame00000179 +06a6c1437abae31dea5830d5561926fc frame00000180 +fe7899044f25a6943f8e8a4db4b66349 frame00000181 +8892d0239b7addd3cbebd4a68f88b93f frame00000182 +2e67ca3f785aad929d4a626eac2525ad frame00000183 +bec4e240c1c68639a3170e0fdd9dbdb9 frame00000184 +b04ba53400e9f954fc09be082bb84b7b frame00000185 +a73e26780f6c264b19e40179610bfd3c frame00000186 +4fc873618c4edf21b63c5ef53e0ff406 frame00000187 +a61fa25ce618c51667dc7b6d18db1703 frame00000188 +624ed769e4d06cebfbbce5f0b74cc753 frame00000189 +c32b4ef2d8325a821d9bd3028e440159 frame00000190 +250a7d138adf8f48bcee8801671a8d49 frame00000191 +d9967ddfb6c98381a4bf84649bb216d2 frame00000192 +a8bdaf72bcf5f6ea9eb7ea9478b955a0 frame00000193