Changeset 154
- Timestamp:
- 10/07/06 22:14:32 (2 years ago)
- Files:
-
- trunk/FFusionCodec.c (modified) (2 diffs)
- trunk/FFusionCodec.h (modified) (1 diff)
- trunk/FFusionCodec.r (modified) (8 diffs)
- trunk/ff_MovieImport.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/FFusionCodec.c
r151 r154 494 494 case 'I263': 495 495 glob->avCodec = avcodec_find_decoder(CODEC_ID_H263I); 496 break; 497 case 'VP30': 498 case 'VP31': 499 glob->avCodec = avcodec_find_decoder(CODEC_ID_VP3); 496 500 break; 497 501 default: … … 1202 1206 break; 1203 1207 1208 case 'VP30': 1209 case 'VP31': 1210 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kVP3CodecInfoResID, (Handle *)&tempCodecInfo); 1211 break; 1212 1204 1213 default: // should never happen but we have to handle the case 1205 1214 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kDivX4CodecInfoResID, (Handle *)&tempCodecInfo); trunk/FFusionCodec.h
r151 r154 44 44 #define kVP6CodecInfoResID 267 45 45 #define kI263CodecInfoResID 268 46 #define kVP3CodecInfoResID 269 46 47 47 48 #define kFFusionCodecManufacturer 'SNE2' trunk/FFusionCodec.r
r151 r154 57 57 #define kVP6Name "TrueMotion VP6" 58 58 #define kI263Name "Intel H.263" 59 #define kVP3Name "On2 VP3" 59 60 60 61 // Codec names Resource ID … … 73 74 #define kVP6NameResID 267 74 75 #define kI263NameResID 268 76 #define kVP3NameResID 269 75 77 76 78 // Codec infos Resource ID … … 89 91 #define kVP6InfoResID 296 90 92 #define kI263InfoResID 297 93 #define kVP3InfoResID 298 91 94 92 95 // These flags specify information about the capabilities of the component … … 402 405 403 406 //--------------------------------------------------------------------------- 404 // I.263 Description Resources405 //--------------------------------------------------------------------------- 406 407 resource 'cdci' (k I263CodecInfoResID) {408 k I263Name, // Type407 // VP3 Description Resources 408 //--------------------------------------------------------------------------- 409 410 resource 'cdci' (kVP3CodecInfoResID) { 411 kVP3Name, // Type 409 412 1, // Version 410 413 1, // Revision level … … 427 430 428 431 //--------------------------------------------------------------------------- 432 // I.263 Description Resources 433 //--------------------------------------------------------------------------- 434 435 resource 'cdci' (kI263CodecInfoResID) { 436 kI263Name, // Type 437 1, // Version 438 1, // Revision level 439 kFFusionCodecManufacturer, // Manufacturer 440 kFFusionDecompressionFlags, // Decompression Flags 441 0, // Compression Flags 442 kFFusionFormatFlags, // Format Flags 443 128, // Compression Accuracy 444 128, // Decomression Accuracy 445 200, // Compression Speed 446 200, // Decompression Speed 447 128, // Compression Level 448 0, // Reserved 449 1, // Minimum Height 450 1, // Minimum Width 451 0, // Decompression Pipeline Latency 452 0, // Compression Pipeline Latency 453 0 // Private Data 454 }; 455 456 //--------------------------------------------------------------------------- 429 457 // MS-MPEG4 v1 Component 430 458 //--------------------------------------------------------------------------- … … 2229 2257 }; 2230 2258 2259 resource 'thng' (315) { 2260 decompressorComponentType, // Type 2261 'VP30', // SubType 2262 kFFusionCodecManufacturer, // Manufacturer 2263 0, // - use componentHasMultiplePlatforms 2264 0, 2265 0, 2266 0, 2267 'STR ', // Name Type 2268 kVP3NameResID, // Name ID 2269 'STR ', // Info Type 2270 kVP3InfoResID, // Info ID 2271 0, // Icon Type 2272 0, // Icon ID 2273 kFFusionCodecVersion, // Version 2274 componentHasMultiplePlatforms + // Registration Flags 2275 componentDoAutoVersion, // Registration Flags 2276 0, // Resource ID of Icon Family 2277 { 2278 kFFusionDecompressionFlags, 2279 'dlle', // Entry point found by symbol name 'dlle' resource 2280 256, // ID of 'dlle' resource 2281 platformPowerPCNativeEntryPoint, 2282 kFFusionDecompressionFlags, 2283 'dlle', 2284 256, 2285 platformIA32NativeEntryPoint, 2286 }; 2287 }; 2288 2289 resource 'thng' (316) { 2290 decompressorComponentType, // Type 2291 'VP31', // SubType 2292 kFFusionCodecManufacturer, // Manufacturer 2293 0, // - use componentHasMultiplePlatforms 2294 0, 2295 0, 2296 0, 2297 'STR ', // Name Type 2298 kVP3NameResID, // Name ID 2299 'STR ', // Info Type 2300 kVP3InfoResID, // Info ID 2301 0, // Icon Type 2302 0, // Icon ID 2303 kFFusionCodecVersion, // Version 2304 componentHasMultiplePlatforms + // Registration Flags 2305 componentDoAutoVersion, // Registration Flags 2306 0, // Resource ID of Icon Family 2307 { 2308 kFFusionDecompressionFlags, 2309 'dlle', // Entry point found by symbol name 'dlle' resource 2310 256, // ID of 'dlle' resource 2311 platformPowerPCNativeEntryPoint, 2312 kFFusionDecompressionFlags, 2313 'dlle', 2314 256, 2315 platformIA32NativeEntryPoint, 2316 }; 2317 }; 2318 2231 2319 //--------------------------------------------------------------------------- 2232 2320 // Component Name Resources … … 2285 2373 }; 2286 2374 2375 resource 'STR ' (kVP3NameResID) { 2376 "On2 VP3 Decoder" 2377 }; 2378 2287 2379 //--------------------------------------------------------------------------- 2288 2380 // Component Name Resources … … 2341 2433 }; 2342 2434 2435 resource 'STR ' (kVP3InfoResID) { 2436 "Decompresses video stored in On2 VP3 format." 2437 }; 2438 2343 2439 //--------------------------------------------------------------------------- 2344 2440 // Code Entry Point for Mach-O trunk/ff_MovieImport.c
r152 r154 88 88 register_avcodec(&flv_decoder); 89 89 register_avcodec(&flashsv_decoder); 90 register_avcodec(&vp3_decoder); 90 91 register_avcodec(&vp6_decoder); 91 92 register_avcodec(&vp6f_decoder);
