Changeset 832
- Timestamp:
- 03/14/08 14:42:51 (7 months ago)
- Files:
-
- trunk/FFusionCodec.c (modified) (3 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
r820 r832 669 669 codecID = CODEC_ID_NUV; 670 670 break; 671 case 'tscc': 672 codecID = CODEC_ID_TSCC; 673 break; 671 674 672 675 … … 691 694 glob->avContext->width = (**p->imageDescription).width; 692 695 glob->avContext->height = (**p->imageDescription).height; 696 glob->avContext->bits_per_sample = (**p->imageDescription).depth; 693 697 694 698 // We also pass the FourCC since it allows the H263 hybrid decoder … … 1566 1570 break; 1567 1571 1572 case 'tscc': 1573 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kTSCCCodecInfoResID, (Handle *)&tempCodecInfo); 1574 break; 1575 1568 1576 1569 1577 default: // should never happen but we have to handle the case trunk/FFusionCodec.h
r806 r832 51 51 #define kSnowCodecInfoResID 274 52 52 #define kNuvCodecInfoResID 275 53 #define kTSCCCodecInfoResID 305 53 54 54 55 #define kFFusionCodecManufacturer 'Peri' trunk/FFusionCodec.r
r727 r832 64 64 #define kSnowName "Snow" 65 65 #define kNuvName "NuppelVideo" 66 #define kTSCCName "Techsmith Screen Capture" 66 67 67 68 // Codec names Resource ID … … 110 111 #define kSnowInfoResID 303 111 112 #define kNuvInfoResID 304 113 #define kTSCCNameResID 305 114 #define kTSCCInfoResID 306 112 115 113 116 // These flags specify information about the capabilities of the component … … 603 606 resource 'cdci' (kNuvCodecInfoResID) { 604 607 kNuvName, // Type 608 1, // Version 609 1, // Revision level 610 kFFusionCodecManufacturer, // Manufacturer 611 kFFusionDecompressionFlags, // Decompression Flags 612 0, // Compression Flags 613 kFFusionFormatFlags, // Format Flags 614 128, // Compression Accuracy 615 128, // Decomression Accuracy 616 200, // Compression Speed 617 200, // Decompression Speed 618 128, // Compression Level 619 0, // Reserved 620 1, // Minimum Height 621 1, // Minimum Width 622 0, // Decompression Pipeline Latency 623 0, // Compression Pipeline Latency 624 0 // Private Data 625 }; 626 627 628 //--------------------------------------------------------------------------- 629 // TSCC Description Resources 630 //--------------------------------------------------------------------------- 631 632 resource 'cdci' (kTSCCCodecInfoResID) { 633 kTSCCName, // Type 605 634 1, // Version 606 635 1, // Revision level … … 3097 3126 }; 3098 3127 3128 //--------------------------------------------------------------------------- 3129 // TSCC Components 3130 //--------------------------------------------------------------------------- 3131 resource 'thng' (336) { 3132 decompressorComponentType, // Type 3133 'tscc', // SubType 3134 kFFusionCodecManufacturer, // Manufacturer 3135 0, // - use componentHasMultiplePlatforms 3136 0, 3137 0, 3138 0, 3139 'STR ', // Name Type 3140 kTSCCNameResID, // Name ID 3141 'STR ', // Info Type 3142 kTSCCInfoResID, // Info ID 3143 0, // Icon Type 3144 0, // Icon ID 3145 kFFusionCodecVersion, // Version 3146 componentHasMultiplePlatforms + // Registration Flags 3147 componentDoAutoVersion, // Registration Flags 3148 0, // Resource ID of Icon Family 3149 { 3150 kFFusionDecompressionFlags, 3151 'dlle', // Entry point found by symbol name 'dlle' resource 3152 256, // ID of 'dlle' resource 3153 platformPowerPCNativeEntryPoint, 3154 kFFusionDecompressionFlags, 3155 'dlle', 3156 256, 3157 platformIA32NativeEntryPoint, 3158 }; 3159 }; 3160 3099 3161 3100 3162 //--------------------------------------------------------------------------- … … 3182 3244 }; 3183 3245 3246 resource 'STR ' (kTSCCNameResID) { 3247 "Techsmith Screen Capture (Perian)" 3248 }; 3249 3184 3250 //--------------------------------------------------------------------------- 3185 3251 // Component Name Resources … … 3266 3332 }; 3267 3333 3334 resource 'STR ' (kTSCCInfoResID) { 3335 "Decompresses video stored in Techsmith Screen Capture format." 3336 }; 3337 3268 3338 //--------------------------------------------------------------------------- 3269 3339 // Code Entry Point for Mach-O trunk/ff_MovieImport.c
r819 r832 120 120 121 121 REGISTER_DECODER(dvdsub); 122 REGISTER_DECODER(tscc); 122 123 123 124 av_log_set_callback(FFMpegCodecprintf);
