Changeset 681
- Timestamp:
- 08/23/07 15:41:06 (1 year ago)
- Files:
-
- trunk/CodecIDs.h (modified) (1 diff)
- trunk/FFusionCodec.c (modified) (2 diffs)
- trunk/FFusionCodec.h (modified) (1 diff)
- trunk/FFusionCodec.r (modified) (7 diffs)
- trunk/MatroskaCodecIDs.cpp (modified) (1 diff)
- trunk/ff_MovieImport.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/CodecIDs.h
r643 r681 81 81 kVideoFormatReal8 = 'RV30', 82 82 kVideoFormatReal9 = 'RV40', 83 kVideoFormatSnow = 'SNOW', 83 84 84 85 kAudioFormatFlashADPCM = 'FlAd', trunk/FFusionCodec.c
r666 r681 590 590 case 'FPS1': 591 591 codecID = CODEC_ID_FRAPS; 592 break; 593 594 case 'SNOW': 595 codecID = CODEC_ID_SNOW; 592 596 break; 593 597 … … 1444 1448 break; 1445 1449 1450 case 'SNOW': 1451 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kSnowCodecInfoResID, (Handle *)&tempCodecInfo); 1452 break; 1453 1446 1454 default: // should never happen but we have to handle the case 1447 1455 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kDivX4CodecInfoResID, (Handle *)&tempCodecInfo); trunk/FFusionCodec.h
r436 r681 49 49 #define kMPEG2CodecInfoResID 272 50 50 #define kFRAPSCodecInfoResID 273 51 #define kSnowCodecInfoResID 274 51 52 52 53 #define kFFusionCodecManufacturer 'Peri' trunk/FFusionCodec.r
r630 r681 62 62 #define kMPEG2Name "MPEG-2 Video" 63 63 #define kFRAPSName "Fraps" 64 #define kSnowName "Snow" 64 65 65 66 // Codec names Resource ID … … 83 84 #define kMPEG2NameResID 272 84 85 #define kFRAPSNameResID 273 86 #define kSnowNameResID 274 85 87 86 88 // Codec infos Resource ID … … 104 106 #define kMPEG2InfoResID 301 105 107 #define kFRAPSInfoResID 302 108 #define kSnowInfoResID 303 106 109 107 110 // These flags specify information about the capabilities of the component … … 547 550 resource 'cdci' (kFRAPSCodecInfoResID) { 548 551 kFRAPSName, // Type 552 1, // Version 553 1, // Revision level 554 kFFusionCodecManufacturer, // Manufacturer 555 kFFusionDecompressionFlags, // Decompression Flags 556 0, // Compression Flags 557 kFFusionFormatFlags, // Format Flags 558 128, // Compression Accuracy 559 128, // Decomression Accuracy 560 200, // Compression Speed 561 200, // Decompression Speed 562 128, // Compression Level 563 0, // Reserved 564 1, // Minimum Height 565 1, // Minimum Width 566 0, // Decompression Pipeline Latency 567 0, // Compression Pipeline Latency 568 0 // Private Data 569 }; 570 571 //--------------------------------------------------------------------------- 572 // Snow Description Resources 573 //--------------------------------------------------------------------------- 574 575 resource 'cdci' (kSnowCodecInfoResID) { 576 kSnowName, // Type 549 577 1, // Version 550 578 1, // Revision level … … 2942 2970 2943 2971 //--------------------------------------------------------------------------- 2972 // Snow Components 2973 //--------------------------------------------------------------------------- 2974 resource 'thng' (333) { 2975 decompressorComponentType, // Type 2976 'SNOW', // SubType 2977 kFFusionCodecManufacturer, // Manufacturer 2978 0, // - use componentHasMultiplePlatforms 2979 0, 2980 0, 2981 0, 2982 'STR ', // Name Type 2983 kSnowNameResID, // Name ID 2984 'STR ', // Info Type 2985 kSnowInfoResID, // Info ID 2986 0, // Icon Type 2987 0, // Icon ID 2988 kFFusionCodecVersion, // Version 2989 componentHasMultiplePlatforms + // Registration Flags 2990 componentDoAutoVersion, // Registration Flags 2991 0, // Resource ID of Icon Family 2992 { 2993 kFFusionDecompressionFlags, 2994 'dlle', // Entry point found by symbol name 'dlle' resource 2995 256, // ID of 'dlle' resource 2996 platformPowerPCNativeEntryPoint, 2997 kFFusionDecompressionFlags, 2998 'dlle', 2999 256, 3000 platformIA32NativeEntryPoint, 3001 }; 3002 }; 3003 3004 //--------------------------------------------------------------------------- 2944 3005 // Component Name Resources 2945 3006 //--------------------------------------------------------------------------- … … 3017 3078 }; 3018 3079 3080 resource 'STR ' (kSnowNameResID) { 3081 "Snow (Perian)" 3082 }; 3083 3019 3084 //--------------------------------------------------------------------------- 3020 3085 // Component Name Resources … … 3093 3158 }; 3094 3159 3160 resource 'STR ' (kSnowInfoResID) { 3161 "Decompresses video stored in Snow format." 3162 }; 3163 3095 3164 //--------------------------------------------------------------------------- 3096 3165 // Code Entry Point for Mach-O trunk/MatroskaCodecIDs.cpp
r643 r681 748 748 { kVideoFormatReal9, "V_REAL/RV40" }, 749 749 { kVideoFormatXiphTheora, "V_THEORA" }, 750 { kVideoFormatSnow, "V_SNOW" }, 750 751 751 752 { kAudioFormatMPEG4AAC, "A_AAC" }, trunk/ff_MovieImport.c
r645 r681 84 84 register_avcodec(&mpeg2video_decoder); 85 85 register_avcodec(&fraps_decoder); 86 register_avcodec(&snow_decoder); 86 87 87 88 register_avcodec(&wmav1_decoder);
