various: pixel optimizations

Several things are accomplished in this commit, including: - Use OIIO instead of our own functions for pixel format conversions (cleaner code/less for us to maintain) - Fold all PixelService functions into the PixelFormat class (cleaner code) - Moved OpenGL pixel definitions to OpenGL classes and out of the global classes. - Add support for RGB buffers as well as RGBA (optimization)
2020-02-27 13:54:38 +11:00
parent 0624184b18
commit 02ce48d0c6
27 changed files with 491 additions and 564 deletions
@@ -19,3 +19,237 @@
 ***/

 #include "pixelformat.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFloat16>
+
+#include "common/define.h"
+#include "core.h"
+
+bool PixelFormat::FormatHasAlphaChannel(const PixelFormat::Format &format)
+{
+  switch (format) {
+  case PixelFormat::PIX_FMT_RGBA8:
+  case PixelFormat::PIX_FMT_RGBA16U:
+  case PixelFormat::PIX_FMT_RGBA16F:
+  case PixelFormat::PIX_FMT_RGBA32F:
+    return true;
+  case PixelFormat::PIX_FMT_RGB8:
+  case PixelFormat::PIX_FMT_RGB16U:
+  case PixelFormat::PIX_FMT_RGB16F:
+  case PixelFormat::PIX_FMT_RGB32F:
+  case PixelFormat::PIX_FMT_INVALID:
+  case PixelFormat::PIX_FMT_COUNT:
+    break;
+  }
+
+  return false;
+}
+
+OIIO::TypeDesc PixelFormat::GetOIIOTypeDesc(const PixelFormat::Format &format)
+{
+  switch (format) {
+  case PixelFormat::PIX_FMT_RGB8:
+  case PixelFormat::PIX_FMT_RGBA8:
+    return OIIO::TypeDesc::UINT8;
+  case PixelFormat::PIX_FMT_RGB16U:
+  case PixelFormat::PIX_FMT_RGBA16U:
+    return OIIO::TypeDesc::UINT16;
+  case PixelFormat::PIX_FMT_RGB16F:
+  case PixelFormat::PIX_FMT_RGBA16F:
+    return OIIO::TypeDesc::HALF;
+  case PixelFormat::PIX_FMT_RGB32F:
+  case PixelFormat::PIX_FMT_RGBA32F:
+    return OIIO::TypeDesc::FLOAT;
+  case PixelFormat::PIX_FMT_INVALID:
+  case PixelFormat::PIX_FMT_COUNT:
+    break;
+  }
+
+  return OIIO::TypeDesc::UNKNOWN;
+}
+
+QString PixelFormat::GetName(const PixelFormat::Format &format)
+{
+  switch (format) {
+  case PixelFormat::PIX_FMT_RGB8:
+  case PixelFormat::PIX_FMT_RGBA8:
+    return tr("8-bit");
+  case PixelFormat::PIX_FMT_RGB16U:
+  case PixelFormat::PIX_FMT_RGBA16U:
+    return tr("16-bit Integer");
+  case PixelFormat::PIX_FMT_RGB16F:
+  case PixelFormat::PIX_FMT_RGBA16F:
+    return tr("Half-Float (16-bit)");
+  case PixelFormat::PIX_FMT_RGB32F:
+  case PixelFormat::PIX_FMT_RGBA32F:
+    return tr("Full-Float (32-bit)");
+  case PixelFormat::PIX_FMT_INVALID:
+  case PixelFormat::PIX_FMT_COUNT:
+    break;
+  }
+
+  return tr("Unknown (%1)").arg(format);
+}
+
+PixelFormat* PixelFormat::instance_ = nullptr;
+
+void PixelFormat::CreateInstance()
+{
+  instance_ = new PixelFormat();
+}
+
+void PixelFormat::DestroyInstance()
+{
+  delete instance_;
+}
+
+PixelFormat *PixelFormat::instance()
+{
+  return instance_;
+}
+
+PixelFormat::Format PixelFormat::GetConfiguredFormatForMode(RenderMode::Mode mode)
+{
+  return static_cast<PixelFormat::Format>(Core::GetPreferenceForRenderMode(mode, QStringLiteral("PixelFormat")).toInt());
+}
+
+void PixelFormat::SetConfiguredFormatForMode(RenderMode::Mode mode, PixelFormat::Format format)
+{
+  if (format != GetConfiguredFormatForMode(mode)) {
+    Core::SetPreferenceForRenderMode(mode, QStringLiteral("PixelFormat"), format);
+
+    emit FormatChanged();
+  }
+}
+
+PixelFormat::Format PixelFormat::OIIOFormatToOliveFormat(OIIO::TypeDesc desc, bool has_alpha)
+{
+  if (desc == OIIO::TypeDesc::UINT8) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA8 : PixelFormat::PIX_FMT_RGB8;
+  } else if (desc == OIIO::TypeDesc::UINT16) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA16U : PixelFormat::PIX_FMT_RGB16U;
+  } else if (desc == OIIO::TypeDesc::HALF) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA16F : PixelFormat::PIX_FMT_RGB16F;
+  } else if (desc == OIIO::TypeDesc::FLOAT) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA32F : PixelFormat::PIX_FMT_RGB32F;
+  }
+
+  return PixelFormat::PIX_FMT_INVALID;
+}
+
+/*PixelFormat::Info PixelFormat::GetPixelFormatInfo(const PixelFormat::Format &format)
+{
+  PixelFormat::Info info;
+
+  switch (format) {
+  case PixelFormat::PIX_FMT_RGB8:
+  case PixelFormat::PIX_FMT_RGBA8:
+    info.name = tr("8-bit");
+    info.internal_format = (format == PixelFormat::PIX_FMT_RGB8) ? GL_RGB8 : GL_RGBA8;
+    info.gl_pixel_type = GL_UNSIGNED_BYTE;
+    info.oiio_desc = OIIO::TypeDesc::UINT8;
+    break;
+  case PixelFormat::PIX_FMT_RGB16U:
+  case PixelFormat::PIX_FMT_RGBA16U:
+    info.name = tr("16-bit Integer");
+    info.internal_format = (format == PixelFormat::PIX_FMT_RGB16U) ? GL_RGB8 : GL_RGBA16;
+    info.gl_pixel_type = GL_UNSIGNED_SHORT;
+    info.oiio_desc = OIIO::TypeDesc::UINT16;
+    break;
+  case PixelFormat::PIX_FMT_RGB16F:
+  case PixelFormat::PIX_FMT_RGBA16F:
+    info.name = tr("Half-Float (16-bit)");
+    info.internal_format = (format == PixelFormat::PIX_FMT_RGB8) ? GL_RGB8 : GL_RGBA16F;
+    info.gl_pixel_type = GL_HALF_FLOAT;
+    info.oiio_desc = OIIO::TypeDesc::HALF;
+    break;
+  case PixelFormat::PIX_FMT_RGB32F:
+  case PixelFormat::PIX_FMT_RGBA32F:
+    info.name = tr("Full-Float (32-bit)");
+    info.internal_format = (format == PixelFormat::PIX_FMT_RGB8) ? GL_RGB8 : GL_RGBA32F;
+    info.gl_pixel_type = GL_FLOAT;
+    info.oiio_desc = OIIO::TypeDesc::FLOAT;
+    break;
+  case PixelFormat::PIX_FMT_INVALID:
+  case PixelFormat::PIX_FMT_COUNT:
+    qFatal("Invalid pixel format requested");
+  }
+
+  info.pixel_format = GL_RGBA;
+  info.bytes_per_pixel = BytesPerPixel(format);
+
+  return info;
+}*/
+
+int PixelFormat::GetBufferSize(const PixelFormat::Format &format, const int &width, const int &height)
+{
+  return BytesPerPixel(format) * width * height;
+}
+
+int PixelFormat::BytesPerPixel(const PixelFormat::Format &format)
+{
+  return BytesPerChannel(format) * ChannelCount(format);
+}
+
+int PixelFormat::BytesPerChannel(const PixelFormat::Format &format)
+{
+  switch (format) {
+  case PixelFormat::PIX_FMT_RGB8:
+  case PixelFormat::PIX_FMT_RGBA8:
+    return 1;
+  case PixelFormat::PIX_FMT_RGB16U:
+  case PixelFormat::PIX_FMT_RGB16F:
+  case PixelFormat::PIX_FMT_RGBA16U:
+  case PixelFormat::PIX_FMT_RGBA16F:
+    return 2;
+  case PixelFormat::PIX_FMT_RGB32F:
+  case PixelFormat::PIX_FMT_RGBA32F:
+    return 4;
+  case PixelFormat::PIX_FMT_INVALID:
+  case PixelFormat::PIX_FMT_COUNT:
+    break;
+  }
+
+  qFatal("Invalid pixel format requested");
+
+  // qFatal will abort so we won't get here, but this suppresses compiler warnings
+  return 0;
+}
+
+int PixelFormat::ChannelCount(const PixelFormat::Format &format)
+{
+  if (PixelFormat::FormatHasAlphaChannel(format)) {
+    return kRGBAChannels;
+  } else {
+    return kRGBChannels;
+  }
+}
+
+FramePtr PixelFormat::ConvertPixelFormat(FramePtr frame, const PixelFormat::Format &dest_format)
+{
+  if (frame->format() == dest_format) {
+    return frame;
+  }
+
+  FramePtr converted = Frame::Create();
+
+  // Copy parameters
+  converted->set_width(frame->width());
+  converted->set_height(frame->height());
+  converted->set_timestamp(frame->timestamp());
+  converted->set_format(dest_format);
+  converted->allocate();
+
+  OIIO::TypeDesc src_type = GetOIIOTypeDesc(frame->format());
+  OIIO::TypeDesc dst_type = GetOIIOTypeDesc(dest_format);
+
+  if (OIIO::convert_type(src_type, frame->data(), dst_type, converted->data())) {
+    return converted;
+  } else {
+    qDebug() << "Failed to convert type:" << OIIO::geterror().c_str();
+    return nullptr;
+  }
+}
+