[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25534] trunk/blender/source/blender/ quicktime/apple/quicktime_export.c: Fix compilation of carbon quicktime & complete use of report mechanism instead of standard printf
Damien Plisson
damien.plisson at yahoo.fr
Wed Dec 23 12:49:07 CET 2009
Revision: 25534
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25534
Author: damien78
Date: 2009-12-23 12:49:07 +0100 (Wed, 23 Dec 2009)
Log Message:
-----------
Fix compilation of carbon quicktime & complete use of report mechanism instead of standard printf
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-12-23 11:22:30 UTC (rev 25533)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c 2009-12-23 11:49:07 UTC (rev 25534)
@@ -175,13 +175,12 @@
static void CheckError(OSErr err, char *msg, ReportList *reports)
{
if(err != noErr) {
- printf("%s: %d\n", msg, err);
BKE_reportf(reports, RPT_ERROR, "%s: %d", msg, err);
}
}
-static OSErr QT_SaveCodecSettingsToScene(RenderData *rd)
+static OSErr QT_SaveCodecSettingsToScene(RenderData *rd, ReportList *reports)
{
QTAtomContainer myContainer = NULL;
ComponentResult myErr = noErr;
@@ -207,7 +206,7 @@
// retreive codecdata from quicktime in a atomcontainer
myErr = SCGetSettingsAsAtomContainer(qtdata->theComponent, &myContainer);
if (myErr != noErr) {
- printf("Quicktime: SCGetSettingsAsAtomContainer failed\n");
+ BKE_reportf(reports, RPT_ERROR, "Quicktime: SCGetSettingsAsAtomContainer failed\n");
goto bail;
}
@@ -226,7 +225,7 @@
GetCodecInfo (&ci, qtdata->gSpatialSettings.codecType, 0);
} else {
- printf("Quicktime: QT_SaveCodecSettingsToScene failed\n");
+ BKE_reportf(reports, RPT_ERROR, "Quicktime: QT_SaveCodecSettingsToScene failed\n");
}
QTUnlockContainer(myContainer);
@@ -239,7 +238,7 @@
}
-static OSErr QT_GetCodecSettingsFromScene(RenderData *rd)
+static OSErr QT_GetCodecSettingsFromScene(RenderData *rd, ReportList *reports)
{
Handle myHandle = NULL;
ComponentResult myErr = noErr;
@@ -256,7 +255,7 @@
if(qcd->cdParms && qcd->cdSize) {
myErr = SCSetSettingsFromAtomContainer((GraphicsExportComponent)qtdata->theComponent, (QTAtomContainer)myHandle);
if (myErr != noErr) {
- printf("Quicktime: SCSetSettingsFromAtomContainer failed\n");
+ BKE_reportf(reports, RPT_ERROR, "Quicktime: SCSetSettingsFromAtomContainer failed\n");
goto bail;
}
@@ -282,7 +281,7 @@
//Frame duration is already known (qtdata->aDataRateSetting.frameDuration)
} else {
- printf("Quicktime: QT_GetCodecSettingsFromScene failed\n");
+ BKE_reportf(reports, RPT_ERROR, "Quicktime: QT_GetCodecSettingsFromScene failed\n");
}
bail:
if (myHandle != NULL)
@@ -401,7 +400,7 @@
gTemporalSettings = qtdata->gTemporalSettings;
if(qtdata->gSpatialSettings.codecType == kH264CodecType) {
if(gTemporalSettings.temporalQuality != codecMinQuality) {
- fprintf(stderr, "Only minimum quality compression supported for QuickTime H.264.\n");
+ BKE_reportf(reports, RPT_WARNING, "Only minimum quality compression supported for QuickTime H.264.\n");
gTemporalSettings.temporalQuality = codecMinQuality;
}
}
@@ -469,8 +468,6 @@
syncFlag,
NULL);
CheckError(err, "AddMediaSample error", reports);
-
- printf ("added frame %3d (frame %3d in movie): ", frame, frame-sframe);
}
@@ -550,7 +547,7 @@
/* hack: create an empty file to make FSPathMakeRef() happy */
myFile = open(theFullPath, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRUSR|S_IWUSR);
if (myFile < 0) {
- printf("error while creating file!\n");
+ BKE_reportf(reports, RPT_ERROR, "error while creating movie file!\n");
/* do something? */
}
close(myFile);
@@ -584,7 +581,7 @@
ExitMoviesOnThread();
#endif
} else {
- printf("Created QuickTime movie: %s\n", name);
+ //printf("Created QuickTime movie: %s\n", name);
QT_CreateMyVideoTrack(rectx, recty, reports);
}
@@ -619,7 +616,7 @@
DisposeMovie(qtexport->theMovie);
- printf("Finished QuickTime movie.\n");
+ //printf("Finished QuickTime movie.\n");
}
ExitMoviesOnThread();
@@ -708,7 +705,7 @@
// get previous selected codecsetting, from qtatom or detailed settings
if(rd->qtcodecdata && rd->qtcodecdata->cdParms) {
- QT_GetCodecSettingsFromScene(rd);
+ QT_GetCodecSettingsFromScene(rd, reports);
} else {
SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting);
SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings);
@@ -759,7 +756,7 @@
// get previous selected codecsetting, from qtatom or detailed settings
if(rd->qtcodecdata && rd->qtcodecdata->cdParms) {
- QT_GetCodecSettingsFromScene(rd);
+ QT_GetCodecSettingsFromScene(rd, op->reports);
} else {
SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting);
SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings);
@@ -813,7 +810,7 @@
rd->qtcodecsettings.minTemporalQuality = (qtdata->aDataRateSetting.minTemporalQuality * 100) / codecLosslessQuality;
//Frame duration is already known (qtdata->aDataRateSetting.frameDuration)
- QT_SaveCodecSettingsToScene(rd);
+ QT_SaveCodecSettingsToScene(rd, op->reports);
// framerate jugglin'
if(qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps
More information about the Bf-blender-cvs
mailing list