Commit Graph

262 Commits

Author SHA1 Message Date
jb-alvarado
d619cd3c8b fix overlay in copy mode, calculation pre bitrate, cleanup 2019-08-09 17:31:39 +02:00
jb-alvarado
be5e373fd1 don't bother user with bitrate and copy settings, expose aspect 2019-08-09 17:29:48 +02:00
jb-alvarado
54f69b02d8 Merge branch 'master' of https://github.com/ffplayout/ffplayout-engine 2019-08-04 21:48:05 +02:00
jb-alvarado
34b38c9491 cleanup code, fix: #21 2019-08-04 21:48:01 +02:00
jb-alvarado
7de4f96dc5 cleanup code 2019-08-04 21:47:01 +02:00
jb-alvarado
ed8cce9420 Merge pull request #24 from lavvy/correct_the_example_playlist_json
removed the ending commas
2019-08-04 21:39:58 +02:00
Uche Okonkwo
0b740a464d removed the ending commas 2019-08-04 12:03:03 -04:00
Jonathan Baecker
91ba298b59 fix error when source in playlist is empty 2019-07-31 10:10:26 +02:00
Jonathan Baecker
8f602441bb log to file/console option 2019-07-31 10:09:41 +02:00
jb-alvarado
c6f448f2ce check only length 2019-07-21 00:54:06 +02:00
Jonathan Baecker
2468fbcbaf change info about filler 2019-07-19 15:02:23 +02:00
Jonathan Baecker
21a7b9e08d loop filler clip, when playlist is not 24 hours long 2019-07-19 14:58:28 +02:00
Jonathan Baecker
457383ec83 remove custom refs 2019-07-19 14:49:33 +02:00
Jonathan Baecker
1a622484c8 remove begin in playlist and time_shift in config - is redundant 2019-07-19 12:49:01 +02:00
Jonathan Baecker
de01322bc6 remove map_extension, cleanup 2019-07-18 18:00:56 +02:00
Jonathan Baecker
8f3639431d cleanup 2019-06-24 15:58:22 +02:00
Jonathan Baecker
730defc1b9 Merge branch 'master' of github.com:ffplayout/ffplayout-engine 2019-06-24 15:02:07 +02:00
Jonathan Baecker
3effb577ce close when is done 2019-06-24 15:01:49 +02:00
jb-alvarado
a3b9f2af83 cleanup 2019-06-23 20:52:15 +02:00
jb-alvarado
ec9ceb3bf0 fix param 2019-06-23 20:43:53 +02:00
Jonathan Baecker
499f7b44dd Merge branch 'dev' 2019-06-19 17:05:48 +02:00
Jonathan Baecker
1d750d4204 float instead of integer 2019-06-19 16:11:30 +02:00
jb-alvarado
4279f32089 thread_queue_size for copy mode 2019-06-16 14:27:15 +02:00
jb-alvarado
05c1739b40 no overlay filter in copy mode 2019-06-16 14:06:58 +02:00
jb-alvarado
b69ff12dff params insteead of opts 2019-06-13 20:47:48 +02:00
Jonathan Baecker
af43a57a1a better default settings 2019-06-11 18:29:39 +02:00
Jonathan Baecker
3b05ad57c6 overlay scrolling text 2019-06-11 15:33:23 +02:00
Jonathan Baecker
67c58c8240 reorder variables 2019-06-11 15:28:52 +02:00
jb-alvarado
0286f94c2a Merge branch 'master' into dev 2019-06-10 11:18:25 +02:00
jb-alvarado
3991449785 tweak drawtext 2019-06-09 21:04:33 +02:00
Jonathan Baecker
3ce59811ab drawtext with config options 2019-06-07 16:42:11 +02:00
Jonathan Baecker
6fff195cd1 starting with text overlay 2019-06-07 16:12:09 +02:00
Jonathan Baecker
8f7055ed39 logging instead of printing 2019-06-07 13:34:48 +02:00
Jonathan Baecker
8a36d68ef4 spelling 2019-06-07 13:31:52 +02:00
Jonathan Baecker
224df805df add log info 2019-06-07 13:31:47 +02:00
Jonathan Baecker
218dd39b22 watchdog is optional 2019-06-07 10:58:29 +02:00
Jonathan Baecker
02bf222c4f watchdog is optional 2019-06-07 10:56:20 +02:00
Jonathan Baecker
c84196e514 remove redundant info 2019-06-07 10:53:42 +02:00
Jonathan Baecker
27d8f51099 import watchdog only when is needed 2019-06-07 10:16:39 +02:00
Jonathan Baecker
9fb58a4b48 add link for wiki entry 2019-06-07 10:04:58 +02:00
Jonathan Baecker
e0f829871f handle sigterm, BrokenPipeError and KeyboardInterrupt 2019-06-07 09:40:32 +02:00
jb-alvarado
d70a1b5654 BrokenPipeError to execpt 2019-06-06 22:08:07 +02:00
jb-alvarado
be7f34aa7a catch KeyboardInterrupt and sigterm 2019-06-06 22:02:20 +02:00
Jonathan Baecker
cf9bdea606 update readme 2019-06-06 18:30:51 +02:00
Jonathan Baecker
c513e181da add folder watch 2019-06-06 18:16:33 +02:00
Jonathan Baecker
feff57c500 fix map_extension, add folder watch 2019-06-06 18:16:04 +02:00
Jonathan Baecker
ab7b56e37a ignore tests folder 2019-06-06 18:13:23 +02:00
Jonathan Baecker
10afe8d914 remove useless function 2019-06-05 14:21:03 +02:00
Jonathan Baecker
09ad810194 better spelling 2019-06-05 11:23:52 +02:00
Jonathan Baecker
931682ca74 update Readme 2019-06-04 15:18:05 +02:00