Merge pull request #159 from sz3/cleanup-time3

sz3 · web-flow · commit 3fd07ff3d7bb · 2026-03-26T08:10:24.000-05:00
cleanup: cimbar_send cli improvement/fix, new emsdk version for wasm build, +++
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,12 +16,12 @@ jobs:
 
       - name: Get openCV
         run: |
-          git clone --recurse-submodules --depth 1 --branch 4.11.0 https://github.com/opencv/opencv.git opencv4
+          git clone --recurse-submodules --depth 1 --branch 4.12.0 https://github.com/opencv/opencv.git opencv4
 
       - name: Run the build process with Docker
         uses: addnab/docker-run-action@v3
         with:
-          image: emscripten/emsdk:3.1.69
+          image: emscripten/emsdk:5.0.0
           options: -v ${{ github.workspace }}:/usr/src/app
           shell: bash
           run: |
diff --git a/package-wasm.sh b/package-wasm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.69 bash
+#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:5.0.0 bash
 
 SKIP_JS=${SKIP_JS:-}
 CIMBAR_ROOT=${CIMBAR_ROOT:-/usr/src/app}
diff --git a/src/exe/cimbar_send/send.cpp b/src/exe/cimbar_send/send.cpp
@@ -33,16 +33,14 @@ int main(int argc, char** argv)
 {
 	cxxopts::Options options("cimbar video encoder", "Draw a bunch of weird static on the screen!");
 
-	unsigned colorBits = cimbar::Config::color_bits();
 	unsigned compressionLevel = cimbar::Config::compression_level();
-	unsigned ecc = cimbar::Config::ecc_bytes();
 	unsigned defaultFps = 15;
+	unsigned defaultPadding = 32;
 	options.add_options()
 		("i,in", "Source file", cxxopts::value<vector<string>>())
-		("c,colorbits", "Color bits. [0-3]", cxxopts::value<int>()->default_value(turbo::str::str(colorBits)))
-		("e,ecc", "ECC level", cxxopts::value<unsigned>()->default_value(turbo::str::str(ecc)))
 		("f,fps", "Target FPS", cxxopts::value<unsigned>()->default_value(turbo::str::str(defaultFps)))
-		("m,mode", "Select a cimbar mode. B is new to 0.6.x. 4C is the 0.5.x config. [B,Bm,Bu,4C]", cxxopts::value<string>()->default_value("4C"))
+		("m,mode", "Select a cimbar mode. B modes are new to 0.6.x. 4C is the 0.5.x config. [B,Bm,Bu,4C]", cxxopts::value<string>()->default_value("B"))
+		("p,padding", "Black padding around image in pixels.", cxxopts::value<unsigned>()->default_value(turbo::str::str(defaultPadding)))
 		("z,compression", "Compression level. 0 == no compression.", cxxopts::value<int>()->default_value(turbo::str::str(compressionLevel)))
 		("h,help", "Print usage")
 	;
@@ -58,10 +56,7 @@ int main(int argc, char** argv)
 	}
 
 	vector<string> infiles = result["in"].as<vector<string>>();
-
-	colorBits = std::min(3, result["colorbits"].as<int>());
 	compressionLevel = result["compression"].as<int>();
-	ecc = result["ecc"].as<unsigned>();
 
 	unsigned config_mode = 68;
 	if (result.count("mode"))
@@ -74,20 +69,25 @@ int main(int argc, char** argv)
 		else if (mode == "Bm" or mode == "BM")
 			config_mode = 67;
 	}
+	cimbar::Config::update(config_mode);
+
+	unsigned padding = result["padding"].as<unsigned>();
+	if (padding == 0)
+		padding = defaultPadding;
 
 	unsigned fps = result["fps"].as<unsigned>();
 	if (fps == 0)
 		fps = defaultFps;
 	unsigned delay = 1000 / fps;
 
-	int window_size_x = cimbar::Config::image_size_x() + 32;
-	int window_size_y = cimbar::Config::image_size_y() + 32;
+	int window_size_x = cimbar::Config::image_size_x();
+	int window_size_y = cimbar::Config::image_size_y();
 	if (cimbare_init_window(window_size_x, window_size_y) < 0)
 	{
 		std::cerr << "failed to create window :(" << std::endl;
 		return 70;
 	}
-	cimbare_auto_scale_window();
+	cimbare_auto_scale_window(padding);
 	cimbare_configure(config_mode, compressionLevel);
 
 	std::chrono::time_point start = std::chrono::high_resolution_clock::now();
