Remove opencv highgui code path #56
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I'd like to make cimbar_send use cimbar_js. We'll see how that goes... (there's an argument for removing the opencv_highgui code path here, and I did that on an alternate branch. But I think I'll keep it for now)
For the moment, we'll ditch the shakycam (on) and rotate (off) options. Might get rid of rotate altogether?
Since we tend to use it in a shared_ptr, it's pretty confusing to use `reset()` as the function name.
imshow() + waitKey() doesn't fit how I want to do frame pacing.
sz3
force-pushed
the
cimbar-send-refactor2
branch
from
fa7d9d3 to
65a11d9
Compare
sz3
force-pushed
the
cimbar-send-refactor2
branch
from
65a11d9 to
3e1e435
Compare
sz3
commented
Apr 30, 2021
| @@ -29,8 +42,6 @@ int main(int argc, char** argv) | |||
| ("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))) | |||
| ("r,rotatecam", "Successive images are rotated 90 degrees", cxxopts::value<bool>()) | |||
| ("s,shakycam", "Successive images are offset, like a shaky camera effect", cxxopts::value<bool>()) | |||
There was a problem hiding this comment.
Losing the shake/rotate flags -- I'm ok with that. The "shakycam" behavior is now standard.
sz3
commented
Apr 30, 2021
| if (_window and _fes) | ||
| { | ||
| unsigned buff_size_new = cimbar::Config::fountain_chunk_size(_ecc, cimbar::Config::symbol_bits() + _colorBits); | ||
| if (!_fes->reset_and_resize_buffer(buff_size_new)) | ||
| if (!_fes->restart_and_resize_buffer(buff_size_new)) |
There was a problem hiding this comment.
Decided to rename this -- it's usually used as a smart ptr, and reset() already means something.
sz3
added a commit
that referenced
this pull request
Mar 13, 2024
b39469c Merge pull request #56 from sz3/cimbar-send-refactor2 3e1e435 Update dependency list to single out GLES 2da86fe Find clang 257973d Slightly more readable, maybe? 0a6bda1 killing the opencv_highgui code path after all 50d65a7 Fix cimbar_send encode_id. 8216c3b Bugfix -- reset _frameCount when we reset the stream 0ca7dd1 Rename the fountain_encoder_stream's `reset()` to `restart()` 22b58ff Switch cimbar_send to use cimbar_js 6b7022f Add header for cimbar_js, and add extra params to configure() 71ab9ea Moving cimbar_js into src/lib/ 4415602 Merge pull request #55 from sz3/decode-more 918ffb2 Update build instructions to match reality 6376e12 indentation fc5ef1c Merge remote-tracking branch 'origin/master' into decode-more 79a91b2 Smaller image 9ffb94e Merge pull request #54 from sz3/glshake 61fff8f I don't think I mentioned compression anywhere. fc04ea6 more docs? 8e5fa90 Misc docs updates, including new performance numbers! 206c786 Add a few tests for the larger size bf2c492 Misc code cleanup f8408b3 I think document.documentElement is what I actually want 7247339 Fullscreen toggle? 48b2d1a Spending my time on important things, like gradients e340559 New numbers, and they are quick a865dd4 Simpler gradient, same effect 5b86c29 WIP: having more light (white) helps the camera 4c5f826 I like this interface slightly more. f979012 🤔 0626afc Tired of the mouse cursor getting in the way... 21e39db Update help 6933d3e fix color bug with highgui c15ac29 The motivation of the shaky_cam is to detect cross-frame overlap, 7be3d91 Do the preprocessing sharpen after the grayscale a49fe7f Only dark mode for now 87338c4 Reimplement shakycam for opencv_highgui a2ffe08 maybe this instead -- variable canvas size for CimbWriter 396939a It's something like this, but... f6b6496 I don't know about this one chief 355ef7c Is this better? d869656 use loop_iterator? cb84a59 hmm 0de861b quick WIP for GLSL transpose for the shakycam effect git-subtree-dir: app/src/cpp/libcimbar git-subtree-split: b39469c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes GLFW a requirement for native builds, but that seems reasonable given its importance for cimbar.js.
cimbar_sendalso now uses the cimbar_js code path, which is built as a static library on linux.A side effect: frame pacing improvements (= transfer speed improvements) when using
cimbar_send.