Ticket #24: wmv3.diff
| File wmv3.diff, 8.2 kB (added by astrange, 6 months ago) |
|---|
-
ff_private.c
old new 338 338 return 'FSV1'; 339 339 case CODEC_ID_VP6A: 340 340 return 'VP6A'; 341 case CODEC_ID_WMV3: 342 return 'WMV3'; 341 343 } 342 344 return 0; 343 345 } -
PerianAviImporter.r
old new 376 376 "NuppelVideo" 377 377 }; 378 378 379 /* Component Manager Things - 380 WMV */ 381 resource 'thng' (kWMVthngResID) { 382 'eat ', // Type 383 'WMV ', // SubType 384 'Peri', // Manufacturer 385 0, 386 0, 387 0, 388 0, 389 'STR ', // Name Type 390 kWMVthngResID, // Name ID 391 0, // Info Type 392 0, // Info ID 393 0, // Icon Type 394 0, // Icon ID 395 kFFAviComponentVersion, // Version 396 componentHasMultiplePlatforms + 397 componentDoAutoVersion, // Registratin Flags 398 0, // Resource ID of Icon Family 399 { 400 kFFAvi_MovieImportFlags | movieImportSubTypeIsFileExtension, 401 'dlle', // Code Resource type 402 512, 403 platformIA32NativeEntryPoint, // IA32 404 kFFAvi_MovieImportFlags | movieImportSubTypeIsFileExtension, 405 'dlle', 406 512, 407 platformPowerPCNativeEntryPoint, // PowerPC 408 }, 409 'thnr', kWMVthngResID 410 }; 379 411 412 resource 'thnr' (kWMVthngResID) { 413 { 414 'mime', 1, 0, 415 'mime', kWMVthngResID, 0, 416 } 417 }; 380 418 419 resource 'mime' (kWMVthngResID) { 420 { 421 kMimeInfoMimeTypeTag, 1, "video/x-ms-wmv"; 422 kMimeInfoFileExtensionTag, 1, "wmv"; 423 kMimeInfoDescriptionTag, 1, "Windows Media Video"; 424 }; 425 }; 381 426 427 resource 'STR ' (kWMVthngResID) { 428 "WMV Importer" 429 }; 430 431 382 432 resource 'dlle' (512) { 383 433 "FFAvi_MovieImportComponentDispatch" 384 434 }; -
ff_MovieImport.c
old new 88 88 REGISTER_DEMUXER(flv); 89 89 REGISTER_DEMUXER(tta); 90 90 REGISTER_DEMUXER(nuv); 91 REGISTER_DEMUXER(asf); 91 92 register_parsers(); 92 93 93 94 avcodec_init(); … … 123 124 REGISTER_DECODER(vp6a); 124 125 REGISTER_DECODER(zmbv); 125 126 127 REGISTER_DECODER(wmv3); 128 126 129 av_log_set_callback(FFMpegCodecprintf); 127 130 } 128 131 } … … 212 215 case 'NUV ': 213 216 err = GetComponentResource((Component)storage->ci, 'mime', kNuvthngResID, (Handle*)mimeInfo); 214 217 break; 218 case 'WMV ': 219 err = GetComponentResource((Component)storage->ci, 'mime', kWMVthngResID, (Handle*)mimeInfo); 220 break; 215 221 default: 216 222 err = GetComponentResource((Component)storage->ci, 'mime', kAVIthngResID, (Handle*)mimeInfo); 217 223 break; -
ff_MovieImportVersion.h
old new 31 31 #define kFLVthngResID 515 32 32 #define kTTAthngResID 517 33 33 #define kNuvthngResID 518 34 #define kWMVthngResID 519 34 35 35 36 #endif -
FFusionCodec.c
old new 687 687 case 'VP6A': 688 688 codecID = CODEC_ID_VP6A; 689 689 break; 690 690 691 case 'WMV3': 692 codecID = CODEC_ID_WMV3; 693 break; 694 691 695 default: 692 696 Codecprintf(glob->fileLog, "Warning! Unknown codec type! Using MPEG4 by default.\n"); 693 697 } … … 1617 1621 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kVP6ACodecInfoResID, (Handle *)&tempCodecInfo); 1618 1622 break; 1619 1623 1624 case 'WMV3': 1625 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kWMV3CodecInfoResID, (Handle *)&tempCodecInfo); 1626 break; 1627 1620 1628 default: // should never happen but we have to handle the case 1621 1629 err = GetComponentResource((Component)glob->self, codecInfoResourceType, kDivX4CodecInfoResID, (Handle *)&tempCodecInfo); 1622 1630 1623 1631 } 1624 1632 1633 FFusionDebugPrint("Resource requested for '%s', found %p (error %d)\n", FourCCString(glob->componentType), tempCodecInfo, err); 1634 1625 1635 if (err == noErr) 1626 1636 { 1627 1637 *info = **tempCodecInfo; 1628 1638 1629 1639 DisposeHandle((Handle)tempCodecInfo); 1630 1640 } 1631 1641 } -
FFusionCodec.h
old new 53 53 #define kTSCCCodecInfoResID 305 54 54 #define kZMBVCodecInfoResID 307 55 55 #define kVP6ACodecInfoResID 309 56 #define kWMV3CodecInfoResID 311 56 57 57 58 #define kFFusionCodecManufacturer 'Peri' 58 59 -
FFusionCodec.r
old new 66 66 #define kNuvName "NuppelVideo" 67 67 #define kTSCCName "Techsmith Screen Capture" 68 68 #define kZMBVName "DosBox Capture" 69 #define kWMV3Name "Windows Media Video 9" 69 70 70 71 // Codec names Resource ID 71 72 … … 92 93 #define kTSCCNameResID 305 93 94 #define kZMBVNameResID 307 94 95 #define kVP6ANameResID 309 96 #define kWMV3NameResID 311 95 97 96 98 // Codec infos Resource ID 97 99 … … 118 120 #define kTSCCInfoResID 306 119 121 #define kZMBVInfoResID 308 120 122 #define kVP6AInfoResID 310 123 #define kWMV3InfoResID 312 121 124 122 125 // These flags specify information about the capabilities of the component 123 126 // Works with 1-bit, 8-bit, 16-bit and 32-bit Pixel Maps … … 706 709 0 // Private Data 707 710 }; 708 711 712 resource 'cdci' (kWMV3CodecInfoResID) { 713 kWMV3Name, // Type 714 1, // Version 715 1, // Revision level 716 kFFusionCodecManufacturer, // Manufacturer 717 kFFusionDecompressionFlags, // Decompression Flags 718 0, // Compression Flags 719 kFFusionFormatFlags, // Format Flags 720 128, // Compression Accuracy 721 128, // Decomression Accuracy 722 200, // Compression Speed 723 200, // Decompression Speed 724 128, // Compression Level 725 0, // Reserved 726 1, // Minimum Height 727 1, // Minimum Width 728 0, // Decompression Pipeline Latency 729 0, // Compression Pipeline Latency 730 0 // Private Data 731 }; 732 709 733 //--------------------------------------------------------------------------- 710 734 // MS-MPEG4 v1 Component 711 735 //--------------------------------------------------------------------------- … … 3280 3304 }; 3281 3305 }; 3282 3306 3307 resource 'thng' (339) { 3308 decompressorComponentType, // Type 3309 'WMV3', // SubType 3310 kFFusionCodecManufacturer, // Manufacturer 3311 0, // - use componentHasMultiplePlatforms 3312 0, 3313 0, 3314 0, 3315 'STR ', // Name Type 3316 kWMV3NameResID, // Name ID 3317 'STR ', // Info Type 3318 kWMV3InfoResID, // Info ID 3319 0, // Icon Type 3320 0, // Icon ID 3321 kFFusionCodecVersion, // Version 3322 componentHasMultiplePlatforms + // Registration Flags 3323 componentDoAutoVersion, // Registration Flags 3324 0, // Resource ID of Icon Family 3325 { 3326 kFFusionDecompressionFlags, 3327 'dlle', // Entry point found by symbol name 'dlle' resource 3328 256, // ID of 'dlle' resource 3329 platformPowerPCNativeEntryPoint, 3330 kFFusionDecompressionFlags, 3331 'dlle', 3332 256, 3333 platformIA32NativeEntryPoint, 3334 }; 3335 }; 3336 3283 3337 //--------------------------------------------------------------------------- 3284 3338 // Component Name Resources 3285 3339 //--------------------------------------------------------------------------- … … 3376 3430 "On2 VP6A (Perian)" 3377 3431 }; 3378 3432 3433 resource 'STR ' (kWMV3NameResID) { 3434 "Windows Media Video 9 (Perian)" 3435 }; 3436 3379 3437 //--------------------------------------------------------------------------- 3380 3438 // Component Name Resources 3381 3439 //--------------------------------------------------------------------------- … … 3472 3530 "Decompresses video stored in On2 VP6A format." 3473 3531 }; 3474 3532 3533 resource 'STR ' (kWMV3InfoResID) { 3534 "Decompresses video stored in Windows Media Video 9 format." 3535 }; 3536 3475 3537 //--------------------------------------------------------------------------- 3476 3538 // Code Entry Point for Mach-O 3477 3539 //---------------------------------------------------------------------------
