diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2010-09-26 20:11:53 +0400 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2010-09-26 20:11:53 +0400 |
| commit | cf6b2ca034d1a2d41ac04de1a1ababb1db39df3e (patch) | |
| tree | b9fc983ca6c3758ff19633e3212f84c810928841 /source/blender/quicktime | |
| parent | 47628dfab63acd6099216db7e9d011b739e3a287 (diff) | |
Fix for [#23912]: Replace by integer comparison a float comparison whose precision errors was causing an infinite loop during last frame audio conversion
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 35f3629cb61..73e23ea8abd 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -587,6 +587,7 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSBitmapImageRep *blBitmapFormatImage; NSImage *frameImage; + OSStatus err = noErr; unsigned char *from_Ptr,*to_Ptr; int y,from_i,to_i; @@ -628,8 +629,7 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect if (qtexport->audioFile) { UInt32 audioPacketsConverted; /* Append audio */ - while (((double)qtexport->audioTotalExportedFrames / (double) qtexport->audioInputFormat.mSampleRate) - < ((double)(frame - rd->sfra)) / (((double)rd->frs_sec) / rd->frs_sec_base)) { + while (qtexport->audioTotalExportedFrames < qtexport->audioLastFrame) { qtexport->audioBufferList.mNumberBuffers = 1; qtexport->audioBufferList.mBuffers[0].mNumberChannels = qtexport->audioOutputFormat.mChannelsPerFrame; @@ -637,7 +637,7 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect qtexport->audioBufferList.mBuffers[0].mData = qtexport->audioOutputBuffer; audioPacketsConverted = AUDIOOUTPUTBUFFERSIZE / qtexport->audioCodecMaxOutputPacketSize; - AudioConverterFillComplexBuffer(qtexport->audioConverter, AudioConverterInputCallback, + err = AudioConverterFillComplexBuffer(qtexport->audioConverter, AudioConverterInputCallback, NULL, &audioPacketsConverted, &qtexport->audioBufferList, qtexport->audioOutputPktDesc); if (audioPacketsConverted) { AudioFileWritePackets(qtexport->audioFile, false, qtexport->audioBufferList.mBuffers[0].mDataByteSize, @@ -656,6 +656,12 @@ int append_qt(struct RenderData *rd, int frame, int *pixels, int rectx, int rect } + else { + //Error getting audio packets + BKE_reportf(reports, RPT_ERROR, "Unable to get further audio packets from frame %i, error = 0x%x",qtexport->audioTotalExportedFrames,err); + break; + } + } } [pool drain]; |