[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24649] trunk/blender/source/blender/ quicktime/apple/quicktime_export.c: Quicktime (non cocoa) crash upon export temporary fix

[Damien Plisson]

Revision: 24649
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24649
Author:   damien78
Date:     2009-11-18 17:38:22 +0100 (Wed, 18 Nov 2009)

Log Message:
-----------
Quicktime (non cocoa) crash upon export temporary fix

Removed the pop up of the codec settings dialog box that was causing the crash, as it was called from the render thread (and not the main one).

So qt export settings are now blocked on default settings:
codec=jpeg, quality=max, bitrate=5MBps

Complete fix will be done by replacing this dialog box by "encoding" settings in the render panel.

Modified Paths:
--------------
    trunk/blender/source/blender/quicktime/apple/quicktime_export.c

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2009-11-18 16:12:49 UTC (rev 24648)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c	2009-11-18 16:38:22 UTC (rev 24649)
@@ -620,12 +620,13 @@
 		check_renderbutton_framerate(rd);
 	} else {
 		// configure the standard image compression dialog box
-		// set some default settings
+		// set some default settings: codec=jpeg, quality = max
+		qtdata->gSpatialSettings.codecType = kJPEGCodecType;
 		qtdata->gSpatialSettings.codec = anyCodec;         
 		qtdata->gSpatialSettings.spatialQuality = codecMaxQuality;
 		qtdata->gTemporalSettings.temporalQuality = codecMaxQuality;
 		qtdata->gTemporalSettings.keyFrameRate = 25;   
-		qtdata->aDataRateSetting.dataRate = 90 * 1024;          
+		qtdata->aDataRateSetting.dataRate = 5 * 1024 * 1024;          
 
 		err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType,	&qtdata->gTemporalSettings);
 		CheckError(err, "SCSetInfo1 error");
@@ -637,6 +638,8 @@
 
 	check_renderbutton_framerate(rd);
 
+	/* Remove this dialog box pop up as this function is called from the render thread
+	 Anyway, all config should be done inside blender ui before starting render.
 	// put up the dialog box - it needs to be called from the main thread
 	err = SCRequestSequenceSettings(qtdata->theComponent);
  
@@ -648,7 +651,7 @@
 	// get user selected data
 	SCGetInfo(qtdata->theComponent, scTemporalSettingsType,	&qtdata->gTemporalSettings);
 	SCGetInfo(qtdata->theComponent, scSpatialSettingsType,	&qtdata->gSpatialSettings);
-	SCGetInfo(qtdata->theComponent, scDataRateSettingsType,	&qtdata->aDataRateSetting);
+	SCGetInfo(qtdata->theComponent, scDataRateSettingsType,	&qtdata->aDataRateSetting);*/
 
 	QT_SaveCodecSettingsToScene(rd);