From b2372c3be86160f0234d64b6094f3f3648df9990 Mon Sep 17 00:00:00 2001 From: kallaballa Date: Fri, 15 Sep 2023 06:38:14 +0200 Subject: [PATCH] adjusted window and capture size in all samples --- modules/v4d/samples/beauty-demo.cpp | 2 +- modules/v4d/samples/cube-demo.cpp | 2 +- .../v4d/samples/custom_source_and_sink.cpp | 2 +- modules/v4d/samples/display_image.cpp | 2 +- modules/v4d/samples/display_image_fb.cpp | 2 +- modules/v4d/samples/font-demo.cpp | 4 ++-- modules/v4d/samples/font_rendering.cpp | 2 +- modules/v4d/samples/font_with_gui.cpp | 2 +- modules/v4d/samples/nanovg-demo.cpp | 4 ++-- modules/v4d/samples/optflow-demo.cpp | 20 ++++++++++--------- modules/v4d/samples/pedestrian-demo.cpp | 2 +- modules/v4d/samples/render_opengl.cpp | 2 +- modules/v4d/samples/shader-demo.cpp | 2 +- modules/v4d/samples/vector_graphics.cpp | 2 +- .../v4d/samples/vector_graphics_and_fb.cpp | 2 +- modules/v4d/samples/video-demo.cpp | 4 ++-- modules/v4d/samples/video_editing.cpp | 4 ++-- 17 files changed, 31 insertions(+), 29 deletions(-) diff --git a/modules/v4d/samples/beauty-demo.cpp b/modules/v4d/samples/beauty-demo.cpp index b47db51c5..59cd8a15e 100644 --- a/modules/v4d/samples/beauty-demo.cpp +++ b/modules/v4d/samples/beauty-demo.cpp @@ -23,7 +23,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr unsigned int DOWNSIZE_WIDTH = 960; constexpr unsigned int DOWNSIZE_HEIGHT = 540; diff --git a/modules/v4d/samples/cube-demo.cpp b/modules/v4d/samples/cube-demo.cpp index 62811b69b..bdc7337d8 100644 --- a/modules/v4d/samples/cube-demo.cpp +++ b/modules/v4d/samples/cube-demo.cpp @@ -12,7 +12,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr bool OFFSCREEN = false; #ifndef __EMSCRIPTEN__ diff --git a/modules/v4d/samples/custom_source_and_sink.cpp b/modules/v4d/samples/custom_source_and_sink.cpp index 841cb47fb..f115e135d 100644 --- a/modules/v4d/samples/custom_source_and_sink.cpp +++ b/modules/v4d/samples/custom_source_and_sink.cpp @@ -7,7 +7,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Custom Source/Sink"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Custom Source/Sink"); string hr = "Hello Rainbow!"; //Make a source that generates rainbow frames. diff --git a/modules/v4d/samples/display_image.cpp b/modules/v4d/samples/display_image.cpp index 0c5255691..9fe7539ca 100644 --- a/modules/v4d/samples/display_image.cpp +++ b/modules/v4d/samples/display_image.cpp @@ -8,7 +8,7 @@ int main() { //Creates a V4D window for on screen rendering with a window size of 720p and a framebuffer of the same size. //Please note that while the window size may change the framebuffer size may not. If you need multiple framebuffer //sizes you need multiple V4D objects - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Display image"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Display image"); //Loads an image as a UMat (just in case we have hardware acceleration available) #ifdef __EMSCRIPTEN__ diff --git a/modules/v4d/samples/display_image_fb.cpp b/modules/v4d/samples/display_image_fb.cpp index cc9991d51..e8154198f 100644 --- a/modules/v4d/samples/display_image_fb.cpp +++ b/modules/v4d/samples/display_image_fb.cpp @@ -6,7 +6,7 @@ using namespace cv::v4d; int main() { //Creates a V4D object - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Display image and FB"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Display image and FB"); //Loads an image as a UMat (just in case we have hardware acceleration available) #ifdef __EMSCRIPTEN__ diff --git a/modules/v4d/samples/font-demo.cpp b/modules/v4d/samples/font-demo.cpp index dc94ffd90..ee4059f68 100644 --- a/modules/v4d/samples/font-demo.cpp +++ b/modules/v4d/samples/font-demo.cpp @@ -21,7 +21,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr bool OFFSCREEN = false; #ifndef __EMSCRIPTEN__ @@ -204,7 +204,7 @@ static bool iteration(cv::Ptr window) { int main() { try { - cv::Ptr window = V4D::make(cv::Size(WIDTH, HEIGHT), cv::Size(), "Font Demo", OFFSCREEN, true); + cv::Ptr window = V4D::make(cv::Size(WIDTH, HEIGHT), cv::Size(), "Font Demo", OFFSCREEN); if(!OFFSCREEN) { setup_gui(window); } diff --git a/modules/v4d/samples/font_rendering.cpp b/modules/v4d/samples/font_rendering.cpp index 6ec0f51a5..c7e64e623 100644 --- a/modules/v4d/samples/font_rendering.cpp +++ b/modules/v4d/samples/font_rendering.cpp @@ -4,7 +4,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Font Rendering"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Font Rendering"); //The text to render string hw = "Hello World"; diff --git a/modules/v4d/samples/font_with_gui.cpp b/modules/v4d/samples/font_with_gui.cpp index 31a0d694f..65f0cfae1 100644 --- a/modules/v4d/samples/font_with_gui.cpp +++ b/modules/v4d/samples/font_with_gui.cpp @@ -4,7 +4,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Font Rendering with GUI"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Font Rendering with GUI"); //The text color. NanoGUI uses rgba with floating point nanogui::Color textColor = {0.0f, 0.0f, 1.0f, 1.0f}; diff --git a/modules/v4d/samples/nanovg-demo.cpp b/modules/v4d/samples/nanovg-demo.cpp index cf48da8ec..ebe3a3ec3 100644 --- a/modules/v4d/samples/nanovg-demo.cpp +++ b/modules/v4d/samples/nanovg-demo.cpp @@ -14,7 +14,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr bool OFFSCREEN = false; #ifndef __EMSCRIPTEN__ @@ -160,7 +160,7 @@ static bool iteration(cv::Ptr window) { //Acquire the framebuffer and convert the rgb into it window->fb([&](cv::UMat &framebuffer) { - cv::cvtColor(rgb, framebuffer, cv::COLOR_RGB2BGRA); + cv::cvtColor(rgb, framebuffer, cv::COLOR_BGR2BGRA); }); //Render using nanovg diff --git a/modules/v4d/samples/optflow-demo.cpp b/modules/v4d/samples/optflow-demo.cpp index 616d3b4fd..cfc4a5fdb 100644 --- a/modules/v4d/samples/optflow-demo.cpp +++ b/modules/v4d/samples/optflow-demo.cpp @@ -26,12 +26,13 @@ using namespace std::literals::chrono_literals; /* Demo parameters */ + #ifndef __EMSCRIPTEN__ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif const unsigned long DIAG = hypot(double(WIDTH), double(HEIGHT)); #ifndef __EMSCRIPTEN__ @@ -342,8 +343,8 @@ static void composite_layers(cv::UMat& background, const cv::UMat& foreground, c using namespace cv::v4d; //Build the GUI -static void setup_gui(cv::Ptr window, cv::Ptr dialog) { - window->nanogui([&](cv::v4d::FormHelper& form){ +static void setup_gui(cv::Ptr main, cv::Ptr menu) { + main->nanogui([&](cv::v4d::FormHelper& form){ form.makeDialog(5, 30, "Effects"); form.makeGroup("Foreground"); @@ -414,22 +415,22 @@ static void setup_gui(cv::Ptr window, cv::Ptr dialog) { form.makeFormVariable("Threshold Diff", scene_change_thresh_diff, 0.1f, 1.0f, true, "", "Difference of peak thresholds. Lowering it makes detection more sensitive"); }); - dialog->nanogui([&](cv::v4d::FormHelper& form){ + menu->nanogui([&](cv::v4d::FormHelper& form){ form.makeDialog(8, 16, "Display"); form.makeGroup("Display"); form.makeFormVariable("Show FPS", show_fps, "Enable or disable the On-screen FPS display"); form.makeFormVariable("Scale", scale, "Scale the frame buffer to the window size")->set_callback([=](const bool &s) { - window->setScaling(s); + main->setScaling(s); }); #ifndef __EMSCRIPTEN__ form.makeButton("Fullscreen", [=]() { - window->setFullscreen(!window->isFullscreen()); + main->setFullscreen(!main->isFullscreen()); }); form.makeButton("Offscreen", [=]() { - window->setVisible(!window->isVisible()); + main->setVisible(!main->isVisible()); }); #endif }); @@ -485,8 +486,8 @@ static bool iteration(cv::Ptr window) { #ifndef __EMSCRIPTEN__ window->write(); - - menuWindow->feed(menuFrame); +//FIXME +// menuWindow->feed(menuFrame); if(!menuWindow->display()) return false; @@ -505,6 +506,7 @@ int main(int argc, char **argv) { int main() { #endif try { + using namespace cv::v4d; cv::Ptr window = V4D::make(cv::Size(WIDTH, HEIGHT), cv::Size(), "Sparse Optical Flow Demo", OFFSCREEN); #ifndef __EMSCRIPTEN__ menuWindow = V4D::make(cv::Size(240, 360), cv::Size(), "Display Settings", OFFSCREEN); diff --git a/modules/v4d/samples/pedestrian-demo.cpp b/modules/v4d/samples/pedestrian-demo.cpp index 323fb3dbc..cc02abc56 100644 --- a/modules/v4d/samples/pedestrian-demo.cpp +++ b/modules/v4d/samples/pedestrian-demo.cpp @@ -20,7 +20,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif const unsigned long DIAG = hypot(double(WIDTH), double(HEIGHT)); constexpr unsigned int DOWNSIZE_WIDTH = 640; diff --git a/modules/v4d/samples/render_opengl.cpp b/modules/v4d/samples/render_opengl.cpp index 52ee572cf..3281391c4 100644 --- a/modules/v4d/samples/render_opengl.cpp +++ b/modules/v4d/samples/render_opengl.cpp @@ -4,7 +4,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "GL Blue Screen"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "GL Blue Screen"); window->gl([](){ //Sets the clear color to blue diff --git a/modules/v4d/samples/shader-demo.cpp b/modules/v4d/samples/shader-demo.cpp index 70b3c753c..db33c29be 100644 --- a/modules/v4d/samples/shader-demo.cpp +++ b/modules/v4d/samples/shader-demo.cpp @@ -14,7 +14,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr bool OFFSCREEN = false; const unsigned long DIAG = hypot(double(WIDTH), double(HEIGHT)); diff --git a/modules/v4d/samples/vector_graphics.cpp b/modules/v4d/samples/vector_graphics.cpp index 23c0730ba..682d6a4ba 100644 --- a/modules/v4d/samples/vector_graphics.cpp +++ b/modules/v4d/samples/vector_graphics.cpp @@ -4,7 +4,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Vector Graphics"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Vector Graphics"); window->run([=](Ptr window) { //Creates a NanoVG context and draws googly eyes that occasionally blink. diff --git a/modules/v4d/samples/vector_graphics_and_fb.cpp b/modules/v4d/samples/vector_graphics_and_fb.cpp index 7b2e86e85..ef1698578 100644 --- a/modules/v4d/samples/vector_graphics_and_fb.cpp +++ b/modules/v4d/samples/vector_graphics_and_fb.cpp @@ -5,7 +5,7 @@ using namespace cv; using namespace cv::v4d; int main() { - Ptr window = V4D::make(Size(960, 540), cv::Size(), "Vector Graphics and Framebuffer"); + Ptr window = V4D::make(Size(960, 960), cv::Size(), "Vector Graphics and Framebuffer"); window->run([=](Ptr window) { //Again creates a NanoVG context and draws googly eyes diff --git a/modules/v4d/samples/video-demo.cpp b/modules/v4d/samples/video-demo.cpp index 5f2f23187..b0ce80f1d 100644 --- a/modules/v4d/samples/video-demo.cpp +++ b/modules/v4d/samples/video-demo.cpp @@ -20,7 +20,7 @@ constexpr long unsigned int WIDTH = 1280; constexpr long unsigned int HEIGHT = 720; #else constexpr long unsigned int WIDTH = 960; -constexpr long unsigned int HEIGHT = 540; +constexpr long unsigned int HEIGHT = 960; #endif constexpr bool OFFSCREEN = false; const unsigned long DIAG = hypot(double(WIDTH), double(HEIGHT)); @@ -218,7 +218,7 @@ int main(int argc, char** argv) { int main() { #endif using namespace cv::v4d; - cv::Ptr window = V4D::make(cv::Size(WIDTH, HEIGHT), cv::Size(), "Video Demo", OFFSCREEN); + cv::Ptr window = V4D::make(cv::Size(WIDTH, HEIGHT), cv::Size(), "Video Demo", OFFSCREEN, false); window->printSystemInfo(); #ifndef __EMSCRIPTEN__ diff --git a/modules/v4d/samples/video_editing.cpp b/modules/v4d/samples/video_editing.cpp index 6fd703f1e..8d0fc590a 100644 --- a/modules/v4d/samples/video_editing.cpp +++ b/modules/v4d/samples/video_editing.cpp @@ -4,7 +4,7 @@ using namespace cv; using namespace cv::v4d; int main(int argc, char** argv) { - Ptr window = V4D::make(cv::Size(960, 540), cv::Size(), "Video Editing"); + Ptr window = V4D::make(cv::Size(960, 960), cv::Size(), "Video Editing"); //In case of WebAssembly CV_UNUSED(argc); @@ -24,7 +24,7 @@ int main(int argc, char** argv) { window->setSink(sink); #else //Make a webcam Source - Source src = makeCaptureSource(1280, 720, window); + Source src = makeCaptureSource(960, 960, window); //Attach webcam source window->setSource(src); #endif