various small code cleanups and improvements

Largely refactoring work to make the code somewhat nicer to work with.

app/render/pixelservice.h

@@ -22,31 +22,10 @@
 #define PIXELSERVICE_H
 
 #include <QString>
-#include <QOpenGLExtraFunctions>
-#include <OpenImageIO/imageio.h>
 
 #include "codec/frame.h"
 #include "pixelformat.h"
 
-/**
- * @brief A struct of information pertaining to each enum PixelFormat.
- *
- * Primarily this is a means of retrieving OpenGL texture information for different pixel formats/bit depths. Both
- * RAM and VRAM buffers will need a PixelFormat. To keep consistency between the OpenGL code and CPU code when using
- * a given PixelFormat, the PixelFormatInfo struct contains all necessary variables that you'll need to plug into
- * OpenGL.
- *
- * Use the static function PixelService::GetPixelFormatInfo to generate a PixelFormatInfo object.
- */
-struct PixelFormatInfo {
-  QString name;
-  GLint internal_format;
-  GLenum pixel_format;
-  GLenum gl_pixel_type;
-  int bytes_per_pixel;
-  OIIO::TypeDesc oiio_desc;
-};
-
 class PixelService : public QObject {
 public:
 
@@ -57,7 +36,7 @@ public:
    *
    * \see PixelFormatInfo
    */
-  static PixelFormatInfo GetPixelFormatInfo(const olive::PixelFormat& format);
+  static PixelFormat::Info GetPixelFormatInfo(const PixelFormat::Format& format);
 
   /**
    * @brief Returns the minimum buffer size (in bytes) necessary for a given format, width, and height.
@@ -74,7 +53,7 @@ public:
    *
    * The height (in pixels) of the buffer.
    */
-  static int GetBufferSize(const olive::PixelFormat &format, const int& width, const int& height);
+  static int GetBufferSize(const PixelFormat::Format &format, const int& width, const int& height);
 
   /**
    * @brief Returns the number of bytes per pixel for a certain format
@@ -83,19 +62,19 @@ public:
    * requires for a certain format. The number of bytes will always be a multiple of 4 since all formats use RGBA and
    * are at least 1 bpc.
    */
-  static int BytesPerPixel(const olive::PixelFormat& format);
+  static int BytesPerPixel(const PixelFormat::Format &format);
 
   /**
    * @brief Returns the number of bytes per channel for a certain format
    */
-  static int BytesPerChannel(const olive::PixelFormat& format);
+  static int BytesPerChannel(const PixelFormat::Format& format);
 
   /**
    * @brief Convert a frame to a pixel format
    *
    * If the frame's pixel format == the destination format, this just returns `frame`.
    */
-  static FramePtr ConvertPixelFormat(FramePtr frame, const olive::PixelFormat &dest_format);
+  static FramePtr ConvertPixelFormat(FramePtr frame, const PixelFormat::Format &dest_format);
 
   /**
    * @brief Convert an RGB image to an RGBA image