Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions server/input-conway.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
settings:
gamma: 1.00
elements:
"elem1":
id: 1
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [0, 0]
"elem2":
id: 2
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [0, 32]
"elem3":
id: 3
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [32, 0]
"elem4":
id: 4
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [32, 32]
gamma: 1
elements:
106 changes: 98 additions & 8 deletions server/input-image-test.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,111 @@
settings:
gamma: 1.05
elements:
"elem1":
"bjlkjbkb (1)":
id: 1
type: "carousel"
filepaths:
framerate: 1
location: [10,2]
"bjlkjbkb":
id: 2
type: "carousel"
filepaths:
framerate: 1
location: [10,2]
"khbkjb":
id: 3
type: "webcam"
camera-number: 0
framerate: 30
location: [20,2]
"bjbkjb":
id: 4
type: "rtmp"
stream-name: ""
framerate: 30
location: [23,0]
"efwefw":
id: 5
type: "webcam"
camera-number: 0
framerate: 30
location: [22,4]
"qdewqecw":
id: 6
type: "video"
filepath: ""
framerate: 30
location: [13,17]
"fwfwecw":
id: 7
type: "webcam"
camera-number: 0
framerate: 30
location: [20,17]
"ewfew":
id: 8
type: "video"
filepath: ""
framerate: 30
location: [5,14]
"eewew":
id: 9
type: "video"
filepath: ""
framerate: 30
location: [13,11]
"seres":
id: 10
type: "carousel"
filepaths:
framerate: 1
location: [45,0]
"skdkd":
id: 12
type: "webcam"
camera-number: 0
framerate: 30
location: [17,13]
"ssss":
id: 14
type: "video"
filepath: ""
framerate: 30
location: [32,11]
"sss":
id: 15
type: "rtmp"
stream-name: ""
framerate: 30
location: [12,17]
"ss":
id: 16
type: "carousel"
filepaths:
framerate: 1
location: [29,16]
"elem2 (1)":
id: 17
type: "image"
filepath: "images/img.jpg"
location: [4,9]
scale: 0.025
"elem1":
id: 18
type: "image"
filepath: "images/apple.png"
location: [18, 54]
location: [18,54]
scale: 1
"elem2":
id: 2
id: 19
type: "image"
filepath: "images/img.jpg"
location: [4, 0]
location: [20,0]
scale: 0.025
"elem3":
id: 3
id: 20
type: "image"
filepath: "images/Alan_32x32_Transparent.png"
location: [5, 20]
scale: 1
filepath: "images/rainbow.png"
location: [5,20]
scale: 1
8 changes: 1 addition & 7 deletions server/input-rainbow.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
settings:
gamma: 1.05
elements:
"elem1":
id: 1
type: "image"
filepath: "images/rainbow.png"
location: [0, 0]
scale: 0.5
elements:
55 changes: 41 additions & 14 deletions server/input-rotated-element-test.yaml
Original file line number Diff line number Diff line change
@@ -1,41 +1,68 @@
settings:
gamma: 1.05
elements:
"ddddd":
id: 2
type: "rtmp"
stream-name: ""
framerate: 30
location: [21,23]
"nono":
id: 4
type: "video"
filepath: ""
framerate: 30
location: [10,24]
"dddd":
id: 5
type: "rtmp"
stream-name: ""
framerate: 30
location: [15,9]
"ssss":
id: 6
type: "webcam"
camera-number: 0
framerate: 30
location: [21,9]
"xxxx":
id: 7
type: "video"
filepath: ""
framerate: 30
location: [0,9]
"elem1":
id: 1
id: 8
type: "video"
filepath: "images/alan/alan_ca_4_64x64.mp4"
location: [0, 0]
framerate: 30
rotation: 180
location: [10,6]
"elem2":
id: 2
id: 9
type: "carousel"
filepaths: ["images/creeper.png", "images/hello-rainbow.png"]
location: [12, -12]
filepaths:
- "images/creeper.png"
- "images/hello-rainbow.png"
framerate: 2
rotation: 90
location: [12,-12]
"elem3":
id: 3
id: 10
type: "image"
filepath: "images/img.jpg"
location: [40,10]
scale: 0.015
rotation: 30.0
"elem4":
id: 4
id: 11
type: "rtmp"
stream-name: "test"
framerate: 60
location: [0,44]
size: [20,20]
rotation: -45
"elem5":
id: 5
id: 12
type: "text"
content: "Hello"
size: 24
color: "#0025ff"
font_path: "ttf/Lobster-Regular.ttf"
location: [5,30]
rotation: -15.0
location: [5,30]
20 changes: 3 additions & 17 deletions server/input-rtmp-test-two-streams.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
settings:
gamma: 1.0
elements:
"rtmp-elem1":
id: 1
type: "rtmp"
stream-name: "test"
framerate: 60
location: [0,0]
size: [32, 32]
"rtmp-elem2":
id: 2
type: "rtmp"
stream-name: "test2"
framerate: 60
location: [32, 0]
size: [32, 32]
settings:
gamma: 1
elements:
13 changes: 3 additions & 10 deletions server/input-rtmp-test.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
settings:
gamma: 1.0
elements:
"rtmp-elem1":
id: 1
type: "rtmp"
stream-name: "test"
framerate: 60
location: [0,0]
size: [64, 64]
settings:
gamma: 1
elements:
20 changes: 2 additions & 18 deletions server/input-text.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
#Beyond just the id, the id is also a weight to determine which images have layering priority
#As of right now, we only support "image" and "text" -- "video" is planned.
settings:
gamma: 1.0
elements:
"elem1":
id: 1
type: "image"
filepath: "images/rainbow.png"
location: [0, 0]
scale: 0.5
"elem2":
id: 2
type: "text"
content: "WHATS UP GUYS!!1"
size: 24
color: "#0025ff"
font_path: "ttf/Lobster-Regular.ttf"
location: [5,0]
gamma: 1
elements:
20 changes: 14 additions & 6 deletions server/input-webcam.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
settings:
gamma: 2.0
gamma: 2
elements:
"elem1":
"aaa":
id: 1
type: "webcam"
camera-number: 2
framerate: 10
location: [0, 0]
type: "carousel"
filepaths:
framerate: 1
location: [0,0]
"sss":
id: 2
type: "text"
content: "ss"
size: 24
color: "#0025ff"
font_path: "ttf/Roboto-Regular.ttf"
location: [38,0]
37 changes: 1 addition & 36 deletions server/input.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,3 @@
#Beyond just the id, the id is also a weight to determine which images have layering priority


#Gamma - Less than 1 -> lighter, More than 1 -> Darker

settings:
gamma: 1.25
elements:
"elem1":
id: 1
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [0, 0]
"elem2":
id: 2
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [0, 32]
"elem3":
id: 3
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [32, 0]
"elem4":
id: 4
type: "video"
filepath: "images/conway_pulsar.mp4"
framerate: 1
location: [32, 32]
"elem5":
id: 5
type: "video"
filepath: "images/cat64.mp4"
framerate: 30
location: [0, 0]
elements: