sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for [#23753]: Enable QTKit import to run in background thread

Browse Source 
Was crashing file browser when there was some quicktime movies in the folder
This commit is contained in:
Damien Plisson 2010-09-18 12:50:45 +00:00
parent 868fdd80a2
commit 9fae26efe9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/quicktime/apple/qtkit_import.m
View File

@ -30,6 +30,8 @@
*/ */
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
#include "MEM_guardedalloc.h"
#include "IMB_anim.h" #include "IMB_anim.h"
#include "BLO_sys_types.h" #include "BLO_sys_types.h"
#include "BKE_global.h" #include "BKE_global.h"
@ -113,6 +115,8 @@ int anim_is_quicktime (char *name)
void free_anim_quicktime (struct anim *anim) { void free_anim_quicktime (struct anim *anim) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (anim == NULL) return; if (anim == NULL) return;
if (anim->qtime == NULL) return; if (anim->qtime == NULL) return;
@ -122,11 +126,15 @@ void free_anim_quicktime (struct anim *anim) {
[anim->qtime->media release]; [anim->qtime->media release];
[anim->qtime->movie release]; [anim->qtime->movie release];
[QTMovie exitQTKitOnThread];
if(anim->qtime) MEM_freeN (anim->qtime); if(anim->qtime) MEM_freeN (anim->qtime);
anim->qtime = NULL; anim->qtime = NULL;
anim->duration = 0; anim->duration = 0;
[pool drain];
} }
static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height) static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
@ -302,6 +310,8 @@ int startquicktime (struct anim *anim)
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
[QTMovie enterQTKitOnThread];
attributes = [NSDictionary dictionaryWithObjectsAndKeys: attributes = [NSDictionary dictionaryWithObjectsAndKeys:
[NSString stringWithCString:anim->name [NSString stringWithCString:anim->name
encoding:[NSString defaultCStringEncoding]], QTMovieFileNameAttribute, encoding:[NSString defaultCStringEncoding]], QTMovieFileNameAttribute,
@ -314,6 +324,7 @@ int startquicktime (struct anim *anim)
if(QTIME_DEBUG) printf("qt: bad movie %s\n", anim->name); if(QTIME_DEBUG) printf("qt: bad movie %s\n", anim->name);
MEM_freeN(anim->qtime); MEM_freeN(anim->qtime);
if(QTIME_DEBUG) printf("qt: can't load %s\n", anim->name); if(QTIME_DEBUG) printf("qt: can't load %s\n", anim->name);
[QTMovie exitQTKitOnThread];
[pool drain]; [pool drain];
return -1; return -1;
} }
@ -328,6 +339,7 @@ int startquicktime (struct anim *anim)
[anim->qtime->movie release]; [anim->qtime->movie release];
MEM_freeN(anim->qtime); MEM_freeN(anim->qtime);
if(QTIME_DEBUG) printf("qt: can't load %s\n", anim->name); if(QTIME_DEBUG) printf("qt: can't load %s\n", anim->name);
[QTMovie exitQTKitOnThread];
[pool drain]; [pool drain];
return -1; return -1;
} }