Changeset 230
- Timestamp:
- 01/04/07 13:59:09 (2 years ago)
- Files:
-
- trunk/FFusionCodec.c (modified) (2 diffs)
- trunk/FFusionCodec.h (modified) (1 diff)
- trunk/FFusionCodec.r (modified) (6 diffs)
- trunk/ff_MovieImport.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/FFusionCodec.c
r221 r230 507 507 glob->avCodec = avcodec_find_decoder(CODEC_ID_VP3); 508 508 break; 509 509 510 case 'HFYU': 511 glob->avCodec = avcodec_find_decoder(CODEC_ID_HUFFYUV); 512 break; 513 514 case 'FFVH': 515 glob->avCodec = avcodec_find_decoder(CODEC_ID_FFVHUFF); 516 break; 517 510 518 default: 511 519 Codecprintf(glob->fileLog, "Warning! Unknown codec type! Using MPEG4 by default.\n"); … … 1127 1135 break; 1128 1136 1137 case 'FFVH': 1138 case 'HFYU': 1139 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kHuffYUVCodecInfoResID, (Handle *)&tempCodecInfo); 1140 break; 1141 1129 1142 default: // should never happen but we have to handle the case 1130 1143 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kDivX4CodecInfoResID, (Handle *)&tempCodecInfo); trunk/FFusionCodec.h
r221 r230 45 45 #define kI263CodecInfoResID 268 46 46 #define kVP3CodecInfoResID 269 47 #define kHuffYUVCodecInfoResID 270 47 48 48 49 #define kFFusionCodecManufacturer 'SNE2' trunk/FFusionCodec.r
r221 r230 58 58 #define kI263Name "Intel H.263" 59 59 #define kVP3Name "On2 VP3" 60 #define kHuffYUVName "HuffYUV" 60 61 61 62 // Codec names Resource ID … … 75 76 #define kI263NameResID 268 76 77 #define kVP3NameResID 269 78 #define kHuffYUVNameResID 270 77 79 78 80 // Codec infos Resource ID … … 92 94 #define kI263InfoResID 297 93 95 #define kVP3InfoResID 298 96 #define kHuffYUVInfoResID 299 94 97 95 98 // These flags specify information about the capabilities of the component … … 2516 2519 }; 2517 2520 2521 2522 //--------------------------------------------------------------------------- 2523 // VP3 Components 2524 //--------------------------------------------------------------------------- 2525 resource 'thng' (323) { 2526 decompressorComponentType, // Type 2527 'HFYU', // SubType 2528 kFFusionCodecManufacturer, // Manufacturer 2529 0, // - use componentHasMultiplePlatforms 2530 0, 2531 0, 2532 0, 2533 'STR ', // Name Type 2534 kHuffYUVNameResID, // Name ID 2535 'STR ', // Info Type 2536 kHuffYUVInfoResID, // Info ID 2537 0, // Icon Type 2538 0, // Icon ID 2539 kFFusionCodecVersion, // Version 2540 componentHasMultiplePlatforms + // Registration Flags 2541 componentDoAutoVersion, // Registration Flags 2542 0, // Resource ID of Icon Family 2543 { 2544 kFFusionDecompressionFlags, 2545 'dlle', // Entry point found by symbol name 'dlle' resource 2546 256, // ID of 'dlle' resource 2547 platformPowerPCNativeEntryPoint, 2548 kFFusionDecompressionFlags, 2549 'dlle', 2550 256, 2551 platformIA32NativeEntryPoint, 2552 }; 2553 }; 2554 2555 resource 'thng' (324) { 2556 decompressorComponentType, // Type 2557 'FFVH', // SubType 2558 kFFusionCodecManufacturer, // Manufacturer 2559 0, // - use componentHasMultiplePlatforms 2560 0, 2561 0, 2562 0, 2563 'STR ', // Name Type 2564 kHuffYUVNameResID, // Name ID 2565 'STR ', // Info Type 2566 kHuffYUVInfoResID, // Info ID 2567 0, // Icon Type 2568 0, // Icon ID 2569 kFFusionCodecVersion, // Version 2570 componentHasMultiplePlatforms + // Registration Flags 2571 componentDoAutoVersion, // Registration Flags 2572 0, // Resource ID of Icon Family 2573 { 2574 kFFusionDecompressionFlags, 2575 'dlle', // Entry point found by symbol name 'dlle' resource 2576 256, // ID of 'dlle' resource 2577 platformPowerPCNativeEntryPoint, 2578 kFFusionDecompressionFlags, 2579 'dlle', 2580 256, 2581 platformIA32NativeEntryPoint, 2582 }; 2583 }; 2584 2518 2585 //--------------------------------------------------------------------------- 2519 2586 // Component Name Resources … … 2576 2643 }; 2577 2644 2645 resource 'STR ' (kHuffYUVNameResID) { 2646 "HuffYUV Decoder" 2647 }; 2648 2578 2649 //--------------------------------------------------------------------------- 2579 2650 // Component Name Resources … … 2636 2707 }; 2637 2708 2709 resource 'STR ' (kHuffYUVInfoResID) { 2710 "Decompresses video stored in HuffYUV format." 2711 }; 2712 2638 2713 //--------------------------------------------------------------------------- 2639 2714 // Code Entry Point for Mach-O trunk/ff_MovieImport.c
r221 r230 77 77 register_avcodec(&vp6f_decoder); 78 78 register_avcodec(&h263i_decoder); 79 register_avcodec(&huffyuv_decoder); 80 register_avcodec(&ffvhuff_decoder); 79 81 80 82 register_avcodec(&wmav1_decoder);
