Changeset 256

Timestamp:

01/06/07 18:12:59 (2 years ago)

Author:

gbooker

Message:

Use the first packet bitstream to determine audio parameters. Now we need to add other formats.

Files:

• trunk/MatroskaCodecIDs.cpp (modified) (2 diffs)
• trunk/MatroskaCodecIDs.h (modified) (1 diff)
• trunk/Perian.xcodeproj/project.pbxproj (modified) (9 diffs)
• trunk/bitstream_info.c (added)
• trunk/bitstream_info.h (added)
• trunk/ff_MovieImport.c (modified) (1 diff)
• trunk/ff_private.c (modified) (13 diffs)
• trunk/ff_private.h (modified) (2 diffs)

trunk/MatroskaCodecIDs.cpp

@@ -573 +573 @@
-};
-
+extern "C"{
-
-AudioChannelLayout GetDefaultChannelLayout(AudioStreamBasicDescription *asbd)
@@ -598 +599 @@
-        
-        return acl;
+}
+
-}
-

trunk/MatroskaCodecIDs.h

@@ -53 +53 @@
-ComponentResult MkvFinishASBD(KaxTrackEntry *tr_entry, AudioStreamBasicDescription *asbd);
-FourCharCode GetFourCC(KaxTrackEntry *tr_entry);
+extern "C"{
-AudioChannelLayout GetDefaultChannelLayout(AudioStreamBasicDescription *asbd);
-
+
-#endif

trunk/Perian.xcodeproj/project.pbxproj

@@ -214 +214 @@
-                8F483B5E0A6426C1002CCA73 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F483B5D0A6426C1002CCA73 /* AudioToolbox.framework */; };
-                8F483B8C0A642886002CCA73 /* PerianAviImporter.r in Rez */ = {isa = PBXBuildFile; fileRef = 8F483B8B0A642886002CCA73 /* PerianAviImporter.r */; };
+                F52286260B50625E00F8CF7D /* bitstream_info.c in Sources */ = {isa = PBXBuildFile; fileRef = F52286250B50625E00F8CF7D /* bitstream_info.c */; };
-                F53E18E50B4F483C003A0471 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F53E18E40B4F483C003A0471 /* Security.framework */; };
-                F59E09F10A670E570019A3F0 /* Perian.component in CopyFiles */ = {isa = PBXBuildFile; fileRef = 11A70AC10A3D0105002058D4 /* Perian.component */; };
@@ -540 +541 @@
-                8F483BBC0A642B3D002CCA73 /* ff_MovieImportDispatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ff_MovieImportDispatch.h; sourceTree = "<group>"; };
-                F50D440703EAD8DF01B1D299 /* FFusion.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = FFusion.icns; sourceTree = "<group>"; };
+                F52286240B50625E00F8CF7D /* bitstream_info.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitstream_info.h; sourceTree = "<group>"; };
+                F52286250B50625E00F8CF7D /* bitstream_info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitstream_info.c; sourceTree = "<group>"; };
-                F53E18E40B4F483C003A0471 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
-                F560DECD03D61B6101ABA332 /* Components.k.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Components.k.h; sourceTree = "<group>"; };
@@ -546 +549 @@
-                F560DF0003D61D0101ABA332 /* FFusionCodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = FFusionCodec.c; sourceTree = "<group>"; };
-                F560DF0203D622D001ABA332 /* FFusionCodec.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; path = FFusionCodec.r; sourceTree = "<group>"; };
-includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"
+explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0
-                F5CFD1BC0B5000CE00616865 /* GBPerianPanePListGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBPerianPanePListGenerator.h; sourceTree = "<group>"; };
-                F5CFD1BD0B5000CE00616865 /* GBPerianPanePListGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GBPerianPanePListGenerator.m; sourceTree = "<group>"; };
@@ -943 +946 @@
-                                11C85ED60A641E6400DF3D73 /* ff_private.c */,
-                                11C85ED70A641E6400DF3D73 /* ff_private.h */,
+                                F52286240B50625E00F8CF7D /* bitstream_info.h */,
+                                F52286250B50625E00F8CF7D /* bitstream_info.c */,
-                        );
-                        name = "File Import";
@@ -962 +967 @@
-                                F5CFD2D60B5012A100616865 /* A52Codec.component */,
-                                F5CFD2D80B5012A100616865 /* AC3MovieImport.component */,
-
+A52
-                        );
-                        name = Products;
@@ -1177 +1182 @@
-                        sourceTree = BUILT_PRODUCTS_DIR;
-                };
-
+A52
-                        isa = PBXReferenceProxy;
-                        fileType = wrapper.application;
-
+A52
-                        remoteRef = F5CFD2D90B5012A100616865 /* PBXContainerItemProxy */;
-                        sourceTree = BUILT_PRODUCTS_DIR;
@@ -1319 +1324 @@
-                                6116E6220B44A5BC0020F1CE /* CABundleLocker.cpp in Sources */,
-                                61FD41330B4F6F0800BEEFEA /* MatroskaImportPrivate.cpp in Sources */,
+                                F52286260B50625E00F8CF7D /* bitstream_info.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -1478 +1484 @@
-                                );
-                                COPY_PHASE_STRIP = NO;
-YES
+NO
-                                EXPORTED_SYMBOLS_FILE = "$(SOURCE_ROOT)/exportedSymbols";
-                                FRAMEWORK_SEARCH_PATHS = (
@@ -1518 +1524 @@
-                                OTHER_REZFLAGS = "-rd -d ppc_$(ppc) -d i386_$(i386) -d TARGET_REZ_CARBON_MACHO=1";
-                                PREBINDING = NO;
-YES
+NO
-                                PRODUCT_NAME = Perian;
-                                REZ_PREPROCESSOR_DEFINITIONS = "";

trunk/ff_MovieImport.c

@@ -418 +418 @@
-        if(inFlags & movieImportMustUseTrack) {
-                storage->map_count = 1;
-ic, &storage->stream_map
+storage
-        } else {
-                storage->map_count = ic->nb_streams;
-ic, &storage->stream_map
+storage
-        }
-        

trunk/ff_private.c

@@ -32 +32 @@
-#include <QuickTime/QuickTime.h>
-
+#include "bitstream_info.h"
+
-/* This routine checks if the system requirements are fullfilled */
-ComponentResult check_system()
@@ -66 +68 @@
- *      < 0: couldn't find a matching track
- */
-AVFormatContext *ic, NCStream **out_map
+ff_global_ptr storage
-{
-        int j;
@@ -73 +75 @@
-        Media media;
-        NCStream *map = NULL;
+        AVFormatContext *ic = storage->format_context;
-        
-        /* If the track has already a media, return an err */
@@ -99 +102 @@
-        
-        if(st->codec->codec_type == CODEC_TYPE_VIDEO)
-
+, storage->firstFrames + st->index
-        else if(st->codec->codec_type == CODEC_TYPE_AUDIO)
-
+, storage->firstFrames + st->index
-        
-        /* return the map */
-*out
+storage->stream
-        
-        return 0;
@@ -114 +117 @@
-
-/* Initializes the map & targetTrack to receive video data */
-
+, AVPacket *firstFrame
-{
-        Media media;
@@ -174 +177 @@
-
-/* Initializes the map & targetTrack to receive audio data */
-
+, AVPacket *firstFrame
-{
-        Media media;
@@ -243 +246 @@
-        int aclSize = 0;  //Set this if you intend to use it
-        memset(&acl, 0, sizeof(AudioChannelLayout));
-
+
+
+
+
-        {
-
-
+
-                {
-
-
-
+
-                        aclSize = sizeof(AudioChannelLayout);
-                }
+        }
+        if(useDefault && asbd.mChannelsPerFrame > 2)
+        {
+                acl.mChannelLayoutTag = GetDefaultChannelLayout();
+                aclSize = sizeof(AudioChannelLayout);
-        }
-        err = QTSoundDescriptionCreate(&asbd, aclSize == 0 ? NULL : &acl, aclSize, NULL, 0, kQTSoundDescriptionKind_Movie_Version2, &sndHdl);
@@ -483 +491 @@
- *        0: ok
- */
-AVFormatContext *ic, NCStream **out_map
+ff_global_ptr storage
-{
-        int j;
@@ -490 +498 @@
-        Track track;
-        Track first_audio_track = NULL;
+        AVFormatContext *ic = storage->format_context;
-        
-        /* make the stream map structure */
@@ -502 +511 @@
-                if(st->codec->codec_type == CODEC_TYPE_VIDEO) {
-                        track = NewMovieTrack(theMovie, st->codec->width << 16, st->codec->height << 16, kNoVolume);
-
+, storage->firstFrames + j
-                } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
-                        track = NewMovieTrack(theMovie, 0, 0, kFullVolume);
-
+, storage->firstFrames + j
-                        
-                        if (first_audio_track == NULL)
@@ -516 +525 @@
-    add_metadata(ic, theMovie);
-    
-*out
+storage->stream
-        
-        return 0;
@@ -542 +551 @@
-        else
-        {
+                int streamsRead = 0;
-                result = av_seek_frame(formatContext, -1, 0, 0);
-                if(result < 0) goto bail;
@@ -554 +564 @@
-                        }
-                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                
-                // seek back to the beginning, otherwise av_read_frame-based decoding will skip a few packets.

trunk/ff_private.h

@@ -77 +77 @@
-        int map_count;
-        int64_t header_offset;
+        
+        AVPacket firstFrames[MAX_STREAMS];
-};
-typedef struct _ff_global_context ff_global_context;
@@ -91 +93 @@
-
-/* Import routines */
-AVFormatContext *ic, NCStream **out_map
-AVFormatContext *ic, NCStream **out_map
-
-
+ff_global_ptr storage
+ff_global_ptr storage
+, AVPacket *firstFrame
+, AVPacket *firstFrame
-
-int determine_header_offset(ff_global_ptr storage);