November 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r34342 - trunk/libaf/af.c
by reimar 11 Nov '11

11 Nov '11

Author: reimar Date: Fri Nov 11 18:15:13 2011 New Revision: 34342 Log: Sanitize channel count for libaf to avoid crashes since it is used unchecked. af_downmix is an example of a function that can/will crash for invalid values. 0 is not invalid since it is used as "autodetect" for output. Modified: trunk/libaf/af.c Modified: trunk/libaf/af.c ============================================================================== --- trunk/libaf/af.c Thu Nov 10 17:31:07 2011 (r34341) +++ trunk/libaf/af.c Fri Nov 11 18:15:13 2011 (r34342) @@ -664,5 +664,9 @@ void af_help (void) { void af_fix_parameters(af_data_t *data) { + if (data->nch < 0 || data->nch > AF_NCH) { + mp_msg(MSGT_AFILTER, MSGL_ERR, "Invalid number of channels %i, assuming 2.\n", data->nch); + data->nch = 2; + } data->bps = af_fmt2bits(data->format)/8; }

1 0

r34340 - in trunk/tests: Makefile ref/lmlm4 ref/lmlm4/LMLM4_CIFat30fps.divx.md5
by cehoyos 10 Nov '11

10 Nov '11

Author: cehoyos Date: Thu Nov 10 17:06:23 2011 New Revision: 34340 Log: Add lmlm4 regression test. Added: trunk/tests/ref/lmlm4/ trunk/tests/ref/lmlm4/LMLM4_CIFat30fps.divx.md5 Modified: trunk/tests/Makefile Modified: trunk/tests/Makefile ============================================================================== --- trunk/tests/Makefile Thu Nov 10 17:02:36 2011 (r34339) +++ trunk/tests/Makefile Thu Nov 10 17:06:23 2011 (r34340) @@ -5,7 +5,6 @@ BROKEN_SAMPLES= \ h264-conformance/CAPA1_TOSHIBA_B.264 \ h264-conformance/CI1_FT_B.264 \ h264-conformance/FM1_FT_E.264 \ - lmlm4/LMLM4_CIFat30fps.divx \ pva/PVA_test-partial.pva \ AUDIO_ONLY_SAMPLES = \ Added: trunk/tests/ref/lmlm4/LMLM4_CIFat30fps.divx.md5 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/lmlm4/LMLM4_CIFat30fps.divx.md5 Thu Nov 10 17:06:23 2011 (r34340) @@ -0,0 +1,418 @@ +a60cbf0b4d7e0d9251684e23ccfa0c9b frame00000000 +cc0ab4a599facac5aed45c2c6bd8da4b frame00000001 +36ae8b4a1e72c573f7549426f5022647 frame00000002 +5a1a22f7cc033d71fa2731817eed118e frame00000003 +0bfc1e1d62007d21711847faf5b32774 frame00000004 +d1e48a30206e1651ba73a1d8921a8b2d frame00000005 +6abde1c44a3f605fa9b9b6c91e23dc5b frame00000006 +cbdbb3c653d477a50cd167539e695bdd frame00000007 +8ade5c1de8b41cca38a485f1e9628872 frame00000008 +8975020ac92e97b7cbba0666a9164355 frame00000009 +b4a7a1f7d1432ff430e6d49a8770eeac frame00000010 +508fdd092c1ce307968286e5c7a628e2 frame00000011 +967a971f1a3179592d7245db5cc5fc9f frame00000012 +7bb6b602657a4d942295a3f3c02e047f frame00000013 +6cfbf11cb6971e41958451fcec6899bf frame00000014 +323da4dd029fdc27b0680b5322a858f2 frame00000015 +a3ab6822c6f41f077e9610b88bc07397 frame00000016 +5746a5bee4c089bd704a0096114b1cbf frame00000017 +b84866193d5e19352e5c423008eb6ff7 frame00000018 +ed7470288765984514799495ada708d8 frame00000019 +547ea755029ec099a5875e41904051c0 frame00000020 +70034a3274313c69e09ee2a5ccb38aef frame00000021 +5c38e6a417c347014f312d8c66cdae97 frame00000022 +8c875ff98d6554ab9ae92ba610a0610d frame00000023 +9b6f66ece28f9b918fb6342cd261161e frame00000024 +97b8af0ef457179eae3d927d7982b62d frame00000025 +bcbacb4d3377c95ce0bc8954b201d23f frame00000026 +75831c25e0122e5dcd85026a86419516 frame00000027 +db32c6039ae89bf52939acfd6cacded6 frame00000028 +fff4f190c2e92264a5d046f11c030c11 frame00000029 +78dbc661666f0589eea851fd995a0fa7 frame00000030 +be08c25b161519251c6836d067648425 frame00000031 +07672bd35f520d4449cfe359f9b152e7 frame00000032 +e53788a00ab217ad5feef3fda1266015 frame00000033 +bb12a46be834d00d5870afe75e506cb0 frame00000034 +2ee9bb313f5f16bc973516700b83fdee frame00000035 +334a90182d7b1427a670cb02d17c9304 frame00000036 +dd2dd0cbcb92584c86665df0f4664004 frame00000037 +9d8159ee1ee02aa5f31d01daff74462d frame00000038 +f81ea7cdc37b5fb7ff244568c930e1db frame00000039 +c7d9345b3577bf89f805691f2c9767d7 frame00000040 +45357a2a120752f66a105352f2ac3933 frame00000041 +00bc484e545063581c3f71166326fffb frame00000042 +bc8c0bf364cd39954ca0a28984967ae6 frame00000043 +a1b1b3af460924f720ac7806d76b28b4 frame00000044 +c57886a0f79af30138bb526bc05cae11 frame00000045 +65170d1bf333bf4d6ddb509cf2d9809c frame00000046 +5ac1222161cd6117767872939f359aa3 frame00000047 +c154cd4b1cbd98d5338670d198c5fc64 frame00000048 +323ce4e8a12aaf527b3c7dfebe2b9dc2 frame00000049 +6c9ccbb8f11c023f9245936144a76465 frame00000050 +64dba0f69bf6123a4054858e590dffe6 frame00000051 +a15ccf29a5336c145d45560985d531ac frame00000052 +7e3fff4f33e947eff6845c9671dc8dc5 frame00000053 +62a7ad7c7d9798ca5b2b9c5efb387708 frame00000054 +6d9feeacd2055a40a88d464c1e0cf46e frame00000055 +267af2b897e95ac35a39f51e3a0f6e1d frame00000056 +7bfbb61c02d9baca51ba9c2b7e73a459 frame00000057 +a959152f20d6b2754dbb4feec082988a frame00000058 +05894645d8be21f68d626d17b460739f frame00000059 +5c906b7fabd97d9fbd1f1f829beadb0c frame00000060 +763256c2c8af2cb223a008c0f499964d frame00000061 +83ce852f8eaccfea01ae8aacf3b30b77 frame00000062 +19b726b37418fa0b3fa99029289b99f8 frame00000063 +046ac2e22a169ba7680e78db0c31bb35 frame00000064 +0ecab0994eeb938c13e503fa238b41f5 frame00000065 +e30339360c1f8f244f9af10384a7d603 frame00000066 +5acac7f40b345af17001f9bdcc0f2a9c frame00000067 +91bb92c83eaa1035735d308d172644cb frame00000068 +315c61e850a864e7f323c91f46fd5a0e frame00000069 +d0a1a5e7e54c106a35da9d7a4f509dc9 frame00000070 +32c380087a6edee3326c5a331ec7d00c frame00000071 +c325ebb7a013611d9451a1fcf1d62f35 frame00000072 +9597b723af83bd47cb6748ffc72f9b0d frame00000073 +c0eaed168f3466bd1e5da76ba2365dfb frame00000074 +3a499d508f1af77d0adb50b6d9c1cb7c frame00000075 +54d454a0960017356c6c480a76a0a221 frame00000076 +eaac6ba9344a5d2965f79a941823e649 frame00000077 +91035a6d1275387ff95fc8eb5508faa1 frame00000078 +541d282846c3607bc8006d0f31661bd1 frame00000079 +b4d3362196ecea874ec52ec23340fba0 frame00000080 +bb529b68e5c8b0318cafd2dcf5b36d43 frame00000081 +237eab50c2891ea7f2828179fa92ede3 frame00000082 +72426d5327897877e2be884393196ffc frame00000083 +cadfea0a677ef2fcca9fec1092320d62 frame00000084 +3d3f43159976f078d5c2a4a6c5ce2939 frame00000085 +e4058c14c2cc7142d6978c5c28889852 frame00000086 +06790d4d6fc38ac97a66bb0297705093 frame00000087 +8634e8180e64bb30db8bbbab008d63f5 frame00000088 +2c22de7eff916dd4b969bd858050f57d frame00000089 +e7f020d42a7b3b9d58848e8ed8025ecf frame00000090 +902bcd166db47025f675098e80a7381a frame00000091 +306737167f85a5df2d181be15c930007 frame00000092 +5887da2d34bd3683ced687bb7ba096b5 frame00000093 +134b1fbda9efa22c4578795c8172656e frame00000094 +44182167886cdf1573a4d907ffb60e28 frame00000095 +4812ed6497309fc6a41406cbdd6df959 frame00000096 +7412a810f983934692a7d3b281b226dd frame00000097 +fd69564dae5e835a4e5e7600e83d6371 frame00000098 +100e5e9577dc1b0d21892d4ec982e278 frame00000099 +1ab3627c7d596cf7a6c238041fb5cdae frame00000100 +9aaad0f1640ed91b2e55330ab650dec7 frame00000101 +42933c1893ede93b61c53d686557df1e frame00000102 +12ff8a528cf7139c20fed60ecad6ab9a frame00000103 +f92cad8e5925cc494adb51d2d0ff2058 frame00000104 +9f99348df3e7b024495b02f48e4c6d83 frame00000105 +8b550c738ffb538f40c46791feb8adc5 frame00000106 +06781415f139adb9eca64ab60fa2cc90 frame00000107 +557f3fbe32d38685087c97691129ce57 frame00000108 +49b7fd0856e4d29a104071e2941085f8 frame00000109 +91ab62f76d98775197c942e836ff894d frame00000110 +5552fdeb7fcccbb46b3e8f194bab2d88 frame00000111 +16e2a9f2c572a8c6d5cdfaa9f3d38665 frame00000112 +38e0dc412930eab7e6e6c1b51e3e4baf frame00000113 +407c05841c0965059732928931e9e6d1 frame00000114 +87b0c27282413501ee7ec2aebe08aea4 frame00000115 +b1bf8de7a82ac4fe77cc3bad1b0a5794 frame00000116 +c702dd3e7e2b23af2902d1e690c2f2a0 frame00000117 +ce3a4081ebe11ca557dd8cc541338696 frame00000118 +1e04b0f3e136033983e5223a3e7695d3 frame00000119 +a0bd056570e625bec7cc610cf7a62210 frame00000120 +5883feb31abdfecc7dbb35fcba0289e7 frame00000121 +8517f5d373b753357e1ac45d2c4ef8e1 frame00000122 +25c5f46adfb03c2790f3be883eab3323 frame00000123 +e8dac7d2b6ba1379a9056df423841116 frame00000124 +84d8e31fa2f286360510faf27d59ac3d frame00000125 +19a8bd2dd98acbfeda65e3d6f29e833d frame00000126 +a1853fcf38f4f78c0056743e60c9b94d frame00000127 +470d9788e9233aadaaf6c7e453e2c795 frame00000128 +762650a99a752f92a6aeae7b532c9632 frame00000129 +a5c4081bd3bc843bf5841ba4e48565c4 frame00000130 +6d4d3421bf31145ac931a0f236bc82ab frame00000131 +c660d38cfa33c9b576ad9fc3ba4938a0 frame00000132 +357dcb28f62de7be1a5c220849f3e04e frame00000133 +167a4e539c6043f393217dbd76c0ec53 frame00000134 +fe2f4f700960c47c191224d8be8281f2 frame00000135 +2da9af2fcf63a1af5d04c179c23fb580 frame00000136 +7c31eb55f9d5b066c4708ce1c7b4001d frame00000137 +416bd251d0b19e23a079a9c6491373eb frame00000138 +bf07ff265d8042218b054ce7ca9d189c frame00000139 +3c4a229d175bb8b71342c26c3f91753d frame00000140 +f816eca05868f920a62548ee4b459e76 frame00000141 +d2a880dddc005fb642c8170ae9615645 frame00000142 +053509575c67833ce9a6769c845e2a9e frame00000143 +fcd4c762ea6fcc44a6cb84f1c65c4ae9 frame00000144 +d09610d7583bec5553b0c02a7b9dd9fc frame00000145 +66a60a1f9090417f1929d02ec16699cc frame00000146 +df85c3098feb90066c54736b08d929d0 frame00000147 +6beaecc1a7333d50dd710ae194eb8fab frame00000148 +81496af3c55603ed1c2cd2609beffd75 frame00000149 +e37d0a3d399a9ca7cbe52d0834d4fbe8 frame00000150 +ede504908f28a43734a0a26fb5181dab frame00000151 +a4c9a02b24e8a21f8a583cc24561b39f frame00000152 +84f83c438288140bc781a0f50c25e8c7 frame00000153 +dc49d31e06d47704b8f4df65418d0e08 frame00000154 +ebd2eaf5e054fa8ff60a61d1b2d01a7c frame00000155 +0803262f9eec6a25f1b69c25271e204b frame00000156 +50e2c8cc3b7b87a2ac3a48f3262bb2ce frame00000157 +1fe7fe85f72a4f6525ae114110ab0ad5 frame00000158 +09cc28294df837b46a8bbd952a119937 frame00000159 +b09e779216c94f6707750849e31e1c57 frame00000160 +b2aa45016cdb0b16afe854efdf118f4e frame00000161 +e724a2217022418d7c48ce8852bf1997 frame00000162 +d08f13c192c202492b2f309f326c731e frame00000163 +e78e7368a90bc4d38146a7b7901d9635 frame00000164 +1ab441f9fbe6f075c2d2f40c86ffe8b4 frame00000165 +80f6888f597dab52e0b81c9fc7796581 frame00000166 +a64eb264af023ee25156401454e05f5d frame00000167 +47978c4bf14fba792327bba6e4cf1df1 frame00000168 +ea9c2e8f4c09ee720f5f8ef1a639f669 frame00000169 +00652564ba32b239b2a9435e358b9835 frame00000170 +946e5652a7f10feb046b2dcc6e67db37 frame00000171 +cd6d1993e8838f68211c24626c9cfe38 frame00000172 +d6bfaacd554ac9e374c67eaa2c6b6eec frame00000173 +2f482c58c5013bfe4e0ff87632b6a598 frame00000174 +2b05c114d1e3732fce36904dda2ee52d frame00000175 +0fac175c1916529343b8b7912085fe8f frame00000176 +c6ecf6e47c55ae2e77a3683a7e842ee4 frame00000177 +2d37bb00ad76a69241a162f6b90d7539 frame00000178 +d4f9d22cbc353452834de1bc717ff350 frame00000179 +705d20983dbe0d94dadd8e799861862e frame00000180 +c5ff765d5c3169ceaac0f9fb252e5362 frame00000181 +9c0af8b198a1dbeb77814920db77bef0 frame00000182 +8046018cfac6928324e244ac5496ea18 frame00000183 +f7fc5afd0e755c9502ffcbb4a5c07729 frame00000184 +4a9a08aceeede19429eee807f327b56b frame00000185 +d2555edce443db516742c8a83a13d524 frame00000186 +0b02753f164945dc1d975c07e8054dd1 frame00000187 +253227b0b2e9cd3891ead50cde6e2b5d frame00000188 +75383f064d5c016ce7eb72da1ffc1ace frame00000189 +2834cfa3d67be2b014471078e3625d45 frame00000190 +daac7f53d0b1352138fb098c1044afe8 frame00000191 +e54c25ec329ca958aa4a60ff06844682 frame00000192 +3a2dec0f404b96e885ef7c61552fcc7f frame00000193 +d84ba3f1cfdc835e4e78b346c185d256 frame00000194 +2033b1031e09a5a4cb5982af3c34ee4a frame00000195 +b69adac891b31a104a3a20fc08e9dad1 frame00000196 +e4bc13984a8399a68c0ab29debd83776 frame00000197 +f7d957705b4a214e4ce4846247c9ff28 frame00000198 +628be952bdb6b5070e2a4555f3677cde frame00000199 +88c34f0610030ffe5d87821317c4af6e frame00000200 +5cff4f5dc57251feaba39f0d8ad4a4da frame00000201 +d56d0bec83846339a2f708b6ef9564b3 frame00000202 +0eee615725814fad546d32bf9c1b7756 frame00000203 +0a38796f4b40f17c00ce5866f6cf55f6 frame00000204 +1d6fe815082a7ab1cead065204307536 frame00000205 +6067595646ad6b9616750c7b3cbc0244 frame00000206 +f24f4ddd15e0a9a5f5378da0ca2e5715 frame00000207 +beae983334801d6c715f9e10819ab387 frame00000208 +243f718ad771a1a095d1fbfa8b08d6aa frame00000209 +d8f11b2663c593e656e84cf99b477519 frame00000210 +47d34ed85690de826205fbb2e86a30d2 frame00000211 +a24a3e509724d1770a02f6bd76291699 frame00000212 +9a2984a7d1a302cb9bf3f8d376932192 frame00000213 +4759fe6a2bb7eda1ed04b5c4f1a7d10d frame00000214 +6be49fcc890a595f01bfcbd88b2dbcc7 frame00000215 +b1f3de81916b051ab2e01288a3b7edfe frame00000216 +9901d41db9b17fbcfc8768a1aa1f5b85 frame00000217 +5222e7d1ba4bcb7eab82421ea8e7d7c4 frame00000218 +dd04400fc280f8e907d0dfc984261a9f frame00000219 +a865911f3e29760d8cd1a5549008eb7f frame00000220 +7d4b68c7f874ad1422e06ca1d803a31f frame00000221 +aa817ec6f5897315ca860a56b248454b frame00000222 +113799c5c114a5e9ad48139ee7da43d6 frame00000223 +4c8d440c80941d03902a9fb57f173b53 frame00000224 +5624e543ab45acb002565732819478e4 frame00000225 +fd92596b0ec78766fa77710cf8e78802 frame00000226 +ace060fb031982294c5cbbfefae58acd frame00000227 +6890b2995ffc5c330263ec1dc0b1f7fb frame00000228 +dee9022e5c877c95a1606a71f59f088f frame00000229 +372847cb5126d28e37bd3fbe392988af frame00000230 +255846d9bd6b8f8bd5c4e1e529f7b31c frame00000231 +1b35d83ca632235015d9f170d30b1a78 frame00000232 +e2ecbff1a7131363745ff3b2b3a78d16 frame00000233 +5cb6775cd287e87c74578101076b0e27 frame00000234 +e740128bc29a001e7a9045f5437cb0c4 frame00000235 +302d0cb19bf8fa07d43461203c503c13 frame00000236 +0299ebf50741ab58a353b2dc7a0ff8fc frame00000237 +848464850695a3fda7637f317e96214d frame00000238 +291fe5e3389b0c3b6eee58eb76948073 frame00000239 +bee599c52bd1060237e5384f7449dbf7 frame00000240 +71ee08cec2762185239ca11636730e8f frame00000241 +d187189751e8d7e8cb4c4f2abb3a2fea frame00000242 +b9af8803de752a21480684888f4ea28e frame00000243 +f9278e431dab5b15cd96a27980d9d1b7 frame00000244 +87f8a9cde3ea939892d2d99041600ddd frame00000245 +3f150b50e3fd0fc40da52ec2474d42cd frame00000246 +8306e551a83fea9297d54a890e47e2f5 frame00000247 +b01f8517e20e170db1c4f5aa12765e56 frame00000248 +6291b617091bd7a601b230415aa6204b frame00000249 +aa79e77d0b6c41c77fe68ea862c71b72 frame00000250 +cbf287e072729eecfcfeffe0b746a2e0 frame00000251 +ec8c4ac353999dada4c11592c4e84c29 frame00000252 +f507c8228faeb72cf7d8466f4819ec7f frame00000253 +691f3c924a34c2c5d3910f72c3a0ecfb frame00000254 +012d051fc777cfdb5ef5ec909fefb332 frame00000255 +b8a74a4a14bc7f2a60f350fdbd7365ef frame00000256 +4ae2115e4d4228d0b6302a5b8c59f582 frame00000257 +0269155308d28786766be7ab40cc247c frame00000258 +9f7a2cba13f80c8e6a98fac83c9cbf87 frame00000259 +8e0d3bf94083660843d1149975499b5c frame00000260 +4e362db9be913fae4b6718af16da45b8 frame00000261 +1580d1eebb291b214814a7724aa79882 frame00000262 +0196fa70c13e8ed067e75057a5821aea frame00000263 +b58ca78407e73da3e2db4a2236bd109e frame00000264 +c5387c86d04912899dcd1f1a31a40495 frame00000265 +5b318772b0db746b984fcca07beb5476 frame00000266 +6febb0c35fe3c1006fb4ec38f42d9b9f frame00000267 +d227403777efdc324772b08923295206 frame00000268 +7c23f1621e1c69c49e84bfcd01145361 frame00000269 +f1cc0a621cffd4b46e07433af9cc1654 frame00000270 +cd93cf359a2c6b2bd64fa0b217757483 frame00000271 +3b91f7fd2045cc0edc7dbea7458d31fd frame00000272 +0d2ac376b7083c0334fb5a62b1d8d913 frame00000273 +b999571b05569602924039ffd6040d68 frame00000274 +9e72f5812325bc5af2182f70edab3dd5 frame00000275 +873944b0e0a937c979fa307dff71186f frame00000276 +301cfa65276e420c12500328b0b3f4f2 frame00000277 +4a7ce30c845c4d1a65cedfd8b88a7ecc frame00000278 +2c3ca309f5e6dc606d68a44fcb59d53b frame00000279 +ee53de8c00f6ecbfe42b6873d6a8a2f4 frame00000280 +9ee13f9ce628355c3675bdaa12bfe6c5 frame00000281 +19420e6cc10ccdb46c38929e431d3905 frame00000282 +eb1413ca2b746d00c8bb94eff6df0c33 frame00000283 +f1fdbdab8bf9aa316ad4dea87d1506ed frame00000284 +a5377cd3ad5033a413821b45cae1b261 frame00000285 +fa89ae4f88274eafd2b8251c87e1128b frame00000286 +652408e07ac5f4c8ed44dcda74b1b4a6 frame00000287 +ae09ebca8ddcde812c094b6ab8aa9885 frame00000288 +43b85afe3454d81a1a36e08e53613d0d frame00000289 +ab2b38d2584d346a073c6731aabb719c frame00000290 +c6339b3afacc97e4225f8e8c4272a66f frame00000291 +2095f9f9c8298ee8503147d2c2bba5ef frame00000292 +345183f058dad6f941e66f3209dc09bc frame00000293 +563c834e672a3012abdd93471e46e871 frame00000294 +025f54e23eca2572c5b5bd1685c3a7d1 frame00000295 +4c1859c1e7dfb87144b4f788094e593b frame00000296 +77a68d4a08fe456a173ae9b1eda0002d frame00000297 +53e2b4fc93e798a2e29c745fe97c00c4 frame00000298 +7d4fe911b54e4c6a9d2579cb90b7ebf9 frame00000299 +8e0b65eeb4f0d06a0984d74f4d451c61 frame00000300 +7d0d0e14bed6606b36b2465aac821420 frame00000301 +02c8b844553402e95397fcbfbc45b90a frame00000302 +e98818ea5622e71f5a827203549f587d frame00000303 +6c88110aa13d95b5abe36c40597dab33 frame00000304 +0ea5ef51d06377f37de803f7816b73ec frame00000305 +05228a18374e567d368b849e304eacb9 frame00000306 +83d29e3009772563d932ad01d04119ac frame00000307 +2cc0099131481d676321cea77d350bca frame00000308 +a2b54fb0fc9456620612076398259668 frame00000309 +e67bc866acc2c3f8670c2838b1a48dfc frame00000310 +8d490997f75eafba1b73a4ab0f61fce6 frame00000311 +ced87e6968dca943c3f08144fe04da79 frame00000312 +6c3a9810a5b58fe05ea34e6e051d3cac frame00000313 +e02322a9021436d11becf3b04ced7d35 frame00000314 +d964fbea2aa619c7f93a75df169f90ea frame00000315 +8729b56005785917d943779f93c0106e frame00000316 +dd0cf568ef5719eaf3b3b76c3538ae22 frame00000317 +9250645998e24ce0e00825b4f83c0c42 frame00000318 +abda0ed80179fb9d2592b4456fbbb217 frame00000319 +3694d42456370f80b3afa44048341d36 frame00000320 +52ab40dc436d9d30c55cd90549c49455 frame00000321 +c8566c701b7d9f98f90adfde3176be38 frame00000322 +bfeb3c4726e3f874cce2f047ae38a6a4 frame00000323 +f9958f6091928a6e21d8c76d2203d39d frame00000324 +028509cce20da97c2c79763a1f169575 frame00000325 +131b4bf15f0cc01e721cea71a4ccd606 frame00000326 +abd629960be835b16b77b45fc8a9ba0e frame00000327 +ad261373f4b3046cdb2c53d482d7d766 frame00000328 +3197bd4efba9af8ea9ae4fa2b7dd6193 frame00000329 +a1b7159b0436855dabee9468d3a7eee9 frame00000330 +9a932d4f2a6c8814ccf4b7d162e9639c frame00000331 +8057694c54cafbe473866fdb2a5cb7e5 frame00000332 +a9e4906383c607303ef5e00bacaceaa5 frame00000333 +bb42d53c58403b3b3d6d8cf4aa308eaf frame00000334 +b62794dd402f5ca566254e54785db45a frame00000335 +ab48dfce841e42346f37136d31df3eeb frame00000336 +fc3cab74bc6ff9c717a6d17290511efe frame00000337 +1e74dd8f05ea24d8369f91c99a3ec580 frame00000338 +123f7110d4bea91adc3676a5bfebf3f7 frame00000339 +a3d2f4543aee0db7347ee9392b57ebd8 frame00000340 +2882cb2fd5c59c864bd86e4031641dfd frame00000341 +c9fa1760f607beb5443a378a0438961e frame00000342 +f5d8f7888d33c716ab068212451a21cc frame00000343 +11bdb22d003acd4d1c479e671012af95 frame00000344 +e481250a118245e16506fac63715b6dd frame00000345 +944572e59f86bd85a02f2930b88ab02f frame00000346 +dcab77da1efa76203ef6fa02c37172e1 frame00000347 +73ab0e59f9b908273f6c589caf64f985 frame00000348 +8f4f9f7f12c35bcc306a58b3f129aea4 frame00000349 +cd9f4e27a798ce485d6032812759577c frame00000350 +dec0997291bd33876d83b71a25fc06b4 frame00000351 +5c6367ebf4f5cdb6a8d084295d820ba4 frame00000352 +fda470539b0d88b9d3f1e33adb0b36de frame00000353 +cfac3e55a5c74ccd7f1c9eff73954f6f frame00000354 +faf1ef8cc247160088d1c9d41c1349ed frame00000355 +721b7994416b710eed2fc3c19e004cde frame00000356 +283f90637c21b9e6a4e8d9223bccaefe frame00000357 +ff01401e21da17620c2b644ccf776c1a frame00000358 +0c99959e9941c22cb682b0bb9cbc9490 frame00000359 +170fef32e33e3d382076255e4a1dc56c frame00000360 +4692654c59df629504b5dac94d6c2ddc frame00000361 +8aaff84c90bb6e51007eaf8afdb966f0 frame00000362 +a3e3c5099c91d465001a46ddedd58f59 frame00000363 +7bd6fd8e6b176dc1270726e8ace91c86 frame00000364 +c3809cd13b3728c171258ff59066e130 frame00000365 +3ad3462288a83588c35eb136b411c4ef frame00000366 +a7810bb21c2528f9f5d2b2b9532a7585 frame00000367 +c07d7790bc27303168c79cfc2c45522d frame00000368 +dfad45b84507c10dc9ab1b3202c6f97e frame00000369 +5943efbe85cedb9b22a05aa9fd0bdc96 frame00000370 +2f4654d821e4875aa84efef0c5ba37c2 frame00000371 +e59968f824f005a542ed05203d62a345 frame00000372 +6657fab933c4146cdc76fab9a9869ee1 frame00000373 +b7f6f4fa15291016b7b0c895c5982c20 frame00000374 +bdf8b4d78a113aa99a064f9c4487c24e frame00000375 +437821e5c13a38bf3c5f963c8c78dfd1 frame00000376 +dcc880da7a46b515937b080cedb66b74 frame00000377 +0685b9b61838b646a182639b43da33cc frame00000378 +a814c19f27be69a3db434ad70fff439b frame00000379 +9a30ecb7aad29f59b624756c4281ea5c frame00000380 +f3eba54b8eee04a8b397f81c3615ddba frame00000381 +69b34c4df387a52006dd997d002d9be1 frame00000382 +82acc2b2b62af74d711b89a78fbd062a frame00000383 +7fcdbdffec1fc4288c2add2a06cd541a frame00000384 +b60e199a5b0c3eee9e5ee59c8c95521f frame00000385 +c57219860273749ed10e35c52a992f68 frame00000386 +1aad563e76271ad917ce0b7f53afa46f frame00000387 +966f8105166c6c1a3470b8bca10f7713 frame00000388 +7826b2574a1e59bf864b201c68666cea frame00000389 +01b3a8699ae6a98b2ab162ad082ad632 frame00000390 +3a7340da4cc997ed991d55ae67f6bc1c frame00000391 +e4c2b5401e43a945395374f27ad35ea0 frame00000392 +35157b90c1f51cfc3d0e9c78336df0fe frame00000393 +41077a0e810fec8eba2554218d269249 frame00000394 +d5e84c048f524890911b6ecc6b1c0395 frame00000395 +804b5bea67f4414d52073da14b4e9004 frame00000396 +cfa4dc3aedfc02923ee78b372567678a frame00000397 +60416d796627c8da10c061cb92e6eca6 frame00000398 +8eabea69f5da1fa8b2dd19e11b275545 frame00000399 +fdd6266d6354c0b07d629ce367cbe6a3 frame00000400 +254656c0473bd1bfccaa98787cf0231a frame00000401 +d8420b71671bb1817ae2644e3368bdd2 frame00000402 +f98a6e59c7eb053ef2b7c4201f939ecd frame00000403 +2203d40bd4555d28bbbe97958245e613 frame00000404 +c1a804914cccb02a069ea0bcf15c8540 frame00000405 +0dca54410ab292b392284b4af754bf22 frame00000406 +4668ef3eb8990672e1687d4d3ca3b7a3 frame00000407 +ab6285de1dc34ea323cb5a59fec03282 frame00000408 +09276b876ea199fe789c2ef2e88b96a3 frame00000409 +d3d56b1edc84d2441824da867d3bf671 frame00000410 +e28fd98a927e57e6de305a5707cb1b03 frame00000411 +3780f19d7b072a087b83b5de1cf155ee frame00000412 +45b98ecebc2c753b4948105c70f848f6 frame00000413 +33a123a11aed0d3229a39197032d8455 frame00000414 +76870aba8a38e8d89a2c33046e72042f frame00000415 +0e0f594d2c4f0f85d87a2e3bffdf23d9 frame00000416 +f9c3ae2e122ade59985a5de34e9516cc frame00000417

1 0

r34339 - trunk/etc/codecs.conf
by cehoyos 10 Nov '11

10 Nov '11

Author: cehoyos Date: Thu Nov 10 17:02:36 2011 New Revision: 34339 Log: Fix fffrwu decoding. The original (uppercase) name of the decoder was changed to lowercase May 1st to avoid inconsistency. It was unintentionally changed since, and fixed again. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed Nov 9 03:35:04 2011 (r34338) +++ trunk/etc/codecs.conf Thu Nov 10 17:02:36 2011 (r34339) @@ -1791,7 +1791,7 @@ videocodec fffrwu status working fourcc FRWU driver ffmpeg - dll "FRWU" + dll frwu out UYVY videocodec frwuvfw

1 0

r34338 - trunk/libvo/vo_caca.c
by diego 09 Nov '11

09 Nov '11

Author: diego Date: Wed Nov 9 03:35:04 2011 New Revision: 34338 Log: vo_caca: Port to libcaca 1.x API, which is widespread enough nowadays. patch by Paul B. Mahol, onemda gmail com Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Wed Nov 9 03:26:58 2011 (r34337) +++ trunk/libvo/vo_caca.c Wed Nov 9 03:35:04 2011 (r34338) @@ -31,6 +31,7 @@ #include <string.h> #include <time.h> #include <errno.h> +#include <caca.h> #include "config.h" #include "video_out.h" @@ -41,16 +42,6 @@ #include "mp_msg.h" #include "mp_fifo.h" -#include <caca.h> -#ifdef CACA_API_VERSION_1 -/* Include the pre-1.x compatibility header. - * Once libcaca 1.x is widespread, vo_caca should be fully - * converted to the new API. A patch exists: - * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-July/044669.html - */ -#include <caca0.h> -#endif - static const vo_info_t info = { "libcaca", "caca", @@ -61,7 +52,13 @@ static const vo_info_t info = { const LIBVO_EXTERN(caca) /* caca stuff */ -static struct caca_bitmap *cbitmap = NULL; +static caca_canvas_t *canvas; +static caca_display_t *display; +static caca_dither_t *dither = NULL; +static const char *dither_antialias = "default"; +static const char *dither_charset = "default"; +static const char *dither_color = "default"; +static const char *dither_algo = "none"; /* image infos */ static int image_format; @@ -137,18 +134,24 @@ static void osdpercent(int duration, int static int resize(void) { - screen_w = caca_get_width(); - screen_h = caca_get_height(); + screen_w = caca_get_canvas_width(canvas); + screen_h = caca_get_canvas_height(canvas); - if (cbitmap) - caca_free_bitmap(cbitmap); + caca_free_dither(dither); - cbitmap = caca_create_bitmap(bpp, image_width, image_height, - depth * image_width, rmask, gmask, bmask, - amask); + dither = caca_create_dither(bpp, image_width, image_height, + depth * image_width, + rmask, gmask, bmask, amask); + if (dither == NULL) { + mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_dither failed!\n"); + return ENOSYS; + } - if (!cbitmap) - mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_bitmap failed!\n"); + /* Default libcaca features */ + caca_set_dither_antialias(dither, dither_antialias); + caca_set_dither_charset(dither, dither_charset); + caca_set_dither_color(dither, dither_color); + caca_set_dither_algorithm(dither, dither_algo); return 0; } @@ -169,7 +172,7 @@ static int config(uint32_t width, uint32 static int draw_frame(uint8_t *src[]) { - caca_draw_bitmap(0, 0, screen_w, screen_h, cbitmap, src[0]); + caca_dither_bitmap(canvas, 0, 0, screen_w, screen_h, dither, src[0]); return 0; } @@ -186,102 +189,127 @@ static void flip_page(void) if (*posbar) posbar[0] = '\0'; } else { - caca_putstr(osdx, osdy, osdmessagetext); + caca_put_str(canvas, osdx, osdy, osdmessagetext); if (*posbar) - caca_putstr(0, posbary, posbar); + caca_put_str(canvas, 0, posbary, posbar); } } - caca_refresh(); + caca_refresh_display(display); +} + +static void set_next_str(const char * const *list, const char **str, + const char **msg) +{ + int ind; + for (ind = 0; list[ind]; ind += 2) { + if (strcmp(list[ind], *str) == 0) { + if (list[ind + 2] == NULL) + ind = -2; + *str = list[ind + 2]; + *msg = list[ind + 3]; + return; + } + } + + *str = list[0]; + *msg = list[1]; } static void check_events(void) { - unsigned int cev; + caca_event_t cev; + if (!caca_get_event(display, CACA_EVENT_ANY, &cev, 1)) + return; - if ((cev = caca_get_event(CACA_EVENT_ANY))) { - if (cev & CACA_EVENT_RESIZE) { - caca_refresh(); - resize(); - } else if (cev & CACA_EVENT_KEY_RELEASE) { - int key = (cev & 0x00ffffff); - enum caca_feature cf; + switch (cev.type) { + case CACA_EVENT_RESIZE: + caca_refresh_display(display); + resize(); + break; + case CACA_EVENT_KEY_RELEASE: + { + int key = cev.data.key.ch; + const char *msg_name; - switch (key) { - case 'd': - case 'D': - /* Toggle dithering method */ - cf = 1 + caca_get_feature(CACA_DITHERING); - if (cf > CACA_DITHERING_MAX) - cf = CACA_DITHERING_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + switch (key) { + case 'd': + case 'D': + /* Toggle dithering algorithm */ + set_next_str(caca_get_dither_algorithm_list(dither), &dither_algo, &msg_name); + caca_set_dither_algorithm(dither, dither_algo); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; - case 'a': - case 'A': - /* Toggle antialiasing method */ - cf = 1 + caca_get_feature(CACA_ANTIALIASING); - if (cf > CACA_ANTIALIASING_MAX) - cf = CACA_ANTIALIASING_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + case 'a': + case 'A': + /* Toggle antialiasing method */ + set_next_str(caca_get_dither_antialias_list(dither), &dither_antialias, &msg_name); + caca_set_dither_antialias(dither, dither_antialias); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; - case 'b': - case 'B': - /* Toggle background method */ - cf = 1 + caca_get_feature(CACA_BACKGROUND); - if (cf > CACA_BACKGROUND_MAX) - cf = CACA_BACKGROUND_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + case 'h': + case 'H': + /* Toggle charset method */ + set_next_str(caca_get_dither_charset_list(dither), &dither_charset, &msg_name); + caca_set_dither_charset(dither, dither_charset); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; - case CACA_KEY_UP: - mplayer_put_key(KEY_UP); - break; - case CACA_KEY_DOWN: - mplayer_put_key(KEY_DOWN); - break; - case CACA_KEY_LEFT: - mplayer_put_key(KEY_LEFT); - break; - case CACA_KEY_RIGHT: - mplayer_put_key(KEY_RIGHT); - break; - case CACA_KEY_ESCAPE: - mplayer_put_key(KEY_ESC); - break; - case CACA_KEY_PAGEUP: - mplayer_put_key(KEY_PAGE_UP); - break; - case CACA_KEY_PAGEDOWN: - mplayer_put_key(KEY_PAGE_DOWN); - break; - case CACA_KEY_RETURN: - mplayer_put_key(KEY_ENTER); - break; - case CACA_KEY_HOME: - mplayer_put_key(KEY_HOME); - break; - case CACA_KEY_END: - mplayer_put_key(KEY_END); - break; - default: - if (key <= 255) - mplayer_put_key(key); - break; - } + case 'c': + case 'C': + /* Toggle color method */ + set_next_str(caca_get_dither_color_list(dither), &dither_color, &msg_name); + caca_set_dither_color(dither, dither_color); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; + + case CACA_KEY_UP: + mplayer_put_key(KEY_UP); + break; + case CACA_KEY_DOWN: + mplayer_put_key(KEY_DOWN); + break; + case CACA_KEY_LEFT: + mplayer_put_key(KEY_LEFT); + break; + case CACA_KEY_RIGHT: + mplayer_put_key(KEY_RIGHT); + break; + case CACA_KEY_ESCAPE: + mplayer_put_key(KEY_ESC); + break; + case CACA_KEY_PAGEUP: + mplayer_put_key(KEY_PAGE_UP); + break; + case CACA_KEY_PAGEDOWN: + mplayer_put_key(KEY_PAGE_DOWN); + break; + case CACA_KEY_RETURN: + mplayer_put_key(KEY_ENTER); + break; + case CACA_KEY_HOME: + mplayer_put_key(KEY_HOME); + break; + case CACA_KEY_END: + mplayer_put_key(KEY_END); + break; + default: + if (key <= 255) + mplayer_put_key(key); + break; } } + } } static void uninit(void) { - caca_free_bitmap(cbitmap); - cbitmap = NULL; - caca_end(); + caca_free_dither(dither); + dither = NULL; + caca_free_display(display); + caca_free_canvas(canvas); } @@ -299,16 +327,21 @@ static int preinit(const char *arg) return ENOSYS; } - if (caca_init()) { - mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to initialize\n"); + canvas = caca_create_canvas(0, 0); + if (canvas == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to create canvas\n"); return ENOSYS; } - caca_set_window_title("MPlayer"); + display = caca_create_display(canvas); - /* Default libcaca features */ - caca_set_feature(CACA_ANTIALIASING_PREFILTER); - caca_set_feature(CACA_DITHERING_RANDOM); + if (display == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to create display\n"); + caca_free_canvas(canvas); + return ENOSYS; + } + + caca_set_display_title(display, "MPlayer"); return 0; }

2 1

r34337 - trunk/libvo/vo_caca.c
by diego 09 Nov '11

09 Nov '11

Author: diego Date: Wed Nov 9 03:26:58 2011 New Revision: 34337 Log: vo_caca: reformat and prettyprint as K&R, shorten some lines Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Wed Nov 9 02:41:44 2011 (r34336) +++ trunk/libvo/vo_caca.c Wed Nov 9 03:26:58 2011 (r34337) @@ -43,22 +43,22 @@ #include <caca.h> #ifdef CACA_API_VERSION_1 - /* Include the pre-1.x compatibility header. - * Once libcaca 1.x is widespread, vo_caca should be fully - * converted to the new API. A patch exists: - * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-July/044669.html - */ - #include <caca0.h> +/* Include the pre-1.x compatibility header. + * Once libcaca 1.x is widespread, vo_caca should be fully + * converted to the new API. A patch exists: + * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-July/044669.html + */ +#include <caca0.h> #endif static const vo_info_t info = { - "libcaca", - "caca", - "Pigeon <pigeon(a)pigeond.net>", - "" + "libcaca", + "caca", + "Pigeon <pigeon(a)pigeond.net>", + "" }; -const LIBVO_EXTERN (caca) +const LIBVO_EXTERN(caca) /* caca stuff */ static struct caca_bitmap *cbitmap = NULL; @@ -71,17 +71,17 @@ static int image_height; static int screen_w, screen_h; /* We want 24bpp always for now */ -static unsigned int bpp = 24; +static unsigned int bpp = 24; static unsigned int depth = 3; static unsigned int rmask = 0xff0000; static unsigned int gmask = 0x00ff00; static unsigned int bmask = 0x0000ff; static unsigned int amask = 0; -#define MESSAGE_SIZE 512 -#define MESSAGE_DURATION 5 +#define MESSAGE_SIZE 512 +#define MESSAGE_DURATION 5 -static time_t stoposd = 0; +static time_t stoposd = 0; static int showosdmessage = 0; static char osdmessagetext[MESSAGE_SIZE]; static char posbar[MESSAGE_SIZE]; @@ -91,10 +91,7 @@ static int posbary = 2; static void osdmessage(int duration, const char *fmt, ...) { - /* - * for outputting a centered string at the bottom - * of our window for a while - */ + /* for outputting a centered string at the window bottom for a while */ va_list ar; char m[MESSAGE_SIZE]; @@ -104,38 +101,36 @@ static void osdmessage(int duration, con strcpy(osdmessagetext, m); showosdmessage = 1; - stoposd = time(NULL) + duration; - osdx = (screen_w - strlen (osdmessagetext)) / 2; - posbar[0] = '\0'; + stoposd = time(NULL) + duration; + osdx = (screen_w - strlen(osdmessagetext)) / 2; + posbar[0] = '\0'; } -static void osdpercent(int duration, int min, int max, int val, const char *desc, const char *unit) +static void osdpercent(int duration, int min, int max, int val, + const char *desc, const char *unit) { - /* - * prints a bar for setting values - */ + /* prints a bar for setting values */ float step; int where, i; - step = (float)screen_w / (float)(max - min); + step = (float)screen_w / (float)(max - min); where = (val - min) * step; - osdmessage (duration, "%s: %i%s", desc, val, unit); - posbar[0] = '|'; + osdmessage(duration, "%s: %i%s", desc, val, unit); + posbar[0] = '|'; posbar[screen_w - 1] = '|'; - for (i = 0; i < screen_w; i++) - { - if (i == where) - posbar[i] = '#'; - else - posbar[i] = '-'; + for (i = 0; i < screen_w; i++) { + if (i == where) + posbar[i] = '#'; + else + posbar[i] = '-'; } if (where != 0) - posbar[0] = '|'; + posbar[0] = '|'; if (where != (screen_w - 1)) - posbar[screen_w - 1] = '|'; + posbar[screen_w - 1] = '|'; posbar[screen_w] = '\0'; } @@ -146,29 +141,30 @@ static int resize(void) screen_h = caca_get_height(); if (cbitmap) - caca_free_bitmap(cbitmap); + caca_free_bitmap(cbitmap); cbitmap = caca_create_bitmap(bpp, image_width, image_height, - depth * image_width, rmask, gmask, bmask, - amask); + depth * image_width, rmask, gmask, bmask, + amask); if (!cbitmap) - mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_bitmap failed!\n"); + mp_msg(MSGT_VO, MSGL_FATAL, "vo_caca: caca_create_bitmap failed!\n"); return 0; } static int config(uint32_t width, uint32_t height, uint32_t d_width, - uint32_t d_height, uint32_t flags, char *title, uint32_t format) + uint32_t d_height, uint32_t flags, char *title, + uint32_t format) { image_height = height; - image_width = width; + image_width = width; image_format = format; showosdmessage = 0; - posbar[0] = '\0'; + posbar[0] = '\0'; - return resize (); + return resize(); } static int draw_frame(uint8_t *src[]) @@ -184,107 +180,100 @@ static int draw_slice(uint8_t *src[], in static void flip_page(void) { - - if (showosdmessage) - { - if (time(NULL) >= stoposd) - { - showosdmessage = 0; - if (*posbar) - posbar[0] = '\0'; - } else { - caca_putstr(osdx, osdy, osdmessagetext); - - if (*posbar) - caca_putstr(0, posbary, posbar); - } + if (showosdmessage) { + if (time(NULL) >= stoposd) { + showosdmessage = 0; + if (*posbar) + posbar[0] = '\0'; + } else { + caca_putstr(osdx, osdy, osdmessagetext); + if (*posbar) + caca_putstr(0, posbary, posbar); + } } caca_refresh(); } -static void check_events (void) +static void check_events(void) { unsigned int cev; - if ((cev = caca_get_event(CACA_EVENT_ANY))) - { - if (cev & CACA_EVENT_RESIZE) - { - caca_refresh(); - resize(); - } else if (cev & CACA_EVENT_KEY_RELEASE) - { - int key = (cev & 0x00ffffff); - enum caca_feature cf; + if ((cev = caca_get_event(CACA_EVENT_ANY))) { + if (cev & CACA_EVENT_RESIZE) { + caca_refresh(); + resize(); + } else if (cev & CACA_EVENT_KEY_RELEASE) { + int key = (cev & 0x00ffffff); + enum caca_feature cf; - switch (key) { - case 'd': - case 'D': - /* Toggle dithering method */ - cf = 1 + caca_get_feature(CACA_DITHERING); - if (cf > CACA_DITHERING_MAX) - cf = CACA_DITHERING_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + switch (key) { + case 'd': + case 'D': + /* Toggle dithering method */ + cf = 1 + caca_get_feature(CACA_DITHERING); + if (cf > CACA_DITHERING_MAX) + cf = CACA_DITHERING_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; - case 'a': - case 'A': - /* Toggle antialiasing method */ - cf = 1 + caca_get_feature(CACA_ANTIALIASING); - if (cf > CACA_ANTIALIASING_MAX) - cf = CACA_ANTIALIASING_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + case 'a': + case 'A': + /* Toggle antialiasing method */ + cf = 1 + caca_get_feature(CACA_ANTIALIASING); + if (cf > CACA_ANTIALIASING_MAX) + cf = CACA_ANTIALIASING_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; - case 'b': - case 'B': - /* Toggle background method */ - cf = 1 + caca_get_feature(CACA_BACKGROUND); - if (cf > CACA_BACKGROUND_MAX) - cf = CACA_BACKGROUND_MIN; - caca_set_feature(cf); - osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); - break; + case 'b': + case 'B': + /* Toggle background method */ + cf = 1 + caca_get_feature(CACA_BACKGROUND); + if (cf > CACA_BACKGROUND_MAX) + cf = CACA_BACKGROUND_MIN; + caca_set_feature(cf); + osdmessage(MESSAGE_DURATION, "Using %s", caca_get_feature_name(cf)); + break; - case CACA_KEY_UP: - mplayer_put_key(KEY_UP); - break; - case CACA_KEY_DOWN: - mplayer_put_key(KEY_DOWN); - break; - case CACA_KEY_LEFT: - mplayer_put_key(KEY_LEFT); - break; - case CACA_KEY_RIGHT: - mplayer_put_key(KEY_RIGHT); - break; - case CACA_KEY_ESCAPE: - mplayer_put_key(KEY_ESC); - break; - case CACA_KEY_PAGEUP: - mplayer_put_key(KEY_PAGE_UP); - break; - case CACA_KEY_PAGEDOWN: - mplayer_put_key(KEY_PAGE_DOWN); - break; - case CACA_KEY_RETURN: - mplayer_put_key(KEY_ENTER); - break; - case CACA_KEY_HOME: - mplayer_put_key(KEY_HOME); - break; - case CACA_KEY_END: - mplayer_put_key(KEY_END); - break; - default: - if (key <= 255) - mplayer_put_key (key); - break; - } - } + case CACA_KEY_UP: + mplayer_put_key(KEY_UP); + break; + case CACA_KEY_DOWN: + mplayer_put_key(KEY_DOWN); + break; + case CACA_KEY_LEFT: + mplayer_put_key(KEY_LEFT); + break; + case CACA_KEY_RIGHT: + mplayer_put_key(KEY_RIGHT); + break; + case CACA_KEY_ESCAPE: + mplayer_put_key(KEY_ESC); + break; + case CACA_KEY_PAGEUP: + mplayer_put_key(KEY_PAGE_UP); + break; + case CACA_KEY_PAGEDOWN: + mplayer_put_key(KEY_PAGE_DOWN); + break; + case CACA_KEY_RETURN: + mplayer_put_key(KEY_ENTER); + break; + case CACA_KEY_HOME: + mplayer_put_key(KEY_HOME); + break; + case CACA_KEY_END: + mplayer_put_key(KEY_END); + break; + default: + if (key <= 255) + mplayer_put_key(key); + break; + } + } } } @@ -299,23 +288,20 @@ static void uninit(void) static void draw_osd(void) { if (vo_osd_progbar_type != -1) - osdpercent(MESSAGE_DURATION, 0, 255, - vo_osd_progbar_value, sub_osd_names[vo_osd_progbar_type], - ""); + osdpercent(MESSAGE_DURATION, 0, 255, vo_osd_progbar_value, + sub_osd_names[vo_osd_progbar_type], ""); } static int preinit(const char *arg) { - if (arg) - { - mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: Unknown subdevice: %s\n", arg); - return ENOSYS; + if (arg) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: Unknown subdevice: %s\n", arg); + return ENOSYS; } - if (caca_init()) - { - mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to initialize\n"); - return ENOSYS; + if (caca_init()) { + mp_msg(MSGT_VO, MSGL_ERR, "vo_caca: failed to initialize\n"); + return ENOSYS; } caca_set_window_title("MPlayer"); @@ -330,18 +316,17 @@ static int preinit(const char *arg) static int query_format(uint32_t format) { if (format == IMGFMT_BGR24) - return VFCAP_OSD | VFCAP_CSP_SUPPORTED; + return VFCAP_OSD | VFCAP_CSP_SUPPORTED; return 0; } static int control(uint32_t request, void *data) { - switch(request) - { + switch (request) { case VOCTRL_QUERY_FORMAT: - return query_format(*((uint32_t *)data)); + return query_format(*((uint32_t *)data)); default: - return VO_NOTIMPL; + return VO_NOTIMPL; } }

1 0

r34336 - trunk/libmpcodecs/vd_ffmpeg.c
by diego 09 Nov '11

09 Nov '11

Author: diego Date: Wed Nov 9 02:41:44 2011 New Revision: 34336 Log: vd_ffmpeg: Conditionally declare lavc_param_wait_keyframe to fix warning. libmpcodecs/vd_ffmpeg.c:95: warning: 'lavc_param_wait_keyframe' defined but not used Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Wed Nov 9 02:22:02 2011 (r34335) +++ trunk/libmpcodecs/vd_ffmpeg.c Wed Nov 9 02:41:44 2011 (r34336) @@ -91,7 +91,9 @@ static int lavc_param_vstats=0; static int lavc_param_idct_algo=0; static int lavc_param_debug=0; static int lavc_param_vismv=0; +#ifdef CODEC_FLAG2_SHOW_ALL static int lavc_param_wait_keyframe=0; +#endif static int lavc_param_skip_top=0; static int lavc_param_skip_bottom=0; static int lavc_param_fast=0;

1 0

r34335 - in trunk: DOCS/man/cs/mplayer.1 DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/pl/mplayer.1 DO...
by diego 09 Nov '11

09 Nov '11

Author: diego Date: Wed Nov 9 02:22:02 2011 New Revision: 34335 Log: Remove obsolete ALSA 0.5 audio output and ALSA 0.9 audio input. ALSA 0.5 was last released in 2000, 0.9 in 2003; besides the ALSA 0.9 and 1.x audio inputs heavily duplicated code. Replaced: trunk/stream/ai_alsa.c - copied, changed from r34301, trunk/stream/ai_alsa1x.c Deleted: trunk/libao2/ao_alsa5.c trunk/stream/ai_alsa1x.c Modified: trunk/DOCS/tech/MAINTAINERS trunk/Makefile trunk/TOOLS/movinfo.c trunk/configure trunk/libao2/audio_out.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/cs/mplayer.1 trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/man/es/mplayer.1 trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/man/hu/mplayer.1 trunk/DOCS/man/it/mplayer.1 trunk/DOCS/man/pl/mplayer.1 trunk/DOCS/man/ru/mplayer.1 trunk/DOCS/man/zh_CN/mplayer.1 trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/DOCS/tech/MAINTAINERS Wed Nov 9 02:22:02 2011 (r34335) @@ -201,7 +201,6 @@ libvo drivers: * w32_common.c - Reimar Döffinger libao2 drivers: - * ao_alsa5.c - None * ao_alsa.c - Clemens Ladisch * ao_arts.c - None * ao_coreaudio.c - None Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/Makefile Wed Nov 9 02:22:02 2011 (r34335) @@ -33,8 +33,7 @@ OS_FEATURE-$(STRSEP) += OS_FEATURE-$(VSSCANF) += osdep/vsscanf.c # conditional source declarations -SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c +SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes) SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c @@ -496,9 +495,7 @@ SRCS_COMMON = asxparser.c \ SRCS_MPLAYER-$(3DFX) += libvo/vo_3dfx.c SRCS_MPLAYER-$(AA) += libvo/vo_aa.c -SRCS_MPLAYER-$(ALSA1X) += libao2/ao_alsa.c -SRCS_MPLAYER-$(ALSA5) += libao2/ao_alsa5.c -SRCS_MPLAYER-$(ALSA9) += libao2/ao_alsa.c +SRCS_MPLAYER-$(ALSA) += libao2/ao_alsa.c SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c Modified: trunk/TOOLS/movinfo.c ============================================================================== --- trunk/TOOLS/movinfo.c Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/TOOLS/movinfo.c Wed Nov 9 02:22:02 2011 (r34335) @@ -182,8 +182,10 @@ static void lschunks(FILE *f,int level,u if(atom_size<8) break; // error - printf("%08X: %*s %.4s (%08X) %05d [%s] (begin: %08X)\n",pos,level*2,"",&atom_type,atom_type,atom_size, - atom2human_type(atom_type), pos+8); // 8: atom_size fields (4) + atom_type fields (4) + printf("%08X: %*s %.4s (%08X) %05d [%s] (begin: %08X)\n", + pos, level * 2, "", &atom_type, atom_type, + atom_size, atom2human_type(atom_type), + pos + 8); // 8: atom_size fields (4) + atom_type fields (4) #ifndef NO_SPECIAL // if (atom_type == 0x61746475) Modified: trunk/configure ============================================================================== --- trunk/configure Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/configure Wed Nov 9 02:22:02 2011 (r34335) @@ -5494,44 +5494,32 @@ if test "$_alloca" != yes ; then fi if test "$_alsa" != no ; then _alsa=no - cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)' -lasound $ld_dl $ld_pthread && _alsaver='0.5.x' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)' -lasound $ld_dl $ld_pthread && _alsaver='0.9.x-alsa' cpp_condition_check 'sys/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-sys' cpp_condition_check 'alsa/asoundlib.h' '(SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)' -lasound $ld_dl $ld_pthread && _alsaver='1.0.x-alsa' fi def_alsa='#undef CONFIG_ALSA' -def_alsa5='#undef CONFIG_ALSA5' def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H' def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H' if test "$_alsaver" ; then _alsa=yes - if test "$_alsaver" = '0.5.x' ; then - _alsa5=yes - aomodules="alsa5 $aomodules" - def_alsa5='#define CONFIG_ALSA5 1' - def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' - res_comment="using alsa 0.5.x and sys/asoundlib.h" - elif test "$_alsaver" = '0.9.x-sys' ; then - _alsa9=yes + if test "$_alsaver" = '0.9.x-sys' ; then aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_sys_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and sys/asoundlib.h" elif test "$_alsaver" = '0.9.x-alsa' ; then - _alsa9=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' res_comment="using alsa 0.9.x and alsa/asoundlib.h" elif test "$_alsaver" = '1.0.x-sys' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1' res_comment="using alsa 1.0.x and sys/asoundlib.h" elif test "$_alsaver" = '1.0.x-alsa' ; then - _alsa1x=yes aomodules="alsa $aomodules" def_alsa='#define CONFIG_ALSA 1' def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1' @@ -7276,7 +7264,7 @@ echocheck "Radio interface" if test "$_radio" = yes ; then def_radio='#define CONFIG_RADIO 1' inputmodules="radio $inputmodules" - if test "$_alsa9" != yes -a "$_alsa1x" != yes -a "$_ossaudio" != yes ; then + if test "$_alsa" != yes -a "$_ossaudio" != yes ; then _radio_capture=no fi if test "$_radio_capture" = yes ; then @@ -8037,9 +8025,7 @@ VSSCANF = $vsscanf # features 3DFX = $_3dfx AA = $_aa -ALSA1X = $_alsa1x -ALSA9 = $_alsa9 -ALSA5 = $_alsa5 +ALSA = $_alsa APPLE_IR = $_apple_ir APPLE_REMOTE = $_apple_remote ARTS = $_arts @@ -8319,9 +8305,7 @@ cat > $TMPH << EOF */ #define CONFIG_FAKE_MONO 1 -/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through, - * use 65536 for ALSA 0.5, for others 16384 is enough - */ +/* set up max. outburst. use 131072 for TrueHD SPDIF pass-through */ #define MAX_OUTBURST 131072 /* set up audio OUTBURST. Do not change this! */ @@ -8519,7 +8503,6 @@ $def_xshape /* Audio output drivers */ $def_alsa -$def_alsa5 $def_arts $def_coreaudio $def_dart Modified: trunk/libao2/audio_out.c ============================================================================== --- trunk/libao2/audio_out.c Wed Nov 9 01:32:12 2011 (r34334) +++ trunk/libao2/audio_out.c Wed Nov 9 02:22:02 2011 (r34335) @@ -39,7 +39,6 @@ extern const ao_functions_t audio_out_pu extern const ao_functions_t audio_out_jack; extern const ao_functions_t audio_out_openal; extern const ao_functions_t audio_out_null; -extern const ao_functions_t audio_out_alsa5; extern const ao_functions_t audio_out_alsa; extern const ao_functions_t audio_out_nas; extern const ao_functions_t audio_out_sdl; @@ -80,9 +79,6 @@ const ao_functions_t* const audio_out_dr #ifdef CONFIG_ALSA &audio_out_alsa, #endif -#ifdef CONFIG_ALSA5 - &audio_out_alsa5, -#endif #ifdef CONFIG_SGI_AUDIO &audio_out_sgi, #endif Copied and modified: trunk/stream/ai_alsa.c (from r34301, trunk/stream/ai_alsa1x.c) ============================================================================== --- trunk/stream/ai_alsa1x.c Fri Nov 4 16:22:51 2011 (r34301, copy source) +++ trunk/stream/ai_alsa.c Wed Nov 9 02:22:02 2011 (r34335) @@ -72,7 +72,7 @@ int ai_alsa_setup(audio_in_t *ai) rate = ai->req_samplerate; err = snd_pcm_hw_params_set_rate_near(ai->alsa.handle, params, &rate, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate); } ai->samplerate = rate; @@ -81,7 +81,7 @@ int ai_alsa_setup(audio_in_t *ai) err = snd_pcm_hw_params_set_buffer_time_near(ai->alsa.handle, params, &ai->alsa.buffer_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime); } dir = 0; @@ -89,7 +89,7 @@ int ai_alsa_setup(audio_in_t *ai) err = snd_pcm_hw_params_set_period_time_near(ai->alsa.handle, params, &ai->alsa.period_time, &dir); if (err < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime); + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime); } err = snd_pcm_hw_params(ai->alsa.handle, params);

1 0

r34334 - trunk/etc/codecs.conf
by cehoyos 09 Nov '11

09 Nov '11

Author: cehoyos Date: Wed Nov 9 01:32:12 2011 New Revision: 34334 Log: Fix "m1v " playback. It seems the codecs.conf parser does not accept fourcc's with spaces after other fourcc's. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Wed Nov 9 00:51:41 2011 (r34333) +++ trunk/etc/codecs.conf Wed Nov 9 01:32:12 2011 (r34334) @@ -213,7 +213,8 @@ videocodec ffmpeg1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc VCR2 fourcc MPEG - fourcc m1v1,"m1v " + fourcc m1v1 + fourcc "m1v " driver ffmpeg dll "mpeg1video" out YV12,I420,IYUV @@ -289,7 +290,8 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1,m1v1,"m1v " + fourcc m2v1,m1v1 + fourcc "m1v " fourcc LMP2 ; Lead mpeg2 in avi fourcc slif ; SoftLab MPEG-2 I-frames Codec fourcc EM2V ; Etymonix MPEG-2 I-frame Video Codec @@ -331,7 +333,8 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1,m1v1,"m1v " + fourcc m2v1,m1v1 + fourcc "m1v " fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -367,7 +370,8 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1,m1v1,"m1v " + fourcc m2v1,m1v1 + fourcc "m1v " fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -400,7 +404,8 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi - fourcc m2v1,m1v1,"m1v " + fourcc m2v1,m1v1 + fourcc "m1v " driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -465,7 +470,8 @@ videocodec mpegpes fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1,m1v1,"m1v " + fourcc m2v1,m1v1 + fourcc "m1v " fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc LMP2 ; Lead mpeg2 in avi

1 0

r34333 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by cehoyos 08 Nov '11

08 Nov '11

Author: cehoyos Date: Wed Nov 9 00:51:41 2011 New Revision: 34333 Log: Support BMV decoding (bug 2009). Patch by richardpl, onemda gmail Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Nov 8 22:19:39 2011 (r34332) +++ trunk/etc/codecs.conf Wed Nov 9 00:51:41 2011 (r34333) @@ -3488,6 +3488,14 @@ videocodec ffvqa dll "vqavideo" out BGR8 +videocodec ffbmvvideo + info "FFmpeg Discoworld II BMV Video" + status working + fourcc BMVV ; internal MPlayer FourCC + driver ffmpeg + dll bmv_video + out BGR8 + videocodec ffc93 info "FFmpeg C93 Video" status buggy @@ -4285,6 +4293,13 @@ audiocodec ffbinkrdftaud driver ffmpeg dll "binkaudio_rdft" +audiocodec ffbmvaudio + info "FFmpeg Discoworld II BMV Audio" + status working + fourcc BMVA ; internal MPlayer FourCC + driver ffmpeg + dll bmv_audio + audiocodec ffdsicinaudio info "FFmpeg Delphine CIN audio" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Tue Nov 8 22:19:39 2011 (r34332) +++ trunk/libmpdemux/mp_taglists.c Wed Nov 9 00:51:41 2011 (r34333) @@ -37,6 +37,7 @@ static const struct AVCodecTag mp_wav_ta { CODEC_ID_AMR_NB, MKTAG('n', 'b', 0, 0)}, { CODEC_ID_BINKAUDIO_DCT, MKTAG('B', 'A', 'U', '1')}, { CODEC_ID_BINKAUDIO_RDFT, MKTAG('B', 'A', 'U', '2')}, + { CODEC_ID_BMV_AUDIO, MKTAG('B', 'M', 'V', 'A')}, { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, @@ -107,6 +108,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_AVS, MKTAG('A', 'V', 'S', ' ')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, + { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', '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')},

1 0

r34332 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c tests/ref/ea-cmv tests/ref/ea-cmv/TITLE.CMV.md5
by reimar 08 Nov '11

08 Nov '11

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

1 0