oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

export: allow rgb32f and rgba32f to pass through ocio without conversion

Browse Source 
Minor optimization.
This commit is contained in:
itsmattkc
2020-07-24 14:45:55 +10:00
parent 5235975d6d
commit dca4c6d960
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/export/export.cpp
+11 -2
View File
@@ -118,8 +118,17 @@ bool ExportTask::Run()
void FrameColorConvert(ColorProcessorPtr processor, FramePtr frame)
{
// OCIO conversion requires a frame in 32F format
if (frame->format() != PixelFormat::PIX_FMT_RGBA32F) {
frame = PixelFormat::ConvertPixelFormat(frame, PixelFormat::PIX_FMT_RGBA32F);
if (frame->format() != PixelFormat::PIX_FMT_RGBA32F
&& frame->format() != PixelFormat::PIX_FMT_RGB32F) {
PixelFormat::Format dst;
if (PixelFormat::FormatHasAlphaChannel(frame->format())) {
dst = PixelFormat::PIX_FMT_RGBA32F;
} else {
dst = PixelFormat::PIX_FMT_RGB32F;
}
frame = PixelFormat::ConvertPixelFormat(frame, dst);
}
// Color conversion must be done with unassociated alpha, and the pipeline is always associated