From bc439829cfb43edec0afd6ab5cd800ca2d9dfd13 Mon Sep 17 00:00:00 2001
From: Bruno Herbelin <bruno.herbelin@gmail.com>
Date: Tue, 28 Feb 2023 00:24:19 +0100
Subject: [PATCH] DRAFT feature for showing test pattern on output window

---
 rsc/images/icons.dds     | Bin 1638528 -> 1638528 bytes
 src/DisplaysView.cpp     |  48 ++++++++++++++++++++++++++++++++++++++-
 src/Mixer.cpp            |   2 +-
 src/RenderingManager.cpp |  28 +++++++++++++++++------
 src/RenderingManager.h   |   3 +++
 src/Settings.h           |   3 ++-
 6 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/rsc/images/icons.dds b/rsc/images/icons.dds
index 850dd053278b50eab4cd892712fdf0fc351c346d..6654a7be066efabac0cfa7e210bf9029985c5cf2 100644
GIT binary patch
delta 9649
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

delta 2858
zcmd5-Z)_Ar6o0#Wd)GVrXSe@b+GIJ2Ql$1Sps5iI^<Sw8&DBIhqqZfHn3~uUV@zmb
zxU;c``T>^1Y?@%o8L_4x<Vw^DUo3~lC<x6JB!19dYq13bJxOe<l<W9r?`H2Xq9!fI
zX@8gb&Aff@H*em|_yf=T@&9AtohL|1rK?3E)7yl16;f2`+9(mSLpY_77Pnm#N$)Gd
zk~+xxMxfmmA>KCyALn_tb~15D2;ambf8t+c^ZN<;PB_KwlR_PdToGbv9)8Ys-zT4n
zr!&+`junfe+#JK}fp)ULM!cq&iUtFl#KLsXCl(U5(&drJ@J=zV5UtYXlY$ewMTA5q
zcH88)q*p!P8()1cC0U1HCr==AvOJ;Q>47lCHiRuqf1*i7urXc%-4K^(rLom*|KZ;n
zCdf>M{Igm%?@5N~wB^g}P}(2L*;Qq%8MkjTPSh11DE%j+iSu%pOxB{%Mi1yPuifC{
z(n3c$A9c4u1&F|T5*M?dX6)HQXcvvMEF51+XQ#=z2Kh(Tt%0A%W{EU~;s8q|ZKKY(
z)Ex@;)mA67l2QR}Fe1_%{v8;x^YXzJ^AsVmr!aHcMdiA0DawMR)KD6y`{;VkSB0YA
z)|H0omLx2|Nj^$9(-E35N-yQ@TMuBR6_)Evf1`>-J27Fk8tlr1o3|=2Em9s4n!#no
z)%{+N4-`~l4N<x{@_tE%cf(z5+L|}B`SO1grjL-<u<Er1<%W+AvmB;U9j61dnL0U_
z^uW{J0B5N6$%DxyMonvg;0q?Pcrko-HysUaztDQyJa>{|UB0N^qkxC&n4$}Gk!EyJ
z+o-Sy9<mav`x_O@SX(?sf2T{Knd0g-Z(nwdaVLBsoOeOOjx{w9`YnI+vV#R%9>~dZ
zxSd3f$dhVa2l(MInCUl<T}nfOOQ-@TIKY;*jt0kJ7=vG7-uQ4Jcdgek#{O*92Bp65
z@8=Gv=_->Lo6(Rg@GLWIlk!(yA18yyv7j7Lh(Zjap-U}QxkA?Uru!Qj7x28!!IY(L
zfF4aL<mKdc&(5aSz|sLAX!ett9RkJuFq=2FPP>}^E>PJm0vY86VvQrqODhSVk$+Jg
z!?+86@ELo1@|*O4CP$$Il+Xu#>r|HC@^j<n<!x?}vAW0UyVVE5ZN`QkXEO;;qE}<}
ziv>khQ+TQK1>@_)F3&E`b-&Nvu>=>uV|=+&)K*<R!)MG-UTPINA2Ebk*OnFc*iIsI
zsC2ECgc*FTG#(D`TWr_ak9p8#=n`lRzD4yR`-Ar?aNu<-A-GBKtdMwyo2ITj!Kzue
zac!N_ecL1W$*|K-)jjV~<udHZ+^I}flJ=TMfbCzrlZ~Vr;~O_5(iN9l=_7-w)50v+
zeEQY4jwIIWNAc2nYk3YVan{oI2Hh(K{tqH_a-!NU6#9BibzI)i725E1mfRsquhN_O
z_@Qimw!YYOz|&zqQISVi!mII^+x|^3=Cvanh#Z6y;X>Sj$VKEK@(~3H1)(Ae5k-h%
QL<yo4QAT3k@}p<}0LxIXod5s;

diff --git a/src/DisplaysView.cpp b/src/DisplaysView.cpp
index bd4a36a..acf4ce8 100644
--- a/src/DisplaysView.cpp
+++ b/src/DisplaysView.cpp
@@ -140,7 +140,7 @@ void DisplaysView::update(float dt)
         if (render) {
             output_ar = render->aspectRatio();
             for (int i = 0; i < MAX_OUTPUT_WINDOW; ++i)
-                windows_[i].render_->setTextureIndex( render->texture() );
+                windows_[i].render_->setTextureIndex( Rendering::manager().outputWindow(i).texture() );
         }
         else
             output_ar = 1.f;
@@ -395,6 +395,52 @@ void DisplaysView::draw()
         else
             ImGuiToolkit::Icon(19, 4, false);
 
+        // Modify current window
+        if (current_window_ > -1) {
+
+            // Pattern output
+            ImGui::SameLine(0, 50);
+            if ( ImGuiToolkit::ButtonIconToggle(10,1,11,1, &Settings::application.windows[1+current_window_].show_pattern, "Test pattern") )
+                View::need_deep_update_ += 2; // two frames update to get pattern initialized
+
+//            // White ballance
+//            static DialogToolkit::ColorPickerDialog whitedialog;
+//            ImGui::SameLine(0, 30);
+//            ImGuiToolkit::Icon(5, 4);
+//            static ImVec4 white = ImVec4(1.f, 1.f, 1.f, 1.f);
+//            ImGui::SameLine();
+//            ImGuiToolkit::PushFont(ImGuiToolkit::FONT_DEFAULT);
+//            if (ImGui::ColorButton("White", white, ImGuiColorEditFlags_NoAlpha)) {
+//                whitedialog.setRGB( std::make_tuple(white.x, white.y, white.z) );
+//                whitedialog.open();
+//            }
+//            ImGui::PopFont();
+//            // get picked color if dialog finished
+//            if (whitedialog.closed()){
+//                std::tuple<float, float, float> c = whitedialog.RGB();
+//                white.x =  std::get<0>(c);
+//                white.y =  std::get<1>(c);
+//                white.z =  std::get<2>(c);
+//            }
+
+//            ImGui::SameLine();
+//            ImGuiToolkit::Icon(3,4);
+//            static ImVec4 grey = ImVec4(0.5f, 0.5f, 0.5f, 1.f);
+//            ImGui::SameLine();
+//            ImGuiToolkit::PushFont(ImGuiToolkit::FONT_DEFAULT);
+//            ImGui::ColorButton("Grey", grey, ImGuiColorEditFlags_NoAlpha);
+//            ImGui::PopFont();
+
+//            ImGui::SameLine();
+//            ImGuiToolkit::Icon(4,4);
+//            static ImVec4 black = ImVec4(0.f, 0.f, 0.f, 1.f);
+//            ImGui::SameLine();
+//            ImGuiToolkit::PushFont(ImGuiToolkit::FONT_DEFAULT);
+//            ImGui::ColorButton("Black", black, ImGuiColorEditFlags_NoAlpha);
+//            ImGui::PopFont();
+
+
+        }
 
 
         ImGui::PopStyleColor(14);  // 14 colors
diff --git a/src/Mixer.cpp b/src/Mixer.cpp
index b5155bb..9c92998 100644
--- a/src/Mixer.cpp
+++ b/src/Mixer.cpp
@@ -1526,7 +1526,7 @@ void Mixer::setResolution(glm::vec3 res)
 {
     if (session_) {
         session_->setResolution(res);
-        ++View::need_deep_update_;
+        View::need_deep_update_+=2;
         std::ostringstream info;
         info << "Session resolution changed to " << res.x << "x" << res.y;
         Log::Info("%s", info.str().c_str());
diff --git a/src/RenderingManager.cpp b/src/RenderingManager.cpp
index 8fc97c2..53a4eff 100644
--- a/src/RenderingManager.cpp
+++ b/src/RenderingManager.cpp
@@ -60,6 +60,7 @@
 // vimix
 #include "defines.h"
 #include "Log.h"
+#include "Stream.h"
 #include "Resource.h"
 #include "Settings.h"
 #include "ImageShader.h"
@@ -693,6 +694,7 @@ WindowSurface::WindowSurface(Shader *s) : Primitive(s)
 RenderingWindow::RenderingWindow() : window_(NULL), master_(NULL),
     index_(-1), dpi_scale_(1.f), textureid_(0), fbo_(0), surface_(nullptr), request_change_fullscreen_(false)
 {
+    pattern_ = new Stream;
 }
 
 RenderingWindow::~RenderingWindow()
@@ -1014,6 +1016,12 @@ bool RenderingWindow::init(int index, GLFWwindow *share)
         window_attributes_.clear_color = glm::vec4(COLOR_BGROUND, 1.f);
     }
 
+    //
+    // Stream pattern
+    //
+    pattern_->open("videotestsrc pattern=smpte", 1280, 720);
+    pattern_->play(true);
+
     return true;
 }
 
@@ -1108,10 +1116,11 @@ bool RenderingWindow::draw(FrameBuffer *fb)
                 surface_ = new WindowSurface;
 
             // calculate scaling factor of frame buffer inside window
-            float windowAspectRatio = aspectRatio();
-            float renderingAspectRatio = fb->aspectRatio();
+            const float windowAspectRatio = aspectRatio();
+            const float renderingAspectRatio = fb->aspectRatio();
             glm::vec3 scale = glm::vec3(1.f, 1.f, 1.f);
 
+            // Display option: scaled or corrected aspect ratio
             if (!Settings::application.windows[index_].scaled) {
                 if (windowAspectRatio < renderingAspectRatio)
                     scale = glm::vec3(1.f, windowAspectRatio / renderingAspectRatio, 1.f);
@@ -1119,12 +1128,17 @@ bool RenderingWindow::draw(FrameBuffer *fb)
                     scale = glm::vec3(renderingAspectRatio / windowAspectRatio, 1.f, 1.f);
             }
 
-            // make sure previous shader in another glcontext is disabled
-            ShadingProgram::enduse();
+            // Display option: draw calibration pattern
+            if ( Settings::application.windows[index_].show_pattern) {
+                pattern_->update();
+                textureid_ = pattern_->texture();
+            }
+            else
+                // draw normal texture
+                textureid_ = fb->texture();
 
-            // draw
-            glBindTexture(GL_TEXTURE_2D, fb->texture());
-            //            surface->shader()->color.a = 0.4f; // TODO alpha blending ?
+            // actual render of the textured surface
+            glBindTexture(GL_TEXTURE_2D, textureid_);
             static glm::mat4 projection = glm::ortho(-1.f, 1.f, -1.f, 1.f, -1.f, 1.f);
             surface_->draw(glm::scale(glm::identity<glm::mat4>(), scale), projection);
 
diff --git a/src/RenderingManager.h b/src/RenderingManager.h
index 62a2f83..f39acdc 100644
--- a/src/RenderingManager.h
+++ b/src/RenderingManager.h
@@ -16,6 +16,7 @@
 typedef struct GLFWmonitor GLFWmonitor;
 typedef struct GLFWwindow GLFWwindow;
 class FrameBuffer;
+class Stream;
 
 struct RenderingAttrib
 {
@@ -37,6 +38,7 @@ class RenderingWindow
     // objects to render
     uint textureid_;
     uint fbo_;
+    Stream *pattern_;
     class WindowSurface *surface_;
 
 protected:
@@ -65,6 +67,7 @@ public:
 
     // draw a framebuffer
     bool draw(FrameBuffer *fb);
+    inline uint texture() const {return textureid_; }
     void swap();
 
     // fullscreen
diff --git a/src/Settings.h b/src/Settings.h
index 887aabe..0342d8c 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -63,9 +63,10 @@ struct WindowConfig
     bool scaled;
     bool decorated;
     std::string monitor;
+    bool show_pattern;
 
     WindowConfig() : name(APP_TITLE), x(15), y(15), w(1280), h(720),
-        fullscreen(false), scaled(false), decorated(true), monitor("") { }
+        fullscreen(false), scaled(false), decorated(true), monitor(""), show_pattern(false) { }
 
 };