Isaac Connor
|
ce53552dda
|
require audio_in_ctx as well as audio_in_stream
|
2021-01-27 16:14:07 -05:00 |
|
Isaac Connor
|
6271971912
|
Use get_videoStream in zm_camera
|
2021-01-27 16:13:43 -05:00 |
|
Isaac Connor
|
4ca9c9fe69
|
code cleanup
|
2021-01-27 16:13:03 -05:00 |
|
Isaac Connor
|
608afcbbd2
|
return bytes consumed by decode
|
2021-01-27 16:12:49 -05:00 |
|
Isaac Connor
|
4c933f82b8
|
All cameras will have an mFormatConext, CodecContext etc. Consolidate code in zm_camera. Fix remote rtsp decoding
|
2021-01-27 16:12:32 -05:00 |
|
Isaac Connor
|
666299d5fa
|
code style
|
2021-01-27 16:11:24 -05:00 |
|
Isaac Connor
|
e4c6709eca
|
ensure options always has width and height set
|
2021-01-27 13:07:31 -05:00 |
|
Isaac Connor
|
fbe22d29ba
|
Don't crash if can't add any streams
|
2021-01-27 12:50:40 -05:00 |
|
Isaac Connor
|
518270a9ac
|
Must set keyframe and codec_type of zm_packet
|
2021-01-27 12:50:17 -05:00 |
|
Isaac Connor
|
1ca93c4211
|
accept packets with image as video
|
2021-01-27 12:49:54 -05:00 |
|
Isaac Connor
|
6df865cd08
|
spacing
|
2021-01-27 12:49:37 -05:00 |
|
Isaac Connor
|
d741f4ba04
|
accept packets with image data
|
2021-01-27 12:49:27 -05:00 |
|
Isaac Connor
|
e28c724742
|
fix return values of Prime, Pre and PostCapture
|
2021-01-27 12:07:35 -05:00 |
|
Isaac Connor
|
be893fe9e4
|
Since we loop in here, need to lock the packetqueue
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
bbba0f679b
|
Don't need to set timebase. Continue supporting old ffmpeg
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
6bfbb5462a
|
console monitor sort must be a post
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
07fa507efe
|
improve error message when trying to control a remote camera
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
28a004c324
|
Must load ServerId so that we can tell if it is local or remote
|
2021-01-27 11:48:32 -05:00 |
|
Isaac Connor
|
f3ea237af1
|
Fix build without RTSP
|
2021-01-27 10:50:07 -05:00 |
|
Isaac Connor
|
ef3440e5b8
|
Fix including rtsp server code
|
2021-01-27 10:08:42 -05:00 |
|
Isaac Connor
|
905912a8dd
|
Don't need to checkInitialized in event stream. We don't assign a monitor and don't need to connect to it
|
2021-01-27 10:07:57 -05:00 |
|
Isaac Connor
|
b409407b60
|
redo update from 1.31.40
|
2021-01-27 09:58:55 -05:00 |
|
Isaac Connor
|
159f611274
|
Add Encoder if missing
|
2021-01-27 09:55:48 -05:00 |
|
Isaac Connor
|
d594fbcd49
|
Some fixes for unused code (will be used in future)
|
2021-01-26 18:29:34 -05:00 |
|
Isaac Connor
|
27011ab49b
|
Fix bulid without liveMedia
|
2021-01-26 18:29:02 -05:00 |
|
Isaac Connor
|
42abe5c917
|
include hwcontext in zm_ffmpeg.h so that it gets included where needed
|
2021-01-26 18:28:11 -05:00 |
|
Isaac Connor
|
bacf4a1aca
|
Add 640x360 resolution
|
2021-01-26 17:54:22 -05:00 |
|
Isaac Connor
|
410b9840d1
|
fix eslint
|
2021-01-26 17:44:23 -05:00 |
|
Isaac Connor
|
70bef9f22a
|
put back c++11 as the c std
|
2021-01-26 15:43:29 -05:00 |
|
Isaac Connor
|
491cc1dfe3
|
ImageBufferCount can now be as low as 2
|
2021-01-26 15:37:32 -05:00 |
|
Isaac Connor
|
69626651ff
|
ImageBufferCount can now be as low as 2
|
2021-01-26 15:33:38 -05:00 |
|
Isaac Connor
|
4dcce4ac95
|
Merge branch 'rtsp_server'
|
2021-01-26 14:22:10 -05:00 |
|
Isaac Connor
|
e4465a14ee
|
Remove stray |
|
2021-01-26 14:20:14 -05:00 |
|
Isaac Connor
|
84d9d363c9
|
add_stylesheet is deprecated. Use add_css_file instead
|
2021-01-26 14:20:14 -05:00 |
|
Isaac Connor
|
bfaed28cff
|
use config.min_rtsp_port to determine if we start up the rtsp server. Move the sleep on failure to capture down below shutting everything down.
|
2021-01-26 14:20:03 -05:00 |
|
Isaac Connor
|
33f934b9ab
|
Use config.min_rtsp_port instead of hard coded base port
|
2021-01-26 14:14:29 -05:00 |
|
Isaac Connor
|
4159baac06
|
Use 10 seconds of queue instead of a fixed packet count. Audio generates more frames than video so they get way out of sync.
|
2021-01-26 14:14:05 -05:00 |
|
Isaac Connor
|
671d58f0d0
|
bump version and put back ZM_MIN_RTSP_PORT setting
|
2021-01-26 12:35:17 -05:00 |
|
Isaac Connor
|
7e11d28031
|
Remove duplicated debug
|
2021-01-26 12:25:11 -05:00 |
|
Isaac Connor
|
a209d493ef
|
Handle null video_in_ctx. Better debug. Always flush codecs
|
2021-01-26 12:24:43 -05:00 |
|
Isaac Connor
|
e73e6aaabc
|
check for terminating before locking packetqueue. Handle when pre_event_count==0
|
2021-01-26 12:23:44 -05:00 |
|
Isaac Connor
|
e4831909d6
|
get_packet can return null if we are terminating
|
2021-01-26 12:22:26 -05:00 |
|
Isaac Connor
|
7cc21b0d0b
|
Always load AvFrame to RGBA
|
2021-01-26 12:22:07 -05:00 |
|
Isaac Connor
|
e226618300
|
better debug of video/audio frames
|
2021-01-26 12:21:51 -05:00 |
|
Isaac Connor
|
cd9b3fb1f6
|
add static Mode_Strings
|
2021-01-26 12:21:21 -05:00 |
|
Isaac Connor
|
0ecbe29ac0
|
Handle no frame/duration information more gracefully
|
2021-01-26 12:20:55 -05:00 |
|
Isaac Connor
|
e10d15fa91
|
Only write db entries for video frames but do write them even if no decoded image
|
2021-01-26 12:20:32 -05:00 |
|
Isaac Connor
|
f731a5dc8f
|
Add StreamMode_Strings for printing out mode
|
2021-01-26 09:50:41 -05:00 |
|
Isaac Connor
|
835cc8076e
|
Cleanup constructor, using initializers. Pass in CodecContexts as well. We need them for timebases. Fixes passthrough timestamps.
|
2021-01-25 18:50:35 -05:00 |
|
Isaac Connor
|
dc9c7a7e15
|
handle event not existing a little better.
|
2021-01-25 18:49:03 -05:00 |