From d077c6450f4375492a96f9b0e1933412fbd69930 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 12 Feb 2019 19:58:36 -0800
Subject: [PATCH] Split SdlRenderer from renderer.h

---
 app/app.pro                                   |  2 +-
 .../video/ffmpeg-renderers/renderer.h         | 21 ----------------
 .../video/ffmpeg-renderers/sdlvid.cpp         |  2 +-
 app/streaming/video/ffmpeg-renderers/sdlvid.h | 25 +++++++++++++++++++
 app/streaming/video/ffmpeg.cpp                |  2 ++
 5 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 app/streaming/video/ffmpeg-renderers/sdlvid.h

diff --git a/app/app.pro b/app/app.pro
index c0044c58..67312f54 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -166,10 +166,10 @@ ffmpeg {
         streaming/video/ffmpeg-renderers/pacer/pacer.cpp \
         streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.cpp
 
-
     HEADERS += \
         streaming/video/ffmpeg.h \
         streaming/video/ffmpeg-renderers/renderer.h \
+        streaming/video/ffmpeg-renderers/sdlvid.h \
         streaming/video/ffmpeg-renderers/pacer/pacer.h \
         streaming/video/ffmpeg-renderers/pacer/nullthreadedvsyncsource.h
 }
diff --git a/app/streaming/video/ffmpeg-renderers/renderer.h b/app/streaming/video/ffmpeg-renderers/renderer.h
index 7a44a290..c68a906a 100644
--- a/app/streaming/video/ffmpeg-renderers/renderer.h
+++ b/app/streaming/video/ffmpeg-renderers/renderer.h
@@ -33,24 +33,3 @@ public:
         // Nothing
     }
 };
-
-class SdlRenderer : public IFFmpegRenderer {
-public:
-    SdlRenderer();
-    virtual ~SdlRenderer();
-    virtual bool initialize(SDL_Window* window,
-                            int videoFormat,
-                            int width,
-                            int height,
-                            int maxFps,
-                            bool enableVsync);
-    virtual bool prepareDecoderContext(AVCodecContext* context);
-    virtual void renderFrameAtVsync(AVFrame* frame);
-    virtual bool needsTestFrame();
-    virtual int getDecoderCapabilities();
-    virtual FramePacingConstraint getFramePacingConstraint();
-
-private:
-    SDL_Renderer* m_Renderer;
-    SDL_Texture* m_Texture;
-};
diff --git a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp
index 70b43132..97fd26e6 100644
--- a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp
+++ b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp
@@ -1,4 +1,4 @@
-#include "renderer.h"
+#include "sdlvid.h"
 
 #include <Limelight.h>
 
diff --git a/app/streaming/video/ffmpeg-renderers/sdlvid.h b/app/streaming/video/ffmpeg-renderers/sdlvid.h
new file mode 100644
index 00000000..40d58ac4
--- /dev/null
+++ b/app/streaming/video/ffmpeg-renderers/sdlvid.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "renderer.h"
+
+class SdlRenderer : public IFFmpegRenderer {
+public:
+    SdlRenderer();
+    virtual ~SdlRenderer();
+    virtual bool initialize(SDL_Window* window,
+                            int videoFormat,
+                            int width,
+                            int height,
+                            int maxFps,
+                            bool enableVsync);
+    virtual bool prepareDecoderContext(AVCodecContext* context);
+    virtual void renderFrameAtVsync(AVFrame* frame);
+    virtual bool needsTestFrame();
+    virtual int getDecoderCapabilities();
+    virtual FramePacingConstraint getFramePacingConstraint();
+
+private:
+    SDL_Renderer* m_Renderer;
+    SDL_Texture* m_Texture;
+};
+
diff --git a/app/streaming/video/ffmpeg.cpp b/app/streaming/video/ffmpeg.cpp
index 6fb28831..25e3ae90 100644
--- a/app/streaming/video/ffmpeg.cpp
+++ b/app/streaming/video/ffmpeg.cpp
@@ -5,6 +5,8 @@
 
 #include <h264_stream.h>
 
+#include "ffmpeg-renderers/sdlvid.h"
+
 #ifdef Q_OS_WIN32
 #include "ffmpeg-renderers/dxva2.h"
 #endif