Commit Graph

3011 Commits

Author SHA1 Message Date
Saxon Milton 6dccc5c4d5 Merged in extracter-to-extractor (pull request #269)
codec/h264/extract.go: extracter->extractor everywhere
2019-10-27 22:42:17 +00:00
Saxon 47f6dcfe51 codec/h264/extract.go: extracter->extractor everywhere 2019-10-28 08:41:49 +10:30
Saxon Milton 8edfbeb369 Merged in break-bad-sat-or-bright (pull request #268)
revid/revid.go: break if the given saturation or brightness vars are invalid
2019-10-25 21:57:47 +00:00
Saxon 7dac9799be revid/revid.go: break if the given saturation or brightness vars are invalid 2019-10-26 08:24:53 +10:30
Saxon Milton 21493cf969 Merged in gvctrl-chan-1-support (pull request #267)
input/gvctrl: add support for channel 1 on GeoVision, and subsequently 1080p resolution

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-25 11:00:19 +00:00
Saxon f1c0fc1dbf revid: created CameraChan config field to allow selection of GeoVision camera channel 2019-10-25 12:12:30 +10:30
Saxon f74e3a3d7c input/gvctrl/gvctrl.go: added extra form fields in the case of channel 1 control
Also updated testing. Added a new test.
2019-10-25 12:04:25 +10:30
Saxon c01879d364 input/gvctrl/gvctrl_test.go: fixed TestHeight 2019-10-25 12:04:25 +10:30
Saxon a5064e872c input/gvctrl/gvctrl.go: adapted CBRBitrate option function to supported 1080 resolution bitrates 2019-10-25 12:04:25 +10:30
Saxon d3cb619389 input/gvctrl/gvctrl.go: adapted Height option function to support channel 1 resolution options (just 1080p so far) 2019-10-25 12:04:25 +10:30
Saxon 710a245c89 input/gvctrl: added Channel option function and started making changes
Added a field called ch to hold the channel. Ch can be set using Channel option function.
Created default channel const and setting ch field in newSettings. Started making changes
to other option functions, namely CodecOut, subsequently, wrote testing for it."
2019-10-25 12:04:25 +10:30
Saxon Milton 392ed399d9 Merged in use-gvctrl-in-revid (pull request #266)
Use gvctrl in revid

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-25 01:27:05 +00:00
Saxon a30c17d5eb input/gvctrl: remove go.mod file 2019-10-23 20:24:59 +10:30
Saxon 4a68c42510 cmd/revid-cli/main.go: fixed description for CameraIP flag 2019-10-23 20:02:10 +10:30
Saxon a40aef5160 circleci: updated golang version to 1.13 2019-10-23 16:17:44 +10:30
Saxon 529ca0d547 codec/h264/extract.go: simplified switch 2019-10-23 14:38:18 +10:30
Saxon 2b52266407 revid/inputs.go: corrected ipCamPass value 2019-10-23 14:06:16 +10:30
Saxon 02a44ecea2 fixed audio testing requiring logger 2019-10-23 12:59:12 +10:30
Saxon 38cfad7b67 revid: fixing some more bugs
Fixed H264 RTP extractor. Fine tuned some timing regarding geovision setup. Added some more
logging to geovision setup.
2019-10-23 12:48:22 +10:30
Saxon f336a03d7a revid: general bug fixing
Use http instead of https in gvctrl getLogin request. Gave RTP client a close method so that the conn can
be closed after we're done with the client. Put timeout on reading from the RTP client PacketConn so that
we don't hang on the ReadFrom call if the conn is closed. Closing the RTSP and RTP clients when
startRTSPCamera is returned.
2019-10-22 23:04:33 +10:30
Saxon 504179c03b revid: added code to deal with Input var 2019-10-22 16:17:35 +10:30
Saxon 8c1c192218 revid: revid config to update geovision configuration using gvctrl
Added required new params to config structure, and therefore also added new defaults and validation checking.
Also updated revid's update func so that we can control new parameters using vars. Now using gvctrl in
startRTSPCamera function and interpreting revid config to configure camera.
2019-10-22 14:54:38 +10:30
Saxon Milton 38eed6bb2d Merged in fix-mjpeg-lex (pull request #261)
codec/mjpeg/lex.go: returning nil error from Lex if we get io.EOF on reading bytes

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-20 02:24:45 +00:00
Saxon 7181532ccb codec/mjpeg/lex.go changed error checks for io.EOF to positive checks 2019-10-20 09:08:19 +10:30
Saxon Milton ce6c12cce8 Merged in geovision-api (pull request #263)
input/gvctrl: GeoVision control API

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-17 22:31:16 +00:00
Saxon Milton 3f292b1ef6 Merged in fix-err-chan (pull request #265)
protocol/rtcp/client.go: initialise error chan err in constructor rather than Client.Start() function
2019-10-15 06:32:33 +00:00
Saxon 5995f1a815 protocol/rtcp/client.go: initialise error chan err in constructor rather than Client.Start() function 2019-10-15 16:59:52 +10:30
Saxon 8163a956a9 updated go.mod go version and included test repo 2019-10-15 11:34:01 +10:30
Saxon Milton a6722fec05 Merged in write-timeouts-as-int (pull request #264)
revid: write timeouts for ringbuffer are just int to avoid overflow when converting duration to int on pi for the purpose of logging
2019-10-15 00:34:00 +00:00
Saxon 8837dce389 revid: write timeouts for ringbuffer are just int to avoid overflow when converting duration to int on pi for the purpose of logging 2019-10-15 11:02:28 +10:30
Saxon ee1bea3f77 revid: fixed crash: converting durations to int before giving to logger as args 2019-10-15 10:52:48 +10:30
Saxon 239db674a3 input/gvctrl: using log-in rather than log in in comments 2019-10-14 16:07:15 +10:30
Saxon 0111ba706d input/gvctrl: using login or Login rather than logIn or LogIn 2019-10-14 16:05:38 +10:30
Saxon ea7bba7823 input/gvctrl/gvctrl-cli/main.go: added package documentation 2019-10-14 11:07:27 +10:30
Saxon c726571399 input/gvctrl/request.go: added documentation to request.go 2019-10-14 11:05:11 +10:30
Saxon 5b17613489 input/gvctrl/utils.go: wrote documentation for utils.go 2019-10-14 10:37:41 +10:30
Saxon b86ff77996 input/gvctrl/gvctrl.go: wrote documentation in gvctrl.go and renamed BitRate to Bitrate 2019-10-14 09:56:43 +10:30
Saxon ab71c2cb06 input/gvctrl/gvctrl-cli/main.go: added sub package gvctrl-cli under gvctrl
gvctrl-cli provides a command line interface for controlling the geovision camera. Good for
testing purposes.
2019-10-13 21:52:48 +10:30
Saxon b3c3b842c8 input/gvctrl: moved unexported stuff from gvctrl.go to be more friendly to API users 2019-10-13 18:25:36 +10:30
Saxon cda7093c21 input/gvctrl: added another test case to TestPopulateForm and fixed potential bug regarding bitrate defaults 2019-10-13 18:11:49 +10:30
Saxon afe136a51d input/gvctrl/gvctrl_test.go: added TestPopulateForm to test construction of settings form and fixed bugs 2019-10-13 12:42:31 +10:30
Saxon Milton 5642af9cc5 Merged in gv-h264-rtmp-fix (pull request #262)
revid: fix GeoVision H264 over RTMP to youtube

Approved-by: Alan Noble <anoble@gmail.com>
2019-10-12 10:43:16 +00:00
Saxon 874b9639cf revid: made RTMP and MTS sender ring buffer write timeouts configurable 2019-10-12 21:10:48 +10:30
Saxon 8489d615d8 revid: panic if invalid input, or invalid input codec for corresponding input 2019-10-12 20:54:32 +10:30
Saxon 7639c7bb74 input/gvctrl/gvctrl_test.go: added test for Refresh option function 2019-10-12 18:07:32 +10:30
Saxon 9e4ff72c48 input/gvctrl/gvctrl_test.go: added test for BitRate option function 2019-10-12 17:54:21 +10:30
Saxon ad83376cd6 input/gvctrl/gvctrl_test.go: added test for Height option function and fixed how option functions work with the settings struct 2019-10-12 17:27:09 +10:30
Saxon de915bcb00 input/gvctrl/gvctrl_test.go: added test for convRate 2019-10-12 17:05:44 +10:30
Saxon caa46939b4 input/gvctrl/gvctrl_test.go: added gvctrl_test.go file and wrote test for closestValIdx 2019-10-12 16:58:15 +10:30
Saxon 366226bb29 input/gvctrl: changed name of closestValStr back to convRate as can only be used by Bitrate options function 2019-10-12 16:48:35 +10:30