start moving core frameworks to external libraries

app/codec/ffmpeg/ffmpegdecoder.cpp

@@ -42,7 +42,6 @@ extern "C" {
 #include "codec/planarfiledevice.h"
 #include "common/ffmpegutils.h"
 #include "common/filefunctions.h"
-#include "common/timecodefunctions.h"
 #include "render/renderer.h"
 #include "render/subtitleparams.h"
 
@@ -78,7 +77,7 @@ TexturePtr FFmpegDecoder::ProcessFrameIntoTexture(AVFramePtr f, const RetrieveVi
 {
   // Determine native format
   AVPixelFormat ideal_fmt = FFmpegUtils::GetCompatiblePixelFormat(static_cast<AVPixelFormat>(f->format));
-  VideoParams::Format native_fmt = GetNativePixelFormat(ideal_fmt);
+  PixelFormat native_fmt = GetNativePixelFormat(ideal_fmt);
   int native_channels = GetNativeChannelCount(ideal_fmt);
 
   // Set up video params
@@ -642,17 +641,17 @@ bool FFmpegDecoder::ConformAudioInternal(const QVector<QString> &filenames, cons
   return success;
 }
 
-VideoParams::Format FFmpegDecoder::GetNativePixelFormat(AVPixelFormat pix_fmt)
+PixelFormat FFmpegDecoder::GetNativePixelFormat(AVPixelFormat pix_fmt)
 {
   switch (pix_fmt) {
   case AV_PIX_FMT_RGB24:
   case AV_PIX_FMT_RGBA:
-    return VideoParams::kFormatUnsigned8;
+    return PixelFormat::U8;
   case AV_PIX_FMT_RGB48:
   case AV_PIX_FMT_RGBA64:
-    return VideoParams::kFormatUnsigned16;
+    return PixelFormat::U16;
   default:
-    return VideoParams::kFormatInvalid;
+    return PixelFormat::INVALID;
   }
 }
 

app/codec/ffmpeg/ffmpegdecoder.h

@@ -136,7 +136,7 @@ private:
 
   void FreeScaler();
 
-  static VideoParams::Format GetNativePixelFormat(AVPixelFormat pix_fmt);
+  static PixelFormat GetNativePixelFormat(AVPixelFormat pix_fmt);
   static int GetNativeChannelCount(AVPixelFormat pix_fmt);
 
   static uint64_t ValidateChannelLayout(AVStream *stream);

app/codec/ffmpeg/ffmpegencoder.cpp

@@ -29,7 +29,6 @@ extern "C" {
 #include <QFile>
 
 #include "common/ffmpegutils.h"
-#include "common/timecodefunctions.h"
 
 namespace olive {
 
@@ -130,7 +129,7 @@ bool FFmpegEncoder::Open()
     }
 
     // This is the format we will expect frames received in Write() to be in
-    VideoParams::Format native_pixel_fmt = params().video_params().format();
+    PixelFormat native_pixel_fmt = params().video_params().format();
 
     // This is the format we will need to convert the frame to for swscale to understand it
     video_conversion_fmt_ = FFmpegUtils::GetCompatiblePixelFormat(native_pixel_fmt);

app/codec/ffmpeg/ffmpegencoder.h

@@ -45,7 +45,7 @@ public:
 
   virtual bool Open() override;
 
-  virtual bool WriteFrame(olive::FramePtr frame, olive::rational time) override;
+  virtual bool WriteFrame(olive::FramePtr frame, olive::core::rational time) override;
 
   virtual bool WriteAudio(const olive::SampleBuffer &audio) override;
 
@@ -55,7 +55,7 @@ public:
 
   virtual void Close() override;
 
-  virtual VideoParams::Format GetDesiredPixelFormat() const override
+  virtual PixelFormat GetDesiredPixelFormat() const override
   {
     return video_conversion_fmt_;
   }
@@ -91,7 +91,7 @@ private:
   AVFilterGraph *video_scale_ctx_;
   AVFilterContext *video_buffersrc_ctx_;
   AVFilterContext *video_buffersink_ctx_;
-  VideoParams::Format video_conversion_fmt_;
+  PixelFormat video_conversion_fmt_;
 
   AVStream* audio_stream_;
   AVCodecContext* audio_codec_ctx_;