Commit Graph

4119 Commits

Author SHA1 Message Date
Saxon Nelson-Milton 79d3e7280b vidforward: Remove RUN_SCRIPT_DIR parameter from Makefile
This is no longer needed considering there's no longer a run
script; instead we call the binary directly in the service file.
2023-09-20 21:57:36 +00:00
Saxon Nelson-Milton e4263464ef vidforward: remove reference to non-existent run.sh file
This file used to be used for startup, but now we just start the
process directly in the service. It probably existed in the dir
last time this was tested so no errors were thrown, but on a clean
install this was a problem.
2023-09-20 21:57:18 +00:00
Saxon Milton 19eafa3228 vidforward: save manager state at end of process request
As added redundancy, let's save the manager state at the end of
the process request method as well.
2023-09-20 21:25:04 +00:00
Saxon Nelson-Milton 1621dc709b vidforward: add SIGKILL to signal.Notify for term callback
Just for further redundancy, let's also call the termination
callback (which saves the manager state in our case) for SIGKILL.
2023-09-19 10:47:10 +00:00
Saxon Milton da9ed6d689 vidforward: getPipeline handles revid creation and start
It simplifies things if getPipeline handles creation and starting
of the revid pipeline. We don't need to be doing this in multiple
places.

Approved-by: Trek Hopton
2023-09-18 23:28:51 +00:00
Saxon Milton 4087be907a vidforward: simplify manager file save/load
When saving and loading manager state to and from file, we don't
need to worry about the slate exit signals. Now that we have
broadcast status i.e. "play" or "slate", we can derive whether we
need an exit signal based only on that.