diff --git a/src/lib/cimb_translator/Config.h b/src/lib/cimb_translator/Config.h
@@ -149,7 +149,6 @@ namespace cimbar
 			return active_conf().total_cells();
 		}
 
-		// leave bitspercell here
 		static unsigned capacity(unsigned bitspercell=0)
 		{
 			return active_conf().capacity(bitspercell);
diff --git a/src/lib/cimb_translator/GridConf.h b/src/lib/cimb_translator/GridConf.h
@@ -44,7 +44,7 @@ namespace cimbar
 			return cells_per_col_x*cells_per_col_y - (corner_padding_x()*corner_padding_y() * 4);
 		}
 
-		unsigned capacity(unsigned bitspercell) const
+		unsigned capacity(unsigned bitspercell=0) const
 		{
 			if (!bitspercell)
 				bitspercell = bits_per_cell();
diff --git a/src/lib/cimbar_js/CMakeLists.txt b/src/lib/cimbar_js/CMakeLists.txt
@@ -90,6 +90,7 @@ set (LINK_WASM_LIST
 	-s FILESYSTEM=0
 	-s TOTAL_MEMORY=134217728
 	-s EXPORTED_FUNCTIONS='[${LINK_WASM_EXPORTED_FUNCTIONS}]'
+	-s EXPORTED_RUNTIME_METHODS=['HEAPU8']
 )
 string(REPLACE ";" " " LINK_WASM_FLAGS "${LINK_WASM_LIST}")
 
diff --git a/src/lib/cimbar_js/cimbar_js.cpp b/src/lib/cimbar_js/cimbar_js.cpp
@@ -6,11 +6,8 @@
 #include "encoder/Encoder.h"
 #include "gui/window_glfw.h"
 #include "util/byte_istream.h"
-
-#include <iostream>
 #include <sstream>
 
-
 namespace {
 	std::shared_ptr<cimbar::window_glfw> _window;
 	std::shared_ptr<fountain_encoder_stream> _fes;
@@ -64,12 +61,12 @@ int cimbare_rotate_window(bool rotate)
 	return 0;
 }
 
-bool cimbare_auto_scale_window()
+bool cimbare_auto_scale_window(unsigned padding)
 {
 	if (!_window or !_window->is_good())
 		return false;
 
-	_window->auto_scale_to_window();
+	_window->auto_scale_to_window(padding);
 	return true;
 }
 
diff --git a/src/lib/cimbar_js/cimbar_js.h b/src/lib/cimbar_js/cimbar_js.h
@@ -17,7 +17,7 @@ int cimbare_configure(int mode_val, int compression);
 float cimbare_get_aspect_ratio();
 
 // internal usage
-bool cimbare_auto_scale_window();
+bool cimbare_auto_scale_window(unsigned padding);
 int cimbare_get_frame_buff(unsigned char** buff);
 
 #ifdef __cplusplus
diff --git a/src/lib/compression/zstd_compressor.h b/src/lib/compression/zstd_compressor.h
@@ -2,9 +2,9 @@
 #pragma once
 
 #include "zstd/zstd.h"
+
+#include "serialize/format.h"
 #include <array>
-#include <fstream>
-#include <iostream>
 #include <sstream>
 #include <vector>
 
@@ -36,7 +36,7 @@ class zstd_compressor : public STREAM
 			size_t compressedBytes = ZSTD_compressCCtx(_cctx, _compBuff.data(), _compBuff.size(), data, writeLen, _compressionLevel);
 			if (ZSTD_isError(compressedBytes))
 			{
-				std::cerr << "error? " << ZSTD_getErrorName(compressedBytes) << std::endl;
+				fmt::print("error? {}\n", ZSTD_getErrorName(compressedBytes));
 				return false;
 			}
 			STREAM::write(_compBuff.data(), compressedBytes);
diff --git a/src/lib/compression/zstd_decompressor.h b/src/lib/compression/zstd_decompressor.h
@@ -5,7 +5,6 @@
 
 #include "zstd/zstd.h"
 #include <array>
-#include <iostream>
 #include <sstream>
 #include <vector>
 
diff --git a/src/lib/extractor/Anchor.h b/src/lib/extractor/Anchor.h
@@ -3,7 +3,6 @@
 
 #include "Point.h"
 #include <cmath>
-#include <iostream>
 #include <utility>
 
 class Anchor
diff --git a/src/lib/extractor/Scanner.h b/src/lib/extractor/Scanner.h
@@ -8,7 +8,6 @@
 
 #include <opencv2/opencv.hpp>
 #include <functional>
-#include <iostream>
 #include <vector>
 
 class Midpoints;
diff --git a/src/lib/fountain/FountainDecoder.h b/src/lib/fountain/FountainDecoder.h
@@ -7,7 +7,6 @@
 #include <optional>
 #include <set>
 #include <vector>
-#include <iostream>
 
 // will need to split large files
 
diff --git a/src/lib/fountain/fountain_decoder_stream.h b/src/lib/fountain/fountain_decoder_stream.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "FountainDecoder.h"
-#include <iostream>
 #include <optional>
 #include <string>
 
diff --git a/src/lib/fountain/fountain_encoder_stream.h b/src/lib/fountain/fountain_encoder_stream.h
@@ -3,7 +3,6 @@
 
 #include "FountainEncoder.h"
 #include "FountainMetadata.h"
-#include <iostream>
 #include <memory>
 #include <sstream>
 #include <string>
diff --git a/src/lib/gui/gl_program.h b/src/lib/gui/gl_program.h
@@ -3,7 +3,6 @@
 
 #include <GLES3/gl3.h>
 #include <GLES2/gl2ext.h>
-#include <iostream>
 #include <string>
 
 namespace cimbar {
diff --git a/src/lib/gui/gl_shader.h b/src/lib/gui/gl_shader.h
@@ -3,7 +3,6 @@
 
 #include <GLES3/gl3.h>
 #include <GLES2/gl2ext.h>
-#include <iostream>
 
 namespace cimbar {
 
diff --git a/src/lib/gui/window_glfw.h b/src/lib/gui/window_glfw.h
@@ -13,10 +13,17 @@ namespace cimbar {
 
 class window_glfw
 {
+protected:
+	struct runtime_ctx
+	{
+		unsigned width;
+		unsigned height;
+		unsigned padding;
+	};
+
 public:
 	window_glfw(unsigned width, unsigned height, std::string title)
-		: _width(width)
-		, _height(height)
+		: _ctx({width, height, 0})
 	{
 		if (!glfwInit())
 		{
@@ -32,6 +39,7 @@ class window_glfw
 		}
 		glfwMakeContextCurrent(_w);
 		glfwSwapInterval(1);
+		glfwSetWindowUserPointer(_w, &_ctx);
 
 		_display = std::make_shared<cimbar::gl_2d_display>(std::max(width, height));
 		glGenTextures(1, &_texid);
@@ -60,24 +68,52 @@ class window_glfw
 		return glfwWindowShouldClose(_w);
 	}
 
-	void auto_scale_to_window()
+	void auto_scale_to_window(unsigned padding=0)
 	{
 		if (!is_good())
 			return;
-		glfwSetWindowAspectRatio(_w, _width, _height);
-		auto fun = [](GLFWwindow*, int w, int h){ glViewport(0, 0, w, h); };
+		_ctx.padding = padding;
+		glfwSetWindowAspectRatio(_w, _ctx.width, _ctx.height);
+		auto fun = [](GLFWwindow* win, int w, int h) {
+			if (h == 0)
+				return;
+
+			auto* appCtx = static_cast<runtime_ctx*>(glfwGetWindowUserPointer(win));
+			float targetAspect = static_cast<float>(appCtx->width - appCtx->padding)/(appCtx->height - appCtx->padding);
+			float currentAspect = static_cast<float>(w-appCtx->padding) / static_cast<float>(h-appCtx->padding);
+
+			int viewportWidth, viewportHeight;
+			int xOffset = 0, yOffset = 0;
+
+			if (currentAspect > targetAspect)
+			{
+				viewportHeight = h - appCtx->padding;
+				viewportWidth = static_cast<int>(h * targetAspect) - appCtx->padding;
+				xOffset = (w - viewportWidth) / 2;
+				yOffset = appCtx->padding / 2;
+			}
+			else
+			{
+				viewportWidth = w - appCtx->padding;
+				viewportHeight = static_cast<int>(w / targetAspect) - appCtx->padding;
+				yOffset = (h - viewportHeight) / 2;
+				xOffset = appCtx->padding / 2;
+			}
+			glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+			glViewport(xOffset, yOffset, viewportWidth, viewportHeight);
+		};
 		glfwSetWindowSizeCallback(_w, fun);
 	}
 
 	void resize(unsigned width, unsigned height)
 	{
 		if (_w)
 		{
-			_width = width;
-			_height = height;
+			_ctx.width = width;
+			_ctx.height = height;
 			glfwSetWindowAspectRatio(_w, width, height);
-			glfwSetWindowSize(_w, width, height);
-			init_opengl(width, height);
+			glfwSetWindowSize(_w, width +_ctx.padding, height+_ctx.padding);
+			init_opengl(width +_ctx.padding, height+_ctx.padding);
 		}
 	}
 
@@ -122,12 +158,12 @@ class window_glfw
 
 	unsigned width() const
 	{
-		return _width;
+		return _ctx.width;
 	}
 
 	unsigned height() const
 	{
-		return _height;
+		return _ctx.height;
 	}
 
 protected:
@@ -150,10 +186,9 @@ class window_glfw
 
 protected:
 	GLFWwindow* _w = nullptr;
+	runtime_ctx _ctx;
 	GLuint _texid;
 	std::shared_ptr<cimbar::gl_2d_display> _display;
-	unsigned _width;
-	unsigned _height;
 	bool _good = true;
 };
 
diff --git a/src/lib/image_hash/ahash_result.h b/src/lib/image_hash/ahash_result.h
@@ -5,7 +5,6 @@
 #include "intx/intx.hpp"
 #include <array>
 #include <cmath>
-#include <iostream>
 #include <utility>
 
 namespace image_hash
diff --git a/src/lib/image_hash/bit_extractor.h b/src/lib/image_hash/bit_extractor.h
@@ -1,7 +1,6 @@
 /* This code is subject to the terms of the Mozilla Public License, v.2.0. http://mozilla.org/MPL/2.0/. */
 #pragma once
 
-#include <iostream>
 #include <tuple>
 
 // 2(?) <= READLEN <= 8
diff --git a/src/lib/util/loop_iterator.h b/src/lib/util/loop_iterator.h
@@ -16,6 +16,11 @@ class loop_iterator
 		return _it != _c.end();
 	}
 
+	decltype(auto) operator*() const
+	{
+		return *_it;
+	}
+
 	operator CONTAINER_IT() const
 	{
 		return _it;
diff --git a/src/third_party_lib/fmt/LICENSE b/src/third_party_lib/fmt/LICENSE
diff --git a/src/third_party_lib/fmt/base.h b/src/third_party_lib/fmt/base.h
diff --git a/src/third_party_lib/fmt/core.h b/src/third_party_lib/fmt/core.h
diff --git a/src/third_party_lib/fmt/format-inl.h b/src/third_party_lib/fmt/format-inl.h
diff --git a/src/third_party_lib/fmt/format.h b/src/third_party_lib/fmt/format.h
diff --git a/src/third_party_lib/intx/intx.hpp b/src/third_party_lib/intx/intx.hpp
diff --git a/src/third_party_lib/libpopcnt/LICENSE b/src/third_party_lib/libpopcnt/LICENSE
diff --git a/src/third_party_lib/libpopcnt/libpopcnt.h b/src/third_party_lib/libpopcnt/libpopcnt.h

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,6 @@ namespace cimbar`
`149`	`149`	`return active_conf().total_cells();`
`150`	`150`	`}`
`151`	`151`
`152`		`- // leave bitspercell here`
`153`	`152`	`static unsigned capacity(unsigned bitspercell=0)`
`154`	`153`	`{`
`155`	`154`	`return active_conf().capacity(bitspercell);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace cimbar`
`44`	`44`	`return cells_per_col_xcells_per_col_y - (corner_padding_x()corner_padding_y() * 4);`
`45`	`45`	`}`
`46`	`46`
`47`		`- unsigned capacity(unsigned bitspercell) const`
	`47`	`+ unsigned capacity(unsigned bitspercell=0) const`
`48`	`48`	`{`
`49`	`49`	`if (!bitspercell)`
`50`	`50`	`bitspercell = bits_per_cell();`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ set (LINK_WASM_LIST`
`90`	`90`	`-s FILESYSTEM=0`
`91`	`91`	`-s TOTAL_MEMORY=134217728`
`92`	`92`	`-s EXPORTED_FUNCTIONS='[${LINK_WASM_EXPORTED_FUNCTIONS}]'`
	`93`	`+ -s EXPORTED_RUNTIME_METHODS=['HEAPU8']`
`93`	`94`	`)`
`94`	`95`	`string(REPLACE ";" " " LINK_WASM_FLAGS "${LINK_WASM_LIST}")`
`95`	`96`