eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2026-06-16 04:27:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unfortunately some frei0r patterns are not available under OSX; removing

Browse Source 
them for the default patterns.
This commit is contained in:
brunoherbelin
2020-09-21 23:01:54 +02:00
parent 519baf7a3b
commit e84b16c9ce
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PatternSource.cpp
+7 -11
View File
@@ -37,12 +37,11 @@
// spokes (22) – Spokes
// gradient (23) – Gradient
// colors (24) – Colors
const char* pattern_internal_[25] = { "videotestsrc pattern=black",
const char* pattern_internal_[23] = { "videotestsrc pattern=black",
"videotestsrc pattern=white",
"frei0r-src-test-pat-l",
"videotestsrc pattern=gradient",
"videotestsrc pattern=checkers-1 ! video/x-raw,format=GRAY8 ! videoconvert",
"frei0r-src-test-pat-g",
"videotestsrc pattern=checkers-8 ! video/x-raw,format=GRAY8 ! videoconvert",
"videotestsrc pattern=circular",
"videotestsrc pattern=pinwheel",
"videotestsrc pattern=spokes",
@@ -50,7 +49,6 @@ const char* pattern_internal_[25] = { "videotestsrc pattern=black",
"videotestsrc pattern=green",
"videotestsrc pattern=blue",
"videotestsrc pattern=smpte100",
"frei0r-src-test-pat-c",
"videotestsrc pattern=colors",
"videotestsrc pattern=smpte",
"videotestsrc pattern=snow",
@@ -66,10 +64,9 @@ const char* pattern_internal_[25] = { "videotestsrc pattern=black",
std::vector<std::string> Pattern::pattern_types = { "100% Black",
"100% White",
"Gray bars",
"Gradient",
"Checkers 1x1 px",
"Checkerboard",
"Checkers 8x8 px",
"Circles",
"Pinwheel",
"Spokes",
@@ -77,7 +74,6 @@ std::vector<std::string> Pattern::pattern_types = { "100% Black",
"100% Green",
"100% Blue",
"Color bars",
"Color Gradient",
"Color grid",
"SMPTE test pattern",
"Television snow",
@@ -106,14 +102,14 @@ glm::ivec2 Pattern::resolution()
void Pattern::open( uint pattern )
{
type_ = CLAMP(pattern, 0, 25);
type_ = CLAMP(pattern, 0, 22);
std::string gstreamer_pattern = pattern_internal_[type_];
// always some special cases...
switch(type_)
{
case 18:
case 19:
case 16:
case 17:
{
std::ostringstream oss;
oss << " kx2=" << (int)(aspectRatio() * 10.f) << " ky2=10 kt=4";
@@ -126,7 +122,7 @@ void Pattern::open( uint pattern )
}
// all patterns before index are single frames (not animated)
single_frame_ = type_ < 15;
single_frame_ = type_ < 13;
// (private) open stream
open(gstreamer_pattern);