Approved-by: Trek Hopton
2023-09-18 23:25:28 +00:00
Saxon Nelson-Milton db84c5bfcf Use correct log level global variable 2023-09-17 23:16:30 +00:00
Saxon Nelson-Milton 16df4ed2aa Add more logging to createOrUpdate function
It'd be useful to see more of what's going on in here.
2023-09-17 11:03:30 +00:00
Trek Hopton a978e27e4f Merged in withcv-fix (pull request #509)
filter: change build tags to allow build withcv

Resolves Issue #412
2023-09-06 09:00:14 +00:00
Trek H 0ab1e7c38f filter: change build tags to allow build withcv 2023-09-06 18:27:55 +09:30
Saxon Milton a3c526b2e0 Merged in fix-rtmpurl-variable-load (pull request #508)
revid: Don't append Config.RTMPURL

Resolves issue #409
2023-07-24 22:57:14 +00:00
Saxon Nelson-Milton 79b0a49994 revid: don't append Config.RTMPURL
Config.RTMPURL was being appended when updated, which means that
it would just continue to grow, and by the time we actually try
to use the RTMP URLs that are stored, we end up using old ones.
Instead this should just be completely replaced.
2023-07-16 06:49:49 +00:00
David Sutton 47b2b1576f Merged in issue-399-software-channels (pull request #502)
Software Channels

Approved-by: Trek Hopton
2023-07-10 01:30:31 +00:00
David Sutton bbbd6baecb Better handle errors in setChannels 2023-07-10 10:35:17 +09:30
David Sutton 701b1f6c3a Add speakerMode checking for treatment. 2023-07-10 10:35:17 +09:30
Saxon Nelson-Milton ee7cb57fe5 vidforward: global logger returns underlying logger
The globalLogger type wraps a logger.Logger. If you use GetLogger
which gets the global logger (which provides an interface
logger.Logger) a type assertion to JSONLogger will fail, because
the type is actually globalLogger. We need to provide the
underlying logger instead when we return from GetLogger.
2023-06-23 23:40:30 +00:00
Saxon Milton 452d25ac0c Merged in non-active (pull request #507)
vidforward: improve non-active mechanism

Resolves issue #404

Approved-by: Trek Hopton
Approved-by: David Sutton
2023-06-21 10:50:27 +00:00
Saxon Nelson-Milton 9080a5d2c1 vidforward: improve non-active mechanism
This change improves the mechanism that deals with recv requests
from non active macs. We're no only logging every minute so that
we don't clutter the logs. We're also dealing with both non active
and slate recvs with the same mechanism using a switch.
2023-06-21 20:19:33 +09:30
Saxon Milton d232734d50 Merged in modify-update (pull request #506)
vidforward: only update broadcast if changed

Resolves issues #405 and #406

Approved-by: Trek Hopton
Approved-by: David Sutton
2023-06-21 10:34:37 +00:00
Saxon Nelson-Milton 26e77709aa vidforward: only update broadcast if changed
For control requests, we only update aspects of the broadcast if
they have changed. Therefore, if the urls list has not changed
the revid pipeline is not updated, similarly if the status has
not changed, we don't do anything there.
2023-06-21 20:03:39 +09:30
Saxon Milton 41fd1e345b Merged in config-watcher (pull request #505)
vidforward: add config file watcher

Resolves issue #407

Approved-by: Trek Hopton
2023-06-21 10:21:20 +00:00
Saxon Nelson-Milton bcbb187bef vidforward: add config file watcher
This change adds a file watcher and then uses this file watcher
to perform updates based on changes in a configuration file. This
configuration file contains logging parameters for the time being
in the hope that it will help with debugging.

Testing was also added for this functionality.
2023-06-21 19:48:02 +09:30
Saxon Milton 853aa31260 Merged in handle-slate-upload (pull request #503)
Add slate request handler

Resolves issue #385

Approved-by: Trek Hopton
Approved-by: David Sutton
2023-06-14 21:23:43 +00:00
Trek Hopton 05c570063b Merged in remove-nocv-make (pull request #504)
removed nocv tag from Makefiles

Approved-by: Saxon Nelson-Milton
2023-05-29 06:03:13 +00:00
Trek H 8eb407e918 removed nocv tag from Makefiles 2023-05-29 15:19:05 +09:30
Saxon Nelson-Milton 382f202bb0 Add slate request handler
This change adds a request handler for /slate. This endpoint can
now be used to upload a new slate file.
2023-05-27 09:42:46 +09:30
David Sutton e078d9f2bc Merged in local-looper (pull request #500)
local-looper

Approved-by: Saxon Milton
Approved-by: Trek Hopton
2023-05-11 05:43:54 +00:00
David Sutton dafb51d34e local-looper: Utilise service watchdog. 2023-05-11 15:13:18 +09:30
David Sutton 6b8b72ccfd local-looper: Add a simplified looper system that is not dependent on network connectivity. 2023-05-11 15:13:18 +09:30
David Sutton 9b64f7bc0e Merged in issue-396-circleci-failing (pull request #501)
Fix CircleCi issues

Approved-by: Trek Hopton
2023-05-05 05:58:55 +00:00
David Sutton f0fedd852d Update go version in .circleci/config.yml 2023-05-01 13:16:55 +09:30
Saxon Milton 05a0ba79df Merged in check-urls-len (pull request #499)
vidforward/file.go: check length of urls on load

Approved-by: David Sutton
2023-03-20 08:09:21 +00:00
Saxon Milton 336784027a Merged in new-revid-function (pull request #498)
vidforward: use consistent revid construction function

Approved-by: David Sutton
2023-03-20 08:07:59 +00:00
Saxon Nelson-Milton 418b33040c vidforward/file.go: check length of urls on load 2023-03-13 12:37:03 +10:30
Saxon Nelson-Milton c82d7a8e55 vidforward: use consistent revid construction function 2023-03-12 19:40:26 +10:30
Saxon Milton a4754e5ead Merged in revid-rtmp-url-slice (pull request #496)
revid: accept multiple RTMP outputs

Approved-by: Alan Noble
2023-03-11 22:59:12 +00:00
Saxon Milton 06a81a2b3b Merged in modify-vidforward-rtmp (pull request #497)
vidforward: modify viforward to accept multiple RTMP URLs

Approved-by: Alan Noble
2023-03-12 09:26:44 +10:30
Saxon Nelson-Milton 7055edb525 cmd/vidforward: start revid pipeline on load 2023-03-12 08:39:21 +10:30
Saxon Nelson-Milton 0059ec1017 vidforward: modify viforward to accept multiple RTMP URLs
This change modifies vidforward to accept multiple RTMP URLs in
its control request handler. This allows for the creation of a
revid pipeline for a mac with multiple RTMP outputs.
2023-03-05 08:39:39 +10:30
Saxon Nelson-Milton f8fe900207 revid: accept multiple RTMP outputs
This change modifies the revid config RTMPURL field to be a slice
instead of a single string. This allows use to have multiple RTMP
outputs.
2023-03-05 08:25:14 +10:30
David Sutton 66daab5e7c Merged in audiofiltering (pull request #495)
Fixes the AudioFilter interface.

Approved-by: Trek Hopton
2023-02-16 04:36:40 +00:00
Saxon Nelson-Milton f9cfbda44f Load broadcast state on startup 2023-02-16 10:18:15 +10:30
ausocean-david d1aa224023 Audiofiltering:
Add amplifying capabilities, using Filter.Upper as the factor for amplification
2023-02-10 21:46:21 +10:30
Saxon Nelson-Milton b68da55793 Fix slate path 2023-02-09 01:39:57 +00:00
Saxon Nelson-Milton 96078e1091 Don't do anything about cuff chan receive timeout 2023-02-09 10:46:59 +10:30
Saxon Nelson-Milton dcb9a6be4b Merge branch 'master' of http://bitbucket.org/ausocean/av 2023-02-08 21:29:00 +00:00
Saxon Nelson-Milton 5eaed275ab Bump required iot version in go.mod
Also track version and display on start up.
2023-02-08 21:35:17 +10:30
Saxon Nelson-Milton 5f157d93ab Build with no CV by default
Given that most of our camera builds do not require CV, we should
have the makefile default to no CV.
2023-02-08 19:32:56 +10:30
Saxon Nelson-Milton adc62a6442 Improving logging 2023-02-08 17:15:30 +10:30
Saxon Nelson-Milton 683bb923cb Fix various vidforward issues
This change fixes some bugs relating to the Makefile and the
systemd watchdog notifier system. We have also removed the run.sh
script which was the culprit of latter problem (not sure exactly
how, but probably something to do with PIDs).
2023-02-08 16:41:52 +10:30