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

全链路强制F32

Browse Source
This commit is contained in:
Mike-Solar
2026-05-14 01:51:14 +08:00
parent f3c50017e9
commit 599c876d03
9 changed files with 414 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+34
View File
@@ -125,6 +125,24 @@ TexturePtr FFmpegDecoder::ProcessFrameIntoTexture(AVFramePtr f,
instance_.avstream(), nullptr),
VideoParams::kInterlaceNone, p.divider);
// For YUV formats, force the output texture to F32 RGBA for maximum precision
switch (f->format) {
case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUV422P:
case AV_PIX_FMT_YUV444P:
case AV_PIX_FMT_YUV420P10LE:
case AV_PIX_FMT_YUV422P10LE:
case AV_PIX_FMT_YUV444P10LE:
case AV_PIX_FMT_YUV420P12LE:
case AV_PIX_FMT_YUV422P12LE:
case AV_PIX_FMT_YUV444P12LE:
vp.set_format(PixelFormat::F32);
vp.set_channel_count(VideoParams::kRGBAChannelCount);
break;
default:
break;
}
// Create texture
TexturePtr tex = p.renderer->CreateTexture(vp);
@@ -246,6 +264,11 @@ TexturePtr FFmpegDecoder::ProcessFrameIntoTexture(AVFramePtr f,
tex->handleFrame(f);
tex->Upload(f->data[0], f->linesize[0] / vp.GetBytesPerPixel());
break;
case AV_PIX_FMT_RGBAF32:
// RGBA F32 can be uploaded directly to the texture
tex->handleFrame(f);
tex->Upload(f->data[0], f->linesize[0] / vp.GetBytesPerPixel());
break;
}
// Deinterlace if necessary
@@ -752,6 +775,9 @@ PixelFormat FFmpegDecoder::GetNativePixelFormat(AVPixelFormat pix_fmt)
case AV_PIX_FMT_RGB48:
case AV_PIX_FMT_RGBA64:
return PixelFormat::U16;
case AV_PIX_FMT_RGBF32:
case AV_PIX_FMT_RGBAF32:
return PixelFormat::F32;
default:
return PixelFormat::INVALID;
}
@@ -762,9 +788,11 @@ int FFmpegDecoder::GetNativeChannelCount(AVPixelFormat pix_fmt)
switch (pix_fmt) {
case AV_PIX_FMT_RGB24:
case AV_PIX_FMT_RGB48:
case AV_PIX_FMT_RGBF32:
return VideoParams::kRGBChannelCount;
case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA64:
case AV_PIX_FMT_RGBAF32:
return VideoParams::kRGBAChannelCount;
default:
return 0;
@@ -807,6 +835,7 @@ bool FFmpegDecoder::IsPixelFormatGLSLCompatible(AVPixelFormat f)
case AV_PIX_FMT_YUV444P12LE:
case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_RGBA64LE:
case AV_PIX_FMT_RGBAF32:
return true;
default:
return false;
@@ -856,6 +885,11 @@ AVFramePtr FFmpegDecoder::PreProcessFrame(AVFramePtr f,
static_cast<AVPixelFormat>(dest->format), p.maximum_format);
}
// swscale does not support RGBAF32 as output, fallback to RGBA64
if (dest->format == AV_PIX_FMT_RGBAF32) {
dest->format = AV_PIX_FMT_RGBA64;
}
int r = av_frame_get_buffer(dest.get(), 0);
if (r < 0) {
FFmpegError(r);
app/codec/oiio/oiiodecoder.cpp
+11
View File
@@ -159,6 +159,17 @@ TexturePtr OIIODecoder::RetrieveVideoInternal(const RetrieveVideoParams &p)
}
}
// Force F32 output for all still images
if (vp.format() != PixelFormat::F32) {
FramePtr f32_frame = buffer_.convert(PixelFormat::F32);
if (f32_frame) {
VideoParams f32_vp = vp;
f32_vp.set_format(PixelFormat::F32);
return p.renderer->CreateTexture(f32_vp, f32_frame->data(),
f32_frame->linesize_pixels());
}
}
return p.renderer->CreateTexture(vp, buffer_.data(),
buffer_.linesize_pixels());
}