Changeset 219

Show
Ignore:
Timestamp:
12/30/06 18:48:36 (2 years ago)
Author:
dconrad
Message:

WMA v1 and v2 decoder. Tested with samples in AVI. Refs #38

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Perian.xcodeproj/project.pbxproj

    r202 r219  
    5252                11C85FE60A64314500DF3D73 /* FFusionCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = F560DF0203D622D001ABA332 /* FFusionCodec.r */; }; 
    5353                11C85FE70A64315500DF3D73 /* Perian-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 11A709DA0A3CFCB6002058D4 /* Perian-Info.plist */; }; 
     54                6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */; }; 
     55                6116E5520B43C27B0020F1CE /* ACCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5390B43C27B0020F1CE /* ACCodec.cpp */; }; 
     56                6116E5530B43C27B0020F1CE /* ACSimpleCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E53E0B43C27B0020F1CE /* ACSimpleCodec.cpp */; }; 
     57                6116E5570B43C27B0020F1CE /* CAStreamBasicDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5490B43C27B0020F1CE /* CAStreamBasicDescription.cpp */; }; 
     58                6116E5580B43C27B0020F1CE /* FFissionCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E54C0B43C27B0020F1CE /* FFissionCodec.cpp */; }; 
     59                6116E5590B43C27B0020F1CE /* FFissionCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = 6116E54E0B43C27B0020F1CE /* FFissionCodec.r */; }; 
     60                6116E55A0B43C27B0020F1CE /* FFissionDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E54F0B43C27B0020F1CE /* FFissionDecoder.cpp */; }; 
     61                6116E61C0B44A5A70020F1CE /* GetCodecBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5400B43C27B0020F1CE /* GetCodecBundle.cpp */; }; 
     62                6116E6200B44A5B30020F1CE /* CADebugMacros.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5460B43C27B0020F1CE /* CADebugMacros.cpp */; }; 
     63                6116E6220B44A5BC0020F1CE /* CABundleLocker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6116E5430B43C27B0020F1CE /* CABundleLocker.cpp */; }; 
    5464                6123D6260AD0A3FF003EDE52 /* VobSubCodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */; }; 
    5565                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */ = {isa = PBXBuildFile; fileRef = 6123D6240AD0A3FE003EDE52 /* VobSubCodec.r */; }; 
    …… 
    235245                11D4EFA20A3CE8C10066D45F /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = build/Universal/libavutil.a; sourceTree = "<group>"; }; 
    236246                11D4EFA30A3CE8C10066D45F /* libpostproc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpostproc.a; path = build/Universal/libpostproc.a; sourceTree = "<group>"; }; 
     247                6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ACBaseCodec.cpp; sourceTree = "<group>"; }; 
     248                6116E5380B43C27B0020F1CE /* ACBaseCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACBaseCodec.h; sourceTree = "<group>"; }; 
     249                6116E5390B43C27B0020F1CE /* ACCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ACCodec.cpp; sourceTree = "<group>"; }; 
     250                6116E53A0B43C27B0020F1CE /* ACCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACCodec.h; sourceTree = "<group>"; }; 
     251                6116E53B0B43C27B0020F1CE /* ACCodecDispatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACCodecDispatch.h; sourceTree = "<group>"; }; 
     252                6116E53C0B43C27B0020F1CE /* ACCodecDispatchTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACCodecDispatchTypes.h; sourceTree = "<group>"; }; 
     253                6116E53D0B43C27B0020F1CE /* ACConditionalMacros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACConditionalMacros.h; sourceTree = "<group>"; }; 
     254                6116E53E0B43C27B0020F1CE /* ACSimpleCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ACSimpleCodec.cpp; sourceTree = "<group>"; }; 
     255                6116E53F0B43C27B0020F1CE /* ACSimpleCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ACSimpleCodec.h; sourceTree = "<group>"; }; 
     256                6116E5400B43C27B0020F1CE /* GetCodecBundle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GetCodecBundle.cpp; sourceTree = "<group>"; }; 
     257                6116E5410B43C27B0020F1CE /* GetCodecBundle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GetCodecBundle.h; sourceTree = "<group>"; }; 
     258                6116E5430B43C27B0020F1CE /* CABundleLocker.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CABundleLocker.cpp; sourceTree = "<group>"; }; 
     259                6116E5440B43C27B0020F1CE /* CABundleLocker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CABundleLocker.h; sourceTree = "<group>"; }; 
     260                6116E5450B43C27B0020F1CE /* CAConditionalMacros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAConditionalMacros.h; sourceTree = "<group>"; }; 
     261                6116E5460B43C27B0020F1CE /* CADebugMacros.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CADebugMacros.cpp; sourceTree = "<group>"; }; 
     262                6116E5470B43C27B0020F1CE /* CADebugMacros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CADebugMacros.h; sourceTree = "<group>"; }; 
     263                6116E5480B43C27B0020F1CE /* CADebugPrintf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CADebugPrintf.h; sourceTree = "<group>"; }; 
     264                6116E5490B43C27B0020F1CE /* CAStreamBasicDescription.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CAStreamBasicDescription.cpp; sourceTree = "<group>"; }; 
     265                6116E54A0B43C27B0020F1CE /* CAStreamBasicDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CAStreamBasicDescription.h; sourceTree = "<group>"; }; 
     266                6116E54C0B43C27B0020F1CE /* FFissionCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FFissionCodec.cpp; sourceTree = "<group>"; }; 
     267                6116E54D0B43C27B0020F1CE /* FFissionCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FFissionCodec.h; sourceTree = "<group>"; }; 
     268                6116E54E0B43C27B0020F1CE /* FFissionCodec.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = FFissionCodec.r; path = FFissionCodec/FFissionCodec.r; sourceTree = "<group>"; }; 
     269                6116E54F0B43C27B0020F1CE /* FFissionDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FFissionDecoder.cpp; sourceTree = "<group>"; }; 
     270                6116E5500B43C27B0020F1CE /* FFissionDecoder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FFissionDecoder.h; sourceTree = "<group>"; }; 
     271                6116E55D0B43C29F0020F1CE /* XCAResources.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = XCAResources.r; sourceTree = "<group>"; }; 
     272                6116E74E0B4738CE0020F1CE /* CodecIDs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodecIDs.h; sourceTree = "<group>"; }; 
    237273                6123D6220AD0A3FE003EDE52 /* VobSubCodec.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = VobSubCodec.c; sourceTree = "<group>"; }; 
    238274                6123D6230AD0A3FE003EDE52 /* VobSubCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VobSubCodec.h; sourceTree = "<group>"; }; 
    …… 
    454490                                02B4991D040D596C0049362E /* main.nib */, 
    455491                                F560DF0203D622D001ABA332 /* FFusionCodec.r */, 
     492                                6116E54E0B43C27B0020F1CE /* FFissionCodec.r */, 
     493                                6116E55D0B43C29F0020F1CE /* XCAResources.r */, 
    456494                                F50D440903EAD8E701B1D299 /* Images */, 
    457495                        ); 
    …… 
    465503                                61D691460AC8E333000EFC7D /* Matroska */, 
    466504                                6123D61D0AD0A052003EDE52 /* Subtitles */, 
     505                                6116E5360B43C27B0020F1CE /* ACPublic */, 
     506                                6116E5420B43C27B0020F1CE /* CAPublicUtility */, 
    467507                                F560DECD03D61B6101ABA332 /* Components.k.h */, 
    468508                                113F58980A6B091600509987 /* Codecprintf.h */, 
    …… 
    470510                                61D517710AE0402E00A671E1 /* CommonUtils.h */, 
    471511                                61D517720AE0402E00A671E1 /* CommonUtils.c */, 
     512                                6116E74E0B4738CE0020F1CE /* CodecIDs.h */, 
    472513                        ); 
    473514                        name = Source; 
    …… 
    482523                        ); 
    483524                        name = Products; 
     525                        sourceTree = "<group>"; 
     526                }; 
     527                6116E5360B43C27B0020F1CE /* ACPublic */ = { 
     528                        isa = PBXGroup; 
     529                        children = ( 
     530                                6116E5370B43C27B0020F1CE /* ACBaseCodec.cpp */, 
     531                                6116E5380B43C27B0020F1CE /* ACBaseCodec.h */, 
     532                                6116E5390B43C27B0020F1CE /* ACCodec.cpp */, 
     533                                6116E53A0B43C27B0020F1CE /* ACCodec.h */, 
     534                                6116E53B0B43C27B0020F1CE /* ACCodecDispatch.h */, 
     535                                6116E53C0B43C27B0020F1CE /* ACCodecDispatchTypes.h */, 
     536                                6116E53D0B43C27B0020F1CE /* ACConditionalMacros.h */, 
     537                                6116E53E0B43C27B0020F1CE /* ACSimpleCodec.cpp */, 
     538                                6116E53F0B43C27B0020F1CE /* ACSimpleCodec.h */, 
     539                                6116E5400B43C27B0020F1CE /* GetCodecBundle.cpp */, 
     540                                6116E5410B43C27B0020F1CE /* GetCodecBundle.h */, 
     541                        ); 
     542                        path = ACPublic; 
     543                        sourceTree = "<group>"; 
     544                }; 
     545                6116E5420B43C27B0020F1CE /* CAPublicUtility */ = { 
     546                        isa = PBXGroup; 
     547                        children = ( 
     548                                6116E5430B43C27B0020F1CE /* CABundleLocker.cpp */, 
     549                                6116E5440B43C27B0020F1CE /* CABundleLocker.h */, 
     550                                6116E5450B43C27B0020F1CE /* CAConditionalMacros.h */, 
     551                                6116E5460B43C27B0020F1CE /* CADebugMacros.cpp */, 
     552                                6116E5470B43C27B0020F1CE /* CADebugMacros.h */, 
     553                                6116E5480B43C27B0020F1CE /* CADebugPrintf.h */, 
     554                                6116E5490B43C27B0020F1CE /* CAStreamBasicDescription.cpp */, 
     555                                6116E54A0B43C27B0020F1CE /* CAStreamBasicDescription.h */, 
     556                        ); 
     557                        path = CAPublicUtility; 
     558                        sourceTree = "<group>"; 
     559                }; 
     560                6116E54B0B43C27B0020F1CE /* Audio Codec */ = { 
     561                        isa = PBXGroup; 
     562                        children = ( 
     563                                6116E54C0B43C27B0020F1CE /* FFissionCodec.cpp */, 
     564                                6116E54D0B43C27B0020F1CE /* FFissionCodec.h */, 
     565                                6116E54F0B43C27B0020F1CE /* FFissionDecoder.cpp */, 
     566                                6116E5500B43C27B0020F1CE /* FFissionDecoder.h */, 
     567                        ); 
     568                        name = "Audio Codec"; 
     569                        path = FFissionCodec; 
    484570                        sourceTree = "<group>"; 
    485571                }; 
    …… 
    662748                        isa = PBXGroup; 
    663749                        children = ( 
    664                                 F53AD5E70B2A4EFA00D93AC9 /* Codec */, 
     750                                6116E54B0B43C27B0020F1CE /* Audio Codec */, 
     751                                F53AD5E70B2A4EFA00D93AC9 /* Video Codec */, 
    665752                                F53AD5E30B2A4EE100D93AC9 /* File Import */, 
    666753                        ); 
    …… 
    681768                        sourceTree = "<group>"; 
    682769                }; 
    683                 F53AD5E70B2A4EFA00D93AC9 /* Codec */ = { 
     770                F53AD5E70B2A4EFA00D93AC9 /* Video Codec */ = { 
    684771                        isa = PBXGroup; 
    685772                        children = ( 
    …… 
    688775                                F560DF0003D61D0101ABA332 /* FFusionCodec.c */, 
    689776                        ); 
    690                         name = Codec; 
     777                        name = "Video Codec"; 
    691778                        sourceTree = "<group>"; 
    692779                }; 
    …… 
    863950                                6123D6270AD0A3FF003EDE52 /* VobSubCodec.r in Rez */, 
    864951                                613CD51F0AD1FB650098A825 /* TextSubCodec.r in Rez */, 
     952                                6116E5590B43C27B0020F1CE /* FFissionCodec.r in Rez */, 
    865953                        ); 
    866954                        runOnlyForDeploymentPostprocessing = 0; 
    …… 
    9161004                                61D514DE0ADF3DBA00A671E1 /* SubImport.c in Sources */, 
    9171005                                61D517730AE0402E00A671E1 /* CommonUtils.c in Sources */, 
     1006                                6116E5510B43C27B0020F1CE /* ACBaseCodec.cpp in Sources */, 
     1007                                6116E5520B43C27B0020F1CE /* ACCodec.cpp in Sources */, 
     1008                                6116E5530B43C27B0020F1CE /* ACSimpleCodec.cpp in Sources */, 
     1009                                6116E5570B43C27B0020F1CE /* CAStreamBasicDescription.cpp in Sources */, 
     1010                                6116E5580B43C27B0020F1CE /* FFissionCodec.cpp in Sources */, 
     1011                                6116E55A0B43C27B0020F1CE /* FFissionDecoder.cpp in Sources */, 
     1012                                6116E61C0B44A5A70020F1CE /* GetCodecBundle.cpp in Sources */, 
     1013                                6116E6200B44A5B30020F1CE /* CADebugMacros.cpp in Sources */, 
     1014                                6116E6220B44A5BC0020F1CE /* CABundleLocker.cpp in Sources */, 
    9181015                        ); 
    9191016                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/exportedSymbols

    r143 r219  
    44_VobSubCodecComponentDispatch 
    55_TextSubCodecComponentDispatch 
     6_FFissionDecoderEntry 

  • trunk/ff_MovieImport.c

    r204 r219  
    7878                register_avcodec(&h263i_decoder); 
    7979                 
     80                register_avcodec(&wmav1_decoder); 
     81                register_avcodec(&wmav2_decoder); 
     82                 
    8083                av_log_set_callback(FFMpegCodecprintf); 
    8184        }