Trek H
35504f2f4d
Merge branch 'm3u-update' into m3u-live
2020-01-21 13:27:04 +10:30
Trek H
2e47a3af92
Merge branch 'm3u-reduc' into m3u-live
2020-01-21 13:26:47 +10:30
Trek H
7eb717a35a
Merge branch 'm3u-minor' into m3u-live
2020-01-21 13:26:34 +10:30
Trek H
3ae4670e49
Merge branch 'm3u-loader-correction' into m3u-live
2020-01-21 13:26:15 +10:30
Trek H
9e963d0bb5
Merge branch 'm3u-ts' into m3u-live
2020-01-21 13:25:51 +10:30
Trek H
3702bb2bb3
Merge branch 'm3u-reduction' into m3u-live
2020-01-21 13:25:40 +10:30
Trek H
80b693e0f3
Merge branch 'mtsdemuxer-change' into m3u-live
2020-01-21 13:25:14 +10:30
Trek H
461ff32cc6
Merge branch 'master' into m3u-update
2020-01-21 11:51:31 +10:30
Trek H
6f583a2815
mjpeg-player: comments for classes and functions
2020-01-21 11:47:37 +10:30
Trek Hopton
a0026bd2f0
Merged in js-mjpeg (pull request #341 )
...
mjpeg-player: append to lexer
Approved-by: Alan Noble
2020-01-20 11:40:42 +00:00
Trek H
e278397aa3
mjpeg-player: append to lexer
...
The mjpeg lexer can now have data appended to it as many times as needed instead of having the data passed at construction.
2020-01-20 21:00:24 +10:30
Trek H
9c978be91b
mjpeg-player: updated player for m3u changes
...
Updated player to play data that has been loaded using the hlsjs m3u loading code.
Added an input URL element to html to load playlists.
2020-01-20 20:52:37 +10:30
Trek H
ceac1c9e32
mjpeg-player: reduce and simplify hlsjs code
...
hls.js and stream-controller were both very large ariginally so as to make things simpler, they have been reduced in size and complexity and now just perform the functionality that we need.
2020-01-20 20:31:23 +10:30
Trek H
8e718386f2
mjpeg-player: minor changes to xhr-loader and frag-loader
...
Changes include: using console for logger, import statements, formatting.
2020-01-20 20:20:03 +10:30
Trek H
6fa4abe78c
mjpeg-player: playlist loader modification
...
Typescript code has been removed.
Functionality that is not being used has been removed.
2020-01-20 20:05:23 +10:30
Trek H
823334a983
mjpeg-player: added file headers
2020-01-20 19:52:22 +10:30
Trek H
f062a8456e
mjpeg-player: added config and events file headers
2020-01-20 19:46:23 +10:30
Trek H
5ad32207b3
mjpeg-player: updated mtsdemuxer header
2020-01-20 19:44:12 +10:30
Trek H
2d71869104
mjpeg-player: added level-key ts conversion
2020-01-20 17:37:51 +10:30
Trek H
476c306620
mjpeg-player: mtsdemuxer functionality change
...
changed MTSDemuxer's 'append' to 'demux' because it is not appending.
Updated MTSDemuxer so that it doesn't store the stream after demuxing it, it simply demuxes the data it's given and returns the demuxed data.
Any PES packets that were truncated are kept to be tried at the next call to demux.
2020-01-20 16:03:35 +10:30
Trek H
290ba3ae3f
mjpeg-player: conversion from typescript to javascript code
...
Changing the typescript code to javascript code.
Updated import statements.
2020-01-20 15:42:22 +10:30
Trek H
b8195e5ef9
mjpeg-player: reduced config vars and events
...
Reduced the lengthy lists of config vars and events used by hlsjs player that we no longer need.
Also removed typescript typing from config.js
2020-01-20 15:20:13 +10:30
Trek Hopton
feae838b3f
Merged in m3u-files (pull request #329 )
...
All files for m3u addition present with updated extensions
Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-20 04:03:54 +00:00
Scott Barnard
75946c6bdd
Merged in mode-var-type (pull request #331 )
...
revid: include mode var in var types
Approved-by: Alan Noble <anoble@gmail.com>
2020-01-20 03:18:46 +00:00
Scott
eea0f2d9dc
revid/config/config.go: added vartype mode
2020-01-20 11:51:30 +10:30
Trek H
e58e95f3ed
Merge branch 'master' into m3u-files
2020-01-17 16:44:21 +10:30
Trek H
acb6c28b9b
mjpeg-player: added packages used by hls.js code
2020-01-17 16:28:48 +10:30
Scott Barnard
123c7d163a
Merged in mjpeg-extract-error (pull request #327 )
...
Fixed mjpeg extract.go returning errors when it should not.
Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-17 05:56:59 +00:00
Trek H
fd476ad964
mjpeg-player: renamed all .ts files to .js
2020-01-17 16:20:30 +10:30
Alan Noble
3a743ea917
revid/config/config.go: reverted incorrect change
2020-01-15 13:58:51 +10:30
Alan Noble
ea42a532d7
Merge branch 'master' of https://bitbucket.org/ausocean/av
2020-01-15 13:47:37 +10:30
Alan Noble
4bfad21003
revid/config/config.go: fixed typo in outputs data type (enums->enum)
2020-01-15 13:46:56 +10:30
Scott
8dbcf1c148
extract_test.go: Simplified test code
2020-01-15 13:22:41 +10:30
Scott Barnard
bf9f44dfb7
Merged in camera-ip-variable (pull request #326 )
...
CameraIP variable added
Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-14 10:49:56 +00:00
Scott
35a413c80a
Added test file for extract.go
2020-01-14 16:46:35 +10:30
Scott
0a79ac3474
Fixed mjpeg extract.go returning errors when it should not.
2020-01-09 16:03:52 +10:30
Scott
6d2c58cd66
CameraIP variable added
2020-01-09 15:28:49 +10:30
Saxon Milton
949c4ee2af
Merged in using-vring (pull request #324 )
...
revid: now using variable ring buffer
Approved-by: Alan Noble <anoble@gmail.com>
2020-01-09 03:44:49 +00:00
Saxon
78bb0db323
revid: removed comment no longer needed
2020-01-09 14:04:37 +10:30
Saxon
d90d2203bd
revid: only using one set of ring buffer parameters rather than MTS and RTMP
2020-01-09 13:58:44 +10:30
Saxon
7086960e66
revid/revid.go: fixed ring buffer related string literal confusion
2020-01-09 13:38:23 +10:30
Saxon
0f9eba4bb1
revid/config/config.go: updated ring buffer variable names in TypeData map
2020-01-09 13:38:23 +10:30
Saxon
e9bd2fc0d1
revid: now using variable ring buffer
2020-01-09 13:31:03 +10:30
Scott Barnard
f5b8ea10fc
Merged in motion-filter-variables (pull request #325 )
...
Motion filter variables
Approved-by: Saxon Milton <saxon.milton@gmail.com>
2020-01-09 02:13:27 +00:00
Scott
be3f82616b
Increased iot version to v1.2.11
2020-01-09 11:41:09 +10:30
Scott
1b45c52379
Added motion filter variables.
2020-01-09 11:41:09 +10:30
Saxon Milton
be27d17c7a
go.mod updated to use utils version with vring
2020-01-08 01:51:55 +00:00
Saxon Milton
36220e967f
Merged in rtp-jpeg-extractor (pull request #289 )
...
codec/mjpeg: RTP/JPEG extractor
Approved-by: Alan Noble <anoble@gmail.com>
2020-01-07 04:43:07 +00:00
Saxon
ca9c1ad425
codec/mjpeg/jpeg.go: removed white space
2020-01-07 14:47:06 +10:30
Saxon
723166ec50
codec/mjpeg/jpeg.go: simplified copy
2020-01-07 14:45:25 +10:30