izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

MediaFramework: Fixed EXR images not being written out correctly causing them to be very slow to load in.

Browse Source 
#JIRA: UE-71531
#review @Rod.Bogart
#rb Rod.Bogart

[CL 7250352 by Tony Wong in Dev-Editor branch]
This commit is contained in:
Tony Wong
2019-07-09 15:13:47 -04:00
parent f5e7b1380e
commit cc6f767603
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/ImageWrapper/Private/Formats/ExrImageWrapper.cpp
+15 -7
View File
@@ -328,14 +328,22 @@ void FExrImageWrapper::CompressRaw(const sourcetype* SrcData, bool bIgnoreAlpha)
WriteFrameBufferChannel<OutputFormat>(ImfFrameBuffer, GetRawChannelName(Channel), SrcData + Channel, ChannelOutputBuffers[Channel]);
}
Imf::OutputFile ImfFile(MemFile, Header);
ImfFile.setFrameBuffer(ImfFrameBuffer);
MemFile.Data.AddUninitialized(Width * Height * NumWriteComponents * (OutputFormat == 2 ? 4 : 2));
ImfFile.writePixels(Height);
uint32 FileLength;
{
// This scope ensures that IMF::Outputfile creates a complete file by closing the file when it goes out of scope.
// To complete the file, EXR seeks back into the file and writes the scanline offsets when the file is closed,
// which moves the tellp location. So file length is stored in advance for later use.
CompressedData.AddUninitialized(MemFile.tellp());
FMemory::Memcpy(CompressedData.GetData(), MemFile.Data.GetData(), MemFile.tellp());
Imf::OutputFile ImfFile(MemFile, Header);
ImfFile.setFrameBuffer(ImfFrameBuffer);
MemFile.Data.AddUninitialized(Width * Height * NumWriteComponents * (OutputFormat == 2 ? 4 : 2));
ImfFile.writePixels(Height);
FileLength = MemFile.tellp();
}
CompressedData.AddUninitialized(FileLength);
FMemory::Memcpy(CompressedData.GetData(), MemFile.Data.GetData(), FileLength);
const double DeltaTime = FPlatformTime::Seconds() - StartTime;
UE_LOG(LogImageWrapper, Verbose, TEXT("Compressed image in %.3f seconds"), DeltaTime);