187 Commits

Author SHA1 Message Date
Oscar
feb2eb1603 Add files via upload 2022-07-16 22:06:07 +08:00
Oscar
df163985b7 Update videoprofile.go 2020-08-13 00:25:21 +08:00
Oscar
7ec54d72c1 Merge pull request #15 from woody0105/master
bug fix(exeption handling when no detection filter is created)
2020-07-07 16:34:35 +08:00
User01
074c8304f9 Merge remote-tracking branch 'upstream/master' 2020-07-07 13:27:23 +08:00
User01
e1710bfa5a modified: cmd/server/testserver.go
modified:   ffmpeg/ffmpeg.go
	modified:   ffmpeg/lpms_ffmpeg.c
2020-07-07 13:10:21 +08:00
Oscar
84d684ca73 Merge pull request #14 from woody0105/master
object tracking(centroid)
2020-07-04 10:21:37 +08:00
User01
3b3ea76244 Merge branch 'master' of https://github.com/woody0105/lpmsdemo 2020-07-02 21:06:14 +08:00
User01
fbc5bbac87 modified: ffmpeg/lpms_ffmpeg.c
modified:   ffmpeg/lpms_ffmpeg.h
2020-07-02 21:04:33 +08:00
Goforit
4e20e8277f Update work-diary.me 2020-06-30 04:36:11 -04:00
Oscar
cc07342b30 Merge pull request #13 from woody0105/master
change api server port to 8080, change buffer size of the yolo metadata to 8192
2020-06-26 10:36:59 +08:00
User01
d6b3a99753 modified: cmd/server/testserver.go 2020-06-26 10:30:16 +08:00
User01
34933690e9 modified: cmd/server/testserver.go
modified:   ffmpeg/lpms_ffmpeg.h
2020-06-26 10:26:25 +08:00
Oscar
c3e293c349 Update README.md 2020-06-26 09:53:00 +08:00
Oscar
1727b1a799 Merge pull request #12 from woody0105/master
modified:   ffmpeg/lpms_ffmpeg.c
2020-06-24 00:26:00 +08:00
User01
cf02e9c6d4 modified: ffmpeg/lpms_ffmpeg.c 2020-06-24 00:21:10 +08:00
Oscar
f244d5f54a Merge pull request #11 from woody0105/master
rescale object coordinate (modified:   ffmpeg/lpms_ffmpeg.c)
2020-06-23 23:44:29 +08:00
User01
8b940151f5 modified: ffmpeg/lpms_ffmpeg.c 2020-06-23 23:33:28 +08:00
Oscar
1056eea59f Merge pull request #10 from woody0105/master
class name fix
2020-06-23 22:00:14 +08:00
User01
c4ffae2070 modified: ffmpeg/ffmpeg.go 2020-06-23 21:44:35 +08:00
User01
6071da73ee Merge remote-tracking branch 'upstream/master' 2020-06-23 20:28:24 +08:00
oscar-davids
7b387c3723 fix error 2020-06-23 20:21:29 +08:00
User01
c90112cfb0 Merge remote-tracking branch 'upstream/master' 2020-06-22 22:42:25 +08:00
User01
2c77242e29 modified: ffmpeg/lpms_ffmpeg.h 2020-06-22 22:42:10 +08:00
oscar-davids
cbe6566b26 modify default parameter & fixed critical error 2020-06-22 22:05:11 +08:00
Oscar
429cdb75d3 Update README.md 2020-06-22 22:06:37 +08:00
Oscar
2fe7468d32 Merge pull request #9 from woody0105/master
api server demo with detection results returned as part of multipart return
2020-06-22 22:01:08 +08:00
User01
110194541c Merge branch 'master' of https://github.com/woody0105/lpmsdemo 2020-06-22 20:58:09 +08:00
User01
2c65113485 modified: ffmpeg/videoprofile.go 2020-06-22 20:56:24 +08:00
Goforit
f96806d67c Update README.md 2020-06-22 08:51:47 -04:00
Goforit
8b08b3b599 Update README.md 2020-06-22 08:49:24 -04:00
User01
47b9474ffe modified: cmd/server/testserver.go
modified:   detection/detection.go
2020-06-22 20:23:03 +08:00
oscar-davids
b6e67961e9 added test image 2020-06-20 10:58:51 +00:00
oscar-davids
01b0011af4 added lass name for tf test 2020-06-20 10:55:52 +00:00
oscar-davids
ba7b981f47 added tf test python code 2020-06-20 10:54:15 +00:00
User01
c38de3b7e2 deleted: cmd/server/detection.go
modified:   cmd/server/testserver.go
	new file:   detection/detection.go
	modified:   ffmpeg/videoprofile.go
2020-06-18 21:04:32 +08:00
User01
e365852504 modified: cmd/server/detection.go
modified:   cmd/server/testserver.go
2020-06-18 11:20:58 +08:00
User01
00ff214a12 renamed: detection/detection.go -> cmd/server/detection.go
new file:   cmd/server/testserver.go
2020-06-18 10:56:59 +08:00
User01
c809ca7683 modified: detection/detection.go 2020-06-18 10:19:27 +08:00
User01
0bc2185909 renamed: cmd/example/detection/detection.go -> detection/detection.go 2020-06-18 10:16:12 +08:00
User01
7cc3b2d270 new file: cmd/example/detection/detection.go 2020-06-18 10:01:35 +08:00
Oscar
eac05c211f Add files via upload 2020-06-16 10:24:36 +08:00
Oscar
5c49796f24 Merge pull request #8 from woody0105/master
fix object detection duplicate issue in daterange metadata	(modified:   ffmpeg/lpms_ffmpeg.c)
2020-06-10 01:38:44 +08:00
User01
566739c919 modified: ffmpeg/lpms_ffmpeg.c 2020-06-10 01:31:45 +08:00
Oscar
0f858473b2 Merge pull request #7 from woody0105/master
modify object detection metadata to have timestamps
2020-06-09 17:26:40 +08:00
User01
f0332762b9 modified: ffmpeg/lpms_ffmpeg.c
modified:   ffmpeg/lpms_ffmpeg.h
2020-06-09 13:56:30 +08:00
User01
1c02d03b54 modified: cmd/example/main.go
modified:   stream/basic_hls_videostream.go
	modified:   stream/stream.go
2020-06-04 18:50:09 +08:00
Oscar
4d9abe57dd Merge pull request #6 from woody0105/master
fix program-datetime issue in AddHLSSegment
2020-06-04 10:38:07 +08:00
User01
763830d65c modified: cmd/example/main.go
modified:   stream/basic_hls_videostream.go
	modified:   stream/stream.go
2020-06-04 09:22:47 +08:00
User01
5ca69bd515 modified: stream/basic_hls_videostream.go
modified:   transcoder/ffmpeg_segment_transcoder.go
2020-06-04 08:52:05 +08:00
Oscar
15c81ba8e0 Merge pull request #4 from woody0105/master
add object detection metadata to hls ext-x-daterange tag
2020-06-02 09:43:25 +08:00