diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 20:11:34 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-12 20:11:34 +0400 |
commit | 53ee7908d6c5a8bbdbec5202196d6dae86972e4c (patch) | |
tree | b32976091f325b3a08ff92851b54f49ac3b6021b /source/blender/quicktime/apple | |
parent | bddc7dfc20919105e02181340d54b2faf52c95ac (diff) |
style cleanup: whitespace
Diffstat (limited to 'source/blender/quicktime/apple')
-rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 339 | ||||
-rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 278 |
2 files changed, 309 insertions, 308 deletions
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index e25fc0f04bd..a071c0be611 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -79,52 +79,52 @@ #include <sys/stat.h> /* file permissions */ #endif /* __APPLE__ */ -#define kMyCreatorType FOUR_CHAR_CODE('TVOD') -#define kTrackStart 0 -#define kMediaStart 0 - -static void QT_StartAddVideoSamplesToMedia (const Rect *trackFrame, int rectx, int recty, struct ReportList *reports); -static void QT_DoAddVideoSamplesToMedia (int frame, int *pixels, int rectx, int recty, struct ReportList *reports); -static void QT_EndAddVideoSamplesToMedia (void); -static void QT_CreateMyVideoTrack (int rectx, int recty, struct ReportList *reports); -static void QT_EndCreateMyVideoTrack (struct ReportList *reports); +#define kMyCreatorType FOUR_CHAR_CODE('TVOD') +#define kTrackStart 0 +#define kMediaStart 0 + +static void QT_StartAddVideoSamplesToMedia(const Rect *trackFrame, int rectx, int recty, struct ReportList *reports); +static void QT_DoAddVideoSamplesToMedia(int frame, int *pixels, int rectx, int recty, struct ReportList *reports); +static void QT_EndAddVideoSamplesToMedia(void); +static void QT_CreateMyVideoTrack(int rectx, int recty, struct ReportList *reports); +static void QT_EndCreateMyVideoTrack(struct ReportList *reports); static void check_renderbutton_framerate(struct RenderData *rd, struct ReportList *reports); static int get_qtcodec_settings(struct RenderData *rd, struct ReportList *reports); typedef struct QuicktimeExport { - FSSpec theSpec; - short resRefNum; - Str255 qtfilename; + FSSpec theSpec; + short resRefNum; + Str255 qtfilename; - Media theMedia; - Movie theMovie; - Track theTrack; + Media theMedia; + Movie theMovie; + Track theTrack; - GWorldPtr theGWorld; - PixMapHandle thePixMap; - ImageDescription **anImageDescription; + GWorldPtr theGWorld; + PixMapHandle thePixMap; + ImageDescription **anImageDescription; - ImBuf *ibuf; //imagedata for Quicktime's Gworld - ImBuf *ibuf2; //copy of renderdata, to be Y-flipped + ImBuf *ibuf; //imagedata for Quicktime's Gworld + ImBuf *ibuf2; //copy of renderdata, to be Y-flipped } QuicktimeExport; typedef struct QuicktimeComponentData { - ComponentInstance theComponent; + ComponentInstance theComponent; SCTemporalSettings gTemporalSettings; SCSpatialSettings gSpatialSettings; SCDataRateSettings aDataRateSetting; - TimeValue duration; - long kVideoTimeScale; + TimeValue duration; + long kVideoTimeScale; } QuicktimeComponentData; static struct QuicktimeExport *qtexport; static struct QuicktimeComponentData *qtdata; -static int sframe; +static int sframe; /* RNA functions */ @@ -141,7 +141,8 @@ static QuicktimeCodecTypeDesc qtVideoCodecList[] = { {kMPEG4VisualCodecType, 10, "MPEG4"}, {kH263CodecType, 11, "H.263"}, {kH264CodecType, 12, "H.264"}, - {0, 0, NULL}}; + {0, 0, NULL} +}; static int qtVideoCodecCount = 12; @@ -150,9 +151,9 @@ int quicktime_get_num_videocodecs() return qtVideoCodecCount; } -QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue) +QuicktimeCodecTypeDesc *quicktime_get_videocodecType_desc(int indexValue) { - if ((indexValue>=0) && (indexValue < qtVideoCodecCount)) + if ((indexValue >= 0) && (indexValue < qtVideoCodecCount)) return &qtVideoCodecList[indexValue]; else return NULL; @@ -161,7 +162,7 @@ QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue) int quicktime_rnatmpvalue_from_videocodectype(int codecType) { int i; - for (i=0;i<qtVideoCodecCount;i++) { + for (i = 0; i < qtVideoCodecCount; i++) { if (qtVideoCodecList[i].codecType == codecType) return qtVideoCodecList[i].rnatmpvalue; } @@ -172,7 +173,7 @@ int quicktime_rnatmpvalue_from_videocodectype(int codecType) int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue) { int i; - for (i=0;i<qtVideoCodecCount;i++) { + for (i = 0; i < qtVideoCodecCount; i++) { if (qtVideoCodecList[i].rnatmpvalue == rnatmpvalue) return qtVideoCodecList[i].codecType; } @@ -192,12 +193,12 @@ static void CheckError(OSErr err, char *msg, ReportList *reports) static OSErr QT_SaveCodecSettingsToScene(RenderData *rd, ReportList *reports) { - QTAtomContainer myContainer = NULL; - ComponentResult myErr = noErr; - Ptr myPtr; - long mySize = 0; + QTAtomContainer myContainer = NULL; + ComponentResult myErr = noErr; + Ptr myPtr; + long mySize = 0; - CodecInfo ci; + CodecInfo ci; QuicktimeCodecData *qcd = rd->qtcodecdata; @@ -210,9 +211,9 @@ static OSErr QT_SaveCodecSettingsToScene(RenderData *rd, ReportList *reports) } // obtain all current codec settings - SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); - SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); // retreive codecdata from quicktime in a atomcontainer myErr = SCGetSettingsAsAtomContainer(qtdata->theComponent, &myContainer); @@ -234,7 +235,7 @@ static OSErr QT_SaveCodecSettingsToScene(RenderData *rd, ReportList *reports) memcpy(qcd->cdParms, myPtr, mySize); qcd->cdSize = mySize; - GetCodecInfo (&ci, qtdata->gSpatialSettings.codecType, 0); + GetCodecInfo(&ci, qtdata->gSpatialSettings.codecType, 0); } else { BKE_reportf(reports, RPT_ERROR, "Quicktime: QT_SaveCodecSettingsToScene failed\n"); @@ -252,8 +253,8 @@ bail: static OSErr QT_GetCodecSettingsFromScene(RenderData *rd, ReportList *reports) { - Handle myHandle = NULL; - ComponentResult myErr = noErr; + Handle myHandle = NULL; + ComponentResult myErr = noErr; QuicktimeCodecData *qcd = rd->qtcodecdata; @@ -272,9 +273,9 @@ static OSErr QT_GetCodecSettingsFromScene(RenderData *rd, ReportList *reports) } // update runtime codecsettings for use with the codec dialog - SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); - SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); //Fill the render QuicktimeCodecSettigns struct @@ -304,12 +305,12 @@ bail: } -static OSErr QT_AddUserDataTextToMovie (Movie theMovie, char *theText, OSType theType) +static OSErr QT_AddUserDataTextToMovie(Movie theMovie, char *theText, OSType theType) { - UserData myUserData = NULL; - Handle myHandle = NULL; - long myLength = strlen(theText); - OSErr myErr = noErr; + UserData myUserData = NULL; + Handle myHandle = NULL; + long myLength = strlen(theText); + OSErr myErr = noErr; // get the movie's user data list myUserData = GetMovieUserData(theMovie); @@ -343,10 +344,10 @@ static void QT_CreateMyVideoTrack(int rectx, int recty, ReportList *reports) trackFrame.bottom = recty; trackFrame.right = rectx; - qtexport->theTrack = NewMovieTrack (qtexport->theMovie, - FixRatio(trackFrame.right, 1), - FixRatio(trackFrame.bottom, 1), - 0); + qtexport->theTrack = NewMovieTrack(qtexport->theMovie, + FixRatio(trackFrame.right, 1), + FixRatio(trackFrame.bottom, 1), + 0); CheckError(GetMoviesError(), "NewMovieTrack error", reports); // SetIdentityMatrix(&myMatrix); @@ -354,17 +355,17 @@ static void QT_CreateMyVideoTrack(int rectx, int recty, ReportList *reports) // TranslateMatrix(&myMatrix, 0, Long2Fix(trackFrame.bottom)); // SetMovieMatrix(qtexport->theMovie, &myMatrix); - qtexport->theMedia = NewTrackMedia (qtexport->theTrack, - VideoMediaType, - qtdata->kVideoTimeScale, - nil, - 0); + qtexport->theMedia = NewTrackMedia(qtexport->theTrack, + VideoMediaType, + qtdata->kVideoTimeScale, + nil, + 0); CheckError(GetMoviesError(), "NewTrackMedia error", reports); - err = BeginMediaEdits (qtexport->theMedia); + err = BeginMediaEdits(qtexport->theMedia); CheckError(err, "BeginMediaEdits error", reports); - QT_StartAddVideoSamplesToMedia (&trackFrame, rectx, recty, reports); + QT_StartAddVideoSamplesToMedia(&trackFrame, rectx, recty, reports); } @@ -372,40 +373,40 @@ static void QT_EndCreateMyVideoTrack(ReportList *reports) { OSErr err = noErr; - QT_EndAddVideoSamplesToMedia (); + QT_EndAddVideoSamplesToMedia(); - err = EndMediaEdits (qtexport->theMedia); + err = EndMediaEdits(qtexport->theMedia); CheckError(err, "EndMediaEdits error", reports); - err = InsertMediaIntoTrack (qtexport->theTrack, - kTrackStart, /* track start time */ - kMediaStart, /* media start time */ - GetMediaDuration (qtexport->theMedia), - fixed1); + err = InsertMediaIntoTrack(qtexport->theTrack, + kTrackStart, /* track start time */ + kMediaStart, /* media start time */ + GetMediaDuration(qtexport->theMedia), + fixed1); CheckError(err, "InsertMediaIntoTrack error", reports); } -static void QT_StartAddVideoSamplesToMedia (const Rect *trackFrame, int rectx, int recty, ReportList *reports) +static void QT_StartAddVideoSamplesToMedia(const Rect *trackFrame, int rectx, int recty, ReportList *reports) { SCTemporalSettings gTemporalSettings; OSErr err = noErr; - qtexport->ibuf = IMB_allocImBuf (rectx, recty, 32, IB_rect); - qtexport->ibuf2 = IMB_allocImBuf (rectx, recty, 32, IB_rect); + qtexport->ibuf = IMB_allocImBuf(rectx, recty, 32, IB_rect); + qtexport->ibuf2 = IMB_allocImBuf(rectx, recty, 32, IB_rect); - err = NewGWorldFromPtr( &qtexport->theGWorld, - k32ARGBPixelFormat, - trackFrame, - NULL, NULL, 0, - (Ptr)qtexport->ibuf->rect, - rectx * 4 ); - CheckError (err, "NewGWorldFromPtr error", reports); + err = NewGWorldFromPtr(&qtexport->theGWorld, + k32ARGBPixelFormat, + trackFrame, + NULL, NULL, 0, + (Ptr)qtexport->ibuf->rect, + rectx * 4); + CheckError(err, "NewGWorldFromPtr error", reports); qtexport->thePixMap = GetGWorldPixMap(qtexport->theGWorld); LockPixels(qtexport->thePixMap); - SCDefaultPixMapSettings (qtdata->theComponent, qtexport->thePixMap, true); + SCDefaultPixMapSettings(qtdata->theComponent, qtexport->thePixMap, true); // workaround for crash with H.264, which requires an upgrade to // the new callback based api for proper encoding, but that's not @@ -418,32 +419,32 @@ static void QT_StartAddVideoSamplesToMedia (const Rect *trackFrame, int rectx, i } } - SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &gTemporalSettings); - SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &gTemporalSettings); + SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); err = SCCompressSequenceBegin(qtdata->theComponent, qtexport->thePixMap, NULL, &qtexport->anImageDescription); - CheckError (err, "SCCompressSequenceBegin error", reports ); + CheckError(err, "SCCompressSequenceBegin error", reports); } -static void QT_DoAddVideoSamplesToMedia (int frame, int *pixels, int rectx, int recty, ReportList *reports) +static void QT_DoAddVideoSamplesToMedia(int frame, int *pixels, int rectx, int recty, ReportList *reports) { - OSErr err = noErr; - Rect imageRect; + OSErr err = noErr; + Rect imageRect; - int index; - int boxsize; + int index; + int boxsize; unsigned char *from, *to; - short syncFlag; - long dataSize; - Handle compressedData; - Ptr myPtr; + short syncFlag; + long dataSize; + Handle compressedData; + Ptr myPtr; //copy and flip renderdata - memcpy(qtexport->ibuf2->rect, pixels, 4*rectx*recty); + memcpy(qtexport->ibuf2->rect, pixels, 4 * rectx * recty); IMB_flipy(qtexport->ibuf2); //get pointers to parse bitmapdata @@ -455,42 +456,42 @@ static void QT_DoAddVideoSamplesToMedia (int frame, int *pixels, int rectx, int //parse RGBA bitmap into Quicktime's ARGB GWorld boxsize = rectx * recty; - for ( index = 0; index < boxsize; index++) { + for (index = 0; index < boxsize; index++) { to[0] = from[3]; to[1] = from[0]; to[2] = from[1]; to[3] = from[2]; - to +=4, from += 4; + to += 4, from += 4; } err = SCCompressSequenceFrame(qtdata->theComponent, - qtexport->thePixMap, - &imageRect, - &compressedData, - &dataSize, - &syncFlag); + qtexport->thePixMap, + &imageRect, + &compressedData, + &dataSize, + &syncFlag); CheckError(err, "SCCompressSequenceFrame error", reports); err = AddMediaSample(qtexport->theMedia, - compressedData, - 0, - dataSize, - qtdata->duration, - (SampleDescriptionHandle)qtexport->anImageDescription, - 1, - syncFlag, - NULL); + compressedData, + 0, + dataSize, + qtdata->duration, + (SampleDescriptionHandle)qtexport->anImageDescription, + 1, + syncFlag, + NULL); CheckError(err, "AddMediaSample error", reports); } -static void QT_EndAddVideoSamplesToMedia (void) +static void QT_EndAddVideoSamplesToMedia(void) { SCCompressSequenceEnd(qtdata->theComponent); UnlockPixels(qtexport->thePixMap); if (qtexport->theGWorld) - DisposeGWorld (qtexport->theGWorld); + DisposeGWorld(qtexport->theGWorld); if (qtexport->ibuf) IMB_freeImBuf(qtexport->ibuf); @@ -504,7 +505,7 @@ void filepath_qt(char *string, RenderData *rd) { char txt[64]; - if (string==0) return; + if (string == 0) return; strcpy(string, rd->pic); BLI_path_abs(string, G.main->name); @@ -526,12 +527,12 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R char theFullPath[255]; #ifdef __APPLE__ - int myFile; - FSRef myRef; + int myFile; + FSRef myRef; #else - char *qtname; + char *qtname; #endif - int success= 1; + int success = 1; if (qtexport == NULL) qtexport = MEM_callocN(sizeof(QuicktimeExport), "QuicktimeExport"); @@ -561,7 +562,7 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R sprintf(theFullPath, "%s", name); /* hack: create an empty file to make FSPathMakeRef() happy */ - myFile = open(theFullPath, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRUSR|S_IWUSR); + myFile = open(theFullPath, O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRUSR | S_IWUSR); if (myFile < 0) { BKE_reportf(reports, RPT_ERROR, "error while creating movie file!\n"); /* do something? */ @@ -582,17 +583,17 @@ int start_qt(struct Scene *scene, struct RenderData *rd, int rectx, int recty, R err = FSMakeFSSpec(0, 0L, qtexport->qtfilename, &qtexport->theSpec); #endif - err = CreateMovieFile (&qtexport->theSpec, - kMyCreatorType, - smCurrentScript, - createMovieFileDeleteCurFile | createMovieFileDontCreateResFile, - &qtexport->resRefNum, - &qtexport->theMovie ); + err = CreateMovieFile(&qtexport->theSpec, + kMyCreatorType, + smCurrentScript, + createMovieFileDeleteCurFile | createMovieFileDontCreateResFile, + &qtexport->resRefNum, + &qtexport->theMovie); CheckError(err, "CreateMovieFile error", reports); if (err != noErr) { BKE_reportf(reports, RPT_ERROR, "Unable to create Quicktime movie: %s", name); - success= 0; + success = 0; #ifdef __APPLE__ ExitMoviesOnThread(); #endif @@ -622,7 +623,7 @@ void end_qt(void) if (qtexport->theMovie) { QT_EndCreateMyVideoTrack(NULL); - err = AddMovieResource (qtexport->theMovie, qtexport->resRefNum, &resId, qtexport->qtfilename); + err = AddMovieResource(qtexport->theMovie, qtexport->resRefNum, &resId, qtexport->qtfilename); CheckError(err, "AddMovieResource error", NULL); err = QT_AddUserDataTextToMovie(qtexport->theMovie, "Made with Blender", kUserDataTextInformation); @@ -639,7 +640,7 @@ void end_qt(void) } #ifdef __APPLE__ - ExitMoviesOnThread(); + ExitMoviesOnThread(); #endif if (qtexport) { @@ -662,36 +663,36 @@ void free_qtcomponentdata(void) static void check_renderbutton_framerate(RenderData *rd, ReportList *reports) { // to keep float framerates consistent between the codec dialog and frs/sec button. - OSErr err; + OSErr err; - err = SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + err = SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); CheckError(err, "SCGetInfo fr error", reports); if ( (rd->frs_sec == 24 || rd->frs_sec == 30 || rd->frs_sec == 60) && - (qtdata->gTemporalSettings.frameRate == 1571553 || - qtdata->gTemporalSettings.frameRate == 1964113 || - qtdata->gTemporalSettings.frameRate == 3928227)) + (qtdata->gTemporalSettings.frameRate == 1571553 || + qtdata->gTemporalSettings.frameRate == 1964113 || + qtdata->gTemporalSettings.frameRate == 3928227)) { /* do nothing */ } else { if (rd->frs_sec_base > 0) qtdata->gTemporalSettings.frameRate = - ((float)(rd->frs_sec << 16) / rd->frs_sec_base); + ((float)(rd->frs_sec << 16) / rd->frs_sec_base); } - err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); CheckError(err, "SCSetInfo error", reports); - if (qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps + if (qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps qtdata->kVideoTimeScale = 24000; qtdata->duration = 1001; } - else if (qtdata->gTemporalSettings.frameRate == 1964113) { // 29.97 fps + else if (qtdata->gTemporalSettings.frameRate == 1964113) { // 29.97 fps qtdata->kVideoTimeScale = 30000; qtdata->duration = 1001; } - else if (qtdata->gTemporalSettings.frameRate == 3928227) { // 59.94 fps + else if (qtdata->gTemporalSettings.frameRate == 3928227) { // 59.94 fps qtdata->kVideoTimeScale = 60000; qtdata->duration = 1001; } @@ -704,14 +705,14 @@ static void check_renderbutton_framerate(RenderData *rd, ReportList *reports) void quicktime_verify_image_type(RenderData *rd, ImageFormatData *imf) { if (imf->imtype == R_IMF_IMTYPE_QUICKTIME) { - if ((rd->qtcodecsettings.codecType== 0) || - (rd->qtcodecsettings.codecSpatialQuality <0) || - (rd->qtcodecsettings.codecSpatialQuality > 100)) { + if ((rd->qtcodecsettings.codecType == 0) || + (rd->qtcodecsettings.codecSpatialQuality < 0) || + (rd->qtcodecsettings.codecSpatialQuality > 100)) { rd->qtcodecsettings.codecType = kJPEGCodecType; rd->qtcodecsettings.codec = (int)anyCodec; - rd->qtcodecsettings.codecSpatialQuality = (codecHighQuality*100)/codecLosslessQuality; - rd->qtcodecsettings.codecTemporalQuality = (codecHighQuality*100)/codecLosslessQuality; + rd->qtcodecsettings.codecSpatialQuality = (codecHighQuality * 100) / codecLosslessQuality; + rd->qtcodecsettings.codecTemporalQuality = (codecHighQuality * 100) / codecLosslessQuality; rd->qtcodecsettings.keyFrameRate = 25; rd->qtcodecsettings.bitRate = 5000000; //5 Mbps } @@ -721,7 +722,7 @@ void quicktime_verify_image_type(RenderData *rd, ImageFormatData *imf) int get_qtcodec_settings(RenderData *rd, ReportList *reports) { OSErr err = noErr; - // erase any existing codecsetting + // erase any existing codecsetting if (qtdata) { if (qtdata->theComponent) CloseComponent(qtdata->theComponent); free_qtcomponentdata(); @@ -736,14 +737,14 @@ int get_qtcodec_settings(RenderData *rd, ReportList *reports) QT_GetCodecSettingsFromScene(rd, reports); } else { - SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); - SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); qtdata->gSpatialSettings.codecType = rd->qtcodecsettings.codecType; qtdata->gSpatialSettings.codec = (CodecComponent)rd->qtcodecsettings.codec; - qtdata->gSpatialSettings.spatialQuality = (rd->qtcodecsettings.codecSpatialQuality * codecLosslessQuality) /100; - qtdata->gTemporalSettings.temporalQuality = (rd->qtcodecsettings.codecTemporalQuality * codecLosslessQuality) /100; + qtdata->gSpatialSettings.spatialQuality = (rd->qtcodecsettings.codecSpatialQuality * codecLosslessQuality) / 100; + qtdata->gTemporalSettings.temporalQuality = (rd->qtcodecsettings.codecTemporalQuality * codecLosslessQuality) / 100; qtdata->gTemporalSettings.keyFrameRate = rd->qtcodecsettings.keyFrameRate; qtdata->aDataRateSetting.dataRate = rd->qtcodecsettings.bitRate; qtdata->gSpatialSettings.depth = rd->qtcodecsettings.colorDepth; @@ -751,14 +752,14 @@ int get_qtcodec_settings(RenderData *rd, ReportList *reports) qtdata->aDataRateSetting.minTemporalQuality = (rd->qtcodecsettings.minTemporalQuality * codecLosslessQuality) / 100; qtdata->aDataRateSetting.frameDuration = rd->frs_sec; - SetMovieTimeScale(qtexport->theMovie, rd->frs_sec_base*1000); + SetMovieTimeScale(qtexport->theMovie, rd->frs_sec_base * 1000); - err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); CheckError(err, "SCSetInfo1 error", reports); - err = SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + err = SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); CheckError(err, "SCSetInfo2 error", reports); - err = SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + err = SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); CheckError(err, "SCSetInfo3 error", reports); } @@ -769,7 +770,7 @@ int get_qtcodec_settings(RenderData *rd, ReportList *reports) static int request_qtcodec_settings(bContext *C, wmOperator *op) { - OSErr err = noErr; + OSErr err = noErr; Scene *scene = CTX_data_scene(C); RenderData *rd = &scene->r; @@ -788,14 +789,14 @@ static int request_qtcodec_settings(bContext *C, wmOperator *op) QT_GetCodecSettingsFromScene(rd, op->reports); } else { - SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); - SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); qtdata->gSpatialSettings.codecType = rd->qtcodecsettings.codecType; qtdata->gSpatialSettings.codec = (CodecComponent)rd->qtcodecsettings.codec; - qtdata->gSpatialSettings.spatialQuality = (rd->qtcodecsettings.codecSpatialQuality * codecLosslessQuality) /100; - qtdata->gTemporalSettings.temporalQuality = (rd->qtcodecsettings.codecTemporalQuality * codecLosslessQuality) /100; + qtdata->gSpatialSettings.spatialQuality = (rd->qtcodecsettings.codecSpatialQuality * codecLosslessQuality) / 100; + qtdata->gTemporalSettings.temporalQuality = (rd->qtcodecsettings.codecTemporalQuality * codecLosslessQuality) / 100; qtdata->gTemporalSettings.keyFrameRate = rd->qtcodecsettings.keyFrameRate; qtdata->gTemporalSettings.frameRate = ((float)(rd->frs_sec << 16) / rd->frs_sec_base); qtdata->aDataRateSetting.dataRate = rd->qtcodecsettings.bitRate; @@ -805,29 +806,29 @@ static int request_qtcodec_settings(bContext *C, wmOperator *op) qtdata->aDataRateSetting.frameDuration = rd->frs_sec; - err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + err = SCSetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); CheckError(err, "SCSetInfo1 error", op->reports); - err = SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + err = SCSetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); CheckError(err, "SCSetInfo2 error", op->reports); - err = SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + err = SCSetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); CheckError(err, "SCSetInfo3 error", op->reports); } - // put up the dialog box - it needs to be called from the main thread + // put up the dialog box - it needs to be called from the main thread err = SCRequestSequenceSettings(qtdata->theComponent); if (err == scUserCancelled) { return OPERATOR_FINISHED; } - // update runtime codecsettings for use with the codec dialog - SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); - SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); - SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); + // update runtime codecsettings for use with the codec dialog + SCGetInfo(qtdata->theComponent, scDataRateSettingsType, &qtdata->aDataRateSetting); + SCGetInfo(qtdata->theComponent, scSpatialSettingsType, &qtdata->gSpatialSettings); + SCGetInfo(qtdata->theComponent, scTemporalSettingsType, &qtdata->gTemporalSettings); - //Fill the render QuicktimeCodecSettings struct + //Fill the render QuicktimeCodecSettings struct rd->qtcodecsettings.codecTemporalQuality = (qtdata->gTemporalSettings.temporalQuality * 100) / codecLosslessQuality; - //Do not override scene frame rate (qtdata->gTemporalSettings.framerate) + //Do not override scene frame rate (qtdata->gTemporalSettings.framerate) rd->qtcodecsettings.keyFrameRate = qtdata->gTemporalSettings.keyFrameRate; rd->qtcodecsettings.codecType = qtdata->gSpatialSettings.codecType; @@ -838,26 +839,26 @@ static int request_qtcodec_settings(bContext *C, wmOperator *op) rd->qtcodecsettings.bitRate = qtdata->aDataRateSetting.dataRate; rd->qtcodecsettings.minSpatialQuality = (qtdata->aDataRateSetting.minSpatialQuality * 100) / codecLosslessQuality; rd->qtcodecsettings.minTemporalQuality = (qtdata->aDataRateSetting.minTemporalQuality * 100) / codecLosslessQuality; - //Frame duration is already known (qtdata->aDataRateSetting.frameDuration) + //Frame duration is already known (qtdata->aDataRateSetting.frameDuration) QT_SaveCodecSettingsToScene(rd, op->reports); // framerate jugglin' - if (qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps + if (qtdata->gTemporalSettings.frameRate == 1571553) { // 23.98 fps qtdata->kVideoTimeScale = 24000; qtdata->duration = 1001; rd->frs_sec = 24; rd->frs_sec_base = 1.001; } - else if (qtdata->gTemporalSettings.frameRate == 1964113) { // 29.97 fps + else if (qtdata->gTemporalSettings.frameRate == 1964113) { // 29.97 fps qtdata->kVideoTimeScale = 30000; qtdata->duration = 1001; rd->frs_sec = 30; rd->frs_sec_base = 1.001; } - else if (qtdata->gTemporalSettings.frameRate == 3928227) { // 59.94 fps + else if (qtdata->gTemporalSettings.frameRate == 3928227) { // 59.94 fps qtdata->kVideoTimeScale = 60000; qtdata->duration = 1001; @@ -917,7 +918,7 @@ void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot) ot->poll = ED_operator_setqtcodec; /* flags */ - ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } #endif /* USE_QTKIT */ diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 3e4e53418ac..f3e71feec58 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -58,35 +58,35 @@ #include "quicktime_import.h" #include "quicktime_export.h" -#define RECT_WIDTH(r) (r.right-r.left) -#define RECT_HEIGHT(r) (r.bottom-r.top) +#define RECT_WIDTH(r) (r.right - r.left) +#define RECT_HEIGHT(r) (r.bottom - r.top) #define QTIME_DEBUG 0 typedef struct _QuicktimeMovie { - GWorldPtr offscreenGWorld; - PixMapHandle offscreenPixMap; - Movie movie; - Rect movieBounds; - short movieRefNum; - short movieResId; - int movWidth, movHeight; + GWorldPtr offscreenGWorld; + PixMapHandle offscreenPixMap; + Movie movie; + Rect movieBounds; + short movieRefNum; + short movieResId; + int movWidth, movHeight; - int framecount; + int framecount; - ImBuf *ibuf; + ImBuf *ibuf; - TimeValue *frameIndex; - Media theMedia; - Track theTrack; - long trackIndex; - short depth; + TimeValue *frameIndex; + Media theMedia; + Track theTrack; + long trackIndex; + short depth; - int have_gw; //ugly + int have_gw; /* ugly */ } QuicktimeMovie; @@ -105,7 +105,7 @@ void quicktime_init(void) #endif /* _WIN32 */ /* Initialize QuickTime */ -#if defined(_WIN32) || defined (__APPLE__) +#if defined(_WIN32) || defined(__APPLE__) nerr = EnterMovies(); if (nerr != noErr) G.have_quicktime = FALSE; @@ -113,7 +113,7 @@ void quicktime_init(void) #endif /* _WIN32 || __APPLE__ */ #ifdef __linux__ /* inititalize quicktime codec registry */ - lqt_registry_init(); + lqt_registry_init(); #endif G.have_quicktime = TRUE; } @@ -141,7 +141,7 @@ char *get_valid_qtname(char *name) TCHAR Buffer[MAX_PATH]; DWORD dwRet; char *qtname; - DynStr *ds= BLI_dynstr_new(); + DynStr *ds = BLI_dynstr_new(); dwRet = GetCurrentDirectory(MAX_PATH, Buffer); @@ -166,7 +166,7 @@ char *get_valid_qtname(char *name) BLI_dynstr_append(ds, name); } - qtname= BLI_dynstr_get_cstring(ds); + qtname = BLI_dynstr_get_cstring(ds); BLI_dynstr_free(ds); return qtname; @@ -176,33 +176,33 @@ char *get_valid_qtname(char *name) int anim_is_quicktime(const char *name) { - FSSpec theFSSpec; - char theFullPath[255]; + FSSpec theFSSpec; + char theFullPath[255]; - Boolean isMovieFile = false; - AliasHandle myAlias = NULL; - Component myImporter = NULL; + Boolean isMovieFile = false; + AliasHandle myAlias = NULL; + Component myImporter = NULL; #ifdef __APPLE__ - FInfo myFinderInfo; - FSRef myRef; + FInfo myFinderInfo; + FSRef myRef; #else char *qtname; - Str255 dst; + Str255 dst; #endif - OSErr err = noErr; + OSErr err = noErr; // don't let quicktime movie import handle these - if ( BLI_testextensie(name, ".swf") || - BLI_testextensie(name, ".txt") || - BLI_testextensie(name, ".mpg") || - BLI_testextensie(name, ".avi") || // wouldnt be appropriate ;) - BLI_testextensie(name, ".tga") || - BLI_testextensie(name, ".png") || - BLI_testextensie(name, ".bmp") || - BLI_testextensie(name, ".jpg") || - BLI_testextensie(name, ".wav") || - BLI_testextensie(name, ".zip") || - BLI_testextensie(name, ".mp3")) + if (BLI_testextensie(name, ".swf") || + BLI_testextensie(name, ".txt") || + BLI_testextensie(name, ".mpg") || + BLI_testextensie(name, ".avi") || /* wouldnt be appropriate ;) */ + BLI_testextensie(name, ".tga") || + BLI_testextensie(name, ".png") || + BLI_testextensie(name, ".bmp") || + BLI_testextensie(name, ".jpg") || + BLI_testextensie(name, ".wav") || + BLI_testextensie(name, ".zip") || + BLI_testextensie(name, ".mp3")) { return 0; } @@ -245,7 +245,7 @@ int anim_is_quicktime(const char *name) } } - if ((err == noErr) && (myImporter != NULL)) { // this file is a movie file + if ((err == noErr) && (myImporter != NULL)) { /* this file is a movie file */ isMovieFile = true; } @@ -268,8 +268,8 @@ void free_anim_quicktime(struct anim *anim) DisposeMovie(anim->qtime->movie); CloseMovieFile(anim->qtime->movieRefNum); - if (anim->qtime->frameIndex) MEM_freeN (anim->qtime->frameIndex); - if (anim->qtime) MEM_freeN (anim->qtime); + if (anim->qtime->frameIndex) MEM_freeN(anim->qtime->frameIndex); + if (anim->qtime) MEM_freeN(anim->qtime); anim->qtime = NULL; @@ -280,17 +280,17 @@ void free_anim_quicktime(struct anim *anim) static OSErr QT_get_frameIndexes(struct anim *anim) { int i; - OSErr anErr = noErr; - OSType media = VideoMediaType; + OSErr anErr = noErr; + OSType media = VideoMediaType; TimeValue nextTime = 0; - TimeValue startPoint; - TimeValue tmpstartPoint; + TimeValue startPoint; + TimeValue tmpstartPoint; long sampleCount = 0; startPoint = -1; - GetMovieNextInterestingTime(anim->qtime->movie, nextTimeMediaSample+nextTimeEdgeOK, (TimeValue)1, &media, 0, - 1, &startPoint, NULL); + GetMovieNextInterestingTime(anim->qtime->movie, nextTimeMediaSample + nextTimeEdgeOK, (TimeValue)1, &media, 0, + 1, &startPoint, NULL); tmpstartPoint = startPoint; @@ -320,16 +320,16 @@ static OSErr QT_get_frameIndexes(struct anim *anim) } -ImBuf * qtime_fetchibuf (struct anim *anim, int position) +ImBuf *qtime_fetchibuf(struct anim *anim, int position) { - PixMapHandle myPixMap = NULL; - Ptr myPtr; + PixMapHandle myPixMap = NULL; + Ptr myPtr; - register int index; - register int boxsize; + register int index; + register int boxsize; - register uint32_t *readPos; - register uint32_t *changePos; + register uint32_t *readPos; + register uint32_t *changePos; ImBuf *ibuf = NULL; unsigned int *rect; @@ -344,7 +344,7 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) return (NULL); } - ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect); + ibuf = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect); rect = ibuf->rect; SetMovieTimeValue(anim->qtime->movie, anim->qtime->frameIndex[position]); @@ -356,8 +356,8 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) myPtr = GetPixBaseAddr(myPixMap); if (myPtr == NULL) { - printf ("Error reading frame from Quicktime"); - IMB_freeImBuf (ibuf); + printf("Error reading frame from Quicktime"); + IMB_freeImBuf(ibuf); return NULL; } @@ -367,10 +367,10 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) #ifdef __APPLE__ // Swap alpha byte to the end, so ARGB become RGBA; - from= (unsigned char *)readPos; - to= (unsigned char *)changePos; + from = (unsigned char *)readPos; + to = (unsigned char *)changePos; - for ( index = 0; index < boxsize; index++, from+=4, to+=4 ) { + for (index = 0; index < boxsize; index++, from += 4, to += 4) { to[3] = from[0]; to[0] = from[1]; to[1] = from[2]; @@ -379,14 +379,14 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) #endif #ifdef _WIN32 - for ( index = 0; index < boxsize; index++, changePos++, readPos++ ) - *( changePos ) = *(readPos ); + for (index = 0; index < boxsize; index++, changePos++, readPos++) + *(changePos) = *(readPos); if (anim->qtime->depth < 32) { //add alpha to ibuf boxsize = anim->x * anim->y * 4; crect = (unsigned char *) rect; - for ( index = 0; index < boxsize; index+=4, crect+=4 ) { + for (index = 0; index < boxsize; index += 4, crect += 4) { crect[3] = 0xFF; } } @@ -403,12 +403,12 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) static int GetFirstVideoMedia(struct anim *anim) { - long numTracks; - OSType mediaType; + long numTracks; + OSType mediaType; numTracks = GetMovieTrackCount(anim->qtime->movie); - for (anim->qtime->trackIndex=1; anim->qtime->trackIndex<=numTracks; (anim->qtime->trackIndex)++) { + for (anim->qtime->trackIndex = 1; anim->qtime->trackIndex <= numTracks; (anim->qtime->trackIndex)++) { anim->qtime->theTrack = GetMovieIndTrack(anim->qtime->movie, anim->qtime->trackIndex); if (anim->qtime->theTrack) @@ -425,7 +425,7 @@ static int GetFirstVideoMedia(struct anim *anim) static short GetFirstVideoTrackPixelDepth(struct anim *anim) { - SampleDescriptionHandle imageDescH = (SampleDescriptionHandle)NewHandle(sizeof(Handle)); + SampleDescriptionHandle imageDescH = (SampleDescriptionHandle)NewHandle(sizeof(Handle)); // long trackIndex = 0; /*unused*/ if (!GetFirstVideoMedia(anim)) @@ -440,19 +440,19 @@ static short GetFirstVideoTrackPixelDepth(struct anim *anim) int startquicktime(struct anim *anim) { - FSSpec theFSSpec; + FSSpec theFSSpec; - OSErr err = noErr; - char theFullPath[255]; + OSErr err = noErr; + char theFullPath[255]; #ifdef __APPLE__ - FSRef myRef; + FSRef myRef; #else - char *qtname; - Str255 dst; + char *qtname; + Str255 dst; #endif short depth = 0; - anim->qtime = MEM_callocN (sizeof(QuicktimeMovie), "animqt"); + anim->qtime = MEM_callocN(sizeof(QuicktimeMovie), "animqt"); anim->qtime->have_gw = FALSE; if (anim->qtime == NULL) { @@ -481,8 +481,8 @@ int startquicktime(struct anim *anim) if (err == noErr) { if (QTIME_DEBUG) printf("qt: movie opened\n"); err = NewMovieFromFile(&anim->qtime->movie, - anim->qtime->movieRefNum, - &anim->qtime->movieResId, NULL, newMovieActive, NULL); + anim->qtime->movieRefNum, + &anim->qtime->movieResId, NULL, newMovieActive, NULL); } if (err) { @@ -506,22 +506,22 @@ int startquicktime(struct anim *anim) return -1; } - anim->qtime->ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect); + anim->qtime->ibuf = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect); #ifdef _WIN32 err = NewGWorldFromPtr(&anim->qtime->offscreenGWorld, - k32RGBAPixelFormat, - &anim->qtime->movieBounds, - NULL, NULL, 0, - (unsigned char *)anim->qtime->ibuf->rect, - anim->x * 4); + k32RGBAPixelFormat, + &anim->qtime->movieBounds, + NULL, NULL, 0, + (unsigned char *)anim->qtime->ibuf->rect, + anim->x * 4); #else err = NewGWorldFromPtr(&anim->qtime->offscreenGWorld, - k32ARGBPixelFormat, - &anim->qtime->movieBounds, - NULL, NULL, 0, - (unsigned char *)anim->qtime->ibuf->rect, - anim->x * 4); + k32ARGBPixelFormat, + &anim->qtime->movieBounds, + NULL, NULL, 0, + (unsigned char *)anim->qtime->ibuf->rect, + anim->x * 4); #endif /* _WIN32 */ if (err == noErr) { @@ -554,29 +554,29 @@ int startquicktime(struct anim *anim) anim->curposition = 0; if (QTIME_DEBUG) printf("qt: load %s %dx%dx%d frames %d\n", anim->name, anim->qtime->movWidth, - anim->qtime->movHeight, anim->qtime->depth, anim->qtime->framecount); + anim->qtime->movHeight, anim->qtime->depth, anim->qtime->framecount); return 0; } -int imb_is_a_quicktime (char *name) +int imb_is_a_quicktime(char *name) { - GraphicsImportComponent theImporter = NULL; + GraphicsImportComponent theImporter = NULL; - FSSpec theFSSpec; + FSSpec theFSSpec; #ifdef _WIN32 - Str255 dst; /*unused*/ + Str255 dst; /*unused*/ #endif - char theFullPath[255]; + char theFullPath[255]; // Boolean isMovieFile = false; /*unused*/ // AliasHandle myAlias = NULL; /*unused*/ // Component myImporter = NULL; /*unused*/ #ifdef __APPLE__ // FInfo myFinderInfo; /*unused*/ - FSRef myRef; + FSRef myRef; #endif - OSErr err = noErr; + OSErr err = noErr; if (!G.have_quicktime) return 0; @@ -587,7 +587,7 @@ int imb_is_a_quicktime (char *name) BLI_testextensie(name, ".txt") || BLI_testextensie(name, ".mpg") || BLI_testextensie(name, ".wav") || - BLI_testextensie(name, ".mov") || // not as image, doesn't work + BLI_testextensie(name, ".mov") || // not as image, doesn't work BLI_testextensie(name, ".avi") || BLI_testextensie(name, ".mp3")) { @@ -616,30 +616,30 @@ int imb_is_a_quicktime (char *name) ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) { - Rect myRect; - OSErr err = noErr; - GraphicsImportComponent gImporter = NULL; + Rect myRect; + OSErr err = noErr; + GraphicsImportComponent gImporter = NULL; - ImageDescriptionHandle desc; + ImageDescriptionHandle desc; - ComponentInstance dataHandler; + ComponentInstance dataHandler; PointerDataRef dataref; int x, y, depth; int have_gw = FALSE; ImBuf *ibuf = NULL; // ImBuf *imbuf = NULL; /*unused*/ - GWorldPtr offGWorld; - PixMapHandle myPixMap = NULL; + GWorldPtr offGWorld; + PixMapHandle myPixMap = NULL; #ifdef __APPLE__ - Ptr myPtr; + Ptr myPtr; - register int index; - register int boxsize; + register int index; + register int boxsize; - register uint32_t *readPos; - register uint32_t *changePos; + register uint32_t *readPos; + register uint32_t *changePos; ImBuf *wbuf = NULL; unsigned int *rect; @@ -651,17 +651,17 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) if (QTIME_DEBUG) printf("qt: attempt to load mem as image\n"); - dataref= (PointerDataRef)NewHandle(sizeof(PointerDataRefRecord)); + dataref = (PointerDataRef)NewHandle(sizeof(PointerDataRefRecord)); (**dataref).data = mem; (**dataref).dataLength = size; err = OpenADataHandler((Handle)dataref, - PointerDataHandlerSubType, - nil, - (OSType)0, - nil, - kDataHCanRead, - &dataHandler); + PointerDataHandlerSubType, + nil, + (OSType)0, + nil, + kDataHCanRead, + &dataHandler); if (err != noErr) { if (QTIME_DEBUG) printf("no datahandler\n"); goto bail; @@ -679,7 +679,7 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) goto bail; } - err = GraphicsImportGetImageDescription (gImporter, &desc ); + err = GraphicsImportGetImageDescription(gImporter, &desc); if (err != noErr) { if (QTIME_DEBUG) printf("no imagedescription\n"); goto bail; @@ -693,26 +693,26 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) ibuf = IMB_allocImBuf(x, y, depth, 0); ibuf->ftype = QUICKTIME; DisposeHandle((Handle)dataref); - if (gImporter != NULL) CloseComponent(gImporter); + if (gImporter != NULL) CloseComponent(gImporter); return ibuf; } #ifdef __APPLE__ - ibuf = IMB_allocImBuf (x, y, 32, IB_rect); - wbuf = IMB_allocImBuf (x, y, 32, IB_rect); + ibuf = IMB_allocImBuf(x, y, 32, IB_rect); + wbuf = IMB_allocImBuf(x, y, 32, IB_rect); err = NewGWorldFromPtr(&offGWorld, - k32ARGBPixelFormat, - &myRect, NULL, NULL, 0, - (unsigned char *)wbuf->rect, x * 4); + k32ARGBPixelFormat, + &myRect, NULL, NULL, 0, + (unsigned char *)wbuf->rect, x * 4); #else - ibuf = IMB_allocImBuf (x, y, 32, IB_rect); + ibuf = IMB_allocImBuf(x, y, 32, IB_rect); err = NewGWorldFromPtr(&offGWorld, - k32RGBAPixelFormat, - &myRect, NULL, NULL, 0, - (unsigned char *)ibuf->rect, x * 4); + k32RGBAPixelFormat, + &myRect, NULL, NULL, 0, + (unsigned char *)ibuf->rect, x * 4); #endif if (err != noErr) { @@ -734,8 +734,8 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) myPtr = GetPixBaseAddr(myPixMap); if (myPtr == NULL) { - printf ("Error reading frame from Quicktime"); - IMB_freeImBuf (ibuf); + printf("Error reading frame from Quicktime"); + IMB_freeImBuf(ibuf); return NULL; } @@ -744,10 +744,10 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags) changePos = (uint32_t *) rect; // Swap alpha byte to the end, so ARGB become RGBA; - from= (unsigned char *)readPos; - to= (unsigned char *)changePos; + from = (unsigned char *)readPos; + to = (unsigned char *)changePos; - for ( index = 0; index < boxsize; index++, from+=4, to+=4 ) { + for (index = 0; index < boxsize; index++, from += 4, to += 4) { to[3] = from[0]; to[0] = from[1]; to[1] = from[2]; @@ -763,17 +763,17 @@ bail: #ifdef __APPLE__ if (wbuf) { - IMB_freeImBuf (wbuf); + IMB_freeImBuf(wbuf); wbuf = NULL; } #endif - if (gImporter != NULL) CloseComponent(gImporter); + if (gImporter != NULL) CloseComponent(gImporter); if (err != noErr) { if (QTIME_DEBUG) printf("quicktime import unsuccesfull\n"); if (ibuf) { - IMB_freeImBuf (ibuf); + IMB_freeImBuf(ibuf); ibuf = NULL; } } @@ -788,8 +788,8 @@ bail: int box = x * y; unsigned char *arect = (unsigned char *) ibuf->rect; - if ( depth < 32 && (**desc).cType != kGIFCodecType) { - for (i = 0; i < box; i++, arect+=4) + if (depth < 32 && (**desc).cType != kGIFCodecType) { + for (i = 0; i < box; i++, arect += 4) arect[3] = 0xFF; } #endif |