Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

qtkit : improve thread safety, enforce build on OSX 10.5+

Browse Source 
qtkit movie creation functions can be started in a worker thread only from OSX 10.5
This commit is contained in:
Damien Plisson
2009-11-28 18:16:27 +00:00
parent b3784c4751
commit 201f789cee
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/quicktime/apple/qtkit_export.m
View File

@@ -60,6 +60,11 @@
#endif #endif
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <QTKit/QTKit.h> #import <QTKit/QTKit.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
#error OSX 10.5 minimum is needed for QTKit
#endif
#endif /* __APPLE__ */ #endif /* __APPLE__ */
typedef struct QuicktimeExport { typedef struct QuicktimeExport {
@@ -127,9 +132,12 @@ void start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty)
char name[2048]; char name[2048];
if(qtexport == NULL) qtexport = MEM_callocN(sizeof(QuicktimeExport), "QuicktimeExport");
if (G.afbreek != 1) { if (G.afbreek != 1) {
if(qtexport == NULL) qtexport = MEM_callocN(sizeof(QuicktimeExport), "QuicktimeExport");
[QTMovie enterQTKitOnThread];
/* Check first if the QuickTime 7.2.1 initToWritableFile: method is available */ /* Check first if the QuickTime 7.2.1 initToWritableFile: method is available */
if ([[[[QTMovie alloc] init] autorelease] respondsToSelector:@selector(initToWritableFile:error:)] != YES) { if ([[[[QTMovie alloc] init] autorelease] respondsToSelector:@selector(initToWritableFile:error:)] != YES) {
G.afbreek = 1; G.afbreek = 1;
@@ -144,6 +152,7 @@ void start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty)
if(qtexport->movie == nil) { if(qtexport->movie == nil) {
G.afbreek = 1; G.afbreek = 1;
NSLog(@"Unable to create quicktime movie : %@",[error localizedDescription]); NSLog(@"Unable to create quicktime movie : %@",[error localizedDescription]);
[QTMovie exitQTKitOnThread];
} else { } else {
[qtexport->movie retain]; [qtexport->movie retain];
[qtexport->filename retain]; [qtexport->filename retain];
@@ -235,6 +244,8 @@ void end_qt(void)
[qtexport->frameAttributes release]; [qtexport->frameAttributes release];
[qtexport->movie release]; [qtexport->movie release];
} }
[QTMovie exitQTKitOnThread];
if(qtexport) { if(qtexport) {
MEM_freeN(qtexport); MEM_freeN(qtexport);