Commit Graph

3933 Commits

Author SHA1 Message Date
Isaac Connor 0676c7cfb4 Use packetqueue::free_it to release iterators 2021-02-01 10:24:58 -05:00
Isaac Connor 08a498ef6a Convert packetqueue from a pointer to a packetqueue to a member packetqueue that is always available. 2021-01-31 21:31:33 -05:00
Isaac Connor a0722b3782 stop thread 2021-01-31 21:31:33 -05:00
Isaac Connor fdadacac6c set packet.size and data because av_init_packet don't do that 2021-01-31 21:31:33 -05:00
Isaac Connor dd57d05f40 Convert packetqueue from a pointer to a packetqueue to a member packetqueue that is always available. Add methods to set packetqueue parameters. Emptying the queue is now in packetqueue::clear() 2021-01-31 21:31:33 -05:00
Isaac Connor 49cf55c22c Put close back before joins 2021-01-31 12:39:06 -05:00
Isaac Connor e08060af3f Free linked monitors 2021-01-31 11:57:43 -05:00
Isaac Connor 4bcefe0562 Add a 10 second wait to force alarm on. If the monitor doesn't notice it is likely not running, leaving an mmap behind 2021-01-31 11:44:58 -05:00
Isaac Connor 14c06cd2d4 Close monitor after terminating threads instead of before 2021-01-31 11:44:25 -05:00
Isaac Connor e237719d6a Delete frame queue on stop 2021-01-31 11:43:16 -05:00
Isaac Connor b83becd856 spacing 2021-01-31 11:43:03 -05:00
Isaac Connor 0fb7cb935f Fix skipping over the head packet when deleting packets. 2021-01-31 11:42:51 -05:00
Isaac Connor e084780123 Remove no longer used pre_event buffer and event_delete_thread 2021-01-31 10:09:03 -05:00
Isaac Connor 00114d32bc Minor code improvements ostly just being more specific about parenthesis 2021-01-30 20:35:10 -05:00
Isaac Connor b47d2428da Minor code, debugging improvements 2021-01-30 20:34:39 -05:00
Isaac Connor 5fc52ae6df Handle iterator pointing to end 2021-01-30 20:34:09 -05:00
Isaac Connor 9ef9fe81fa Don't log error when flushing queues 2021-01-30 14:05:19 -05:00
Isaac Connor b93aab6a11 turn off hwtransfer direct to image. Too compliated for now with not enough benefit 2021-01-30 12:34:29 -05:00
Isaac Connor ac88567ee2 fix 2021-01-29 17:32:22 -05:00
Isaac Connor 5581cdafb6 must increment iterators in the packetqueue lock 2021-01-29 17:30:39 -05:00
Isaac Connor 95d2b1518e Don't treat send_frame null as errors. We are ni flushing mode 2021-01-29 17:07:58 -05:00
Isaac Connor dbad734414 Just include zm_ffmpeg.h 2021-01-29 15:49:53 -05:00
Isaac Connor b812e0d484 It is necessary to prefer the image in the packet to in_frame as it has been timestamped etc 2021-01-29 15:37:51 -05:00
Isaac Connor 292e1b4c9e Set stream time_base to Q. Set PTS/DTS of packets to current time 2021-01-29 15:37:23 -05:00
Isaac Connor fea2ea37e5 Cleanup unused first/start/last pts/dts 2021-01-29 14:04:50 -05:00
Isaac Connor a7d05613b5 When using remote RTSP need to set videoStream parameters 2021-01-29 14:04:21 -05:00
Isaac Connor 5f7f066a4f Better to alloc context with codec 2021-01-29 14:03:48 -05:00
Isaac Connor 63a6bdaac1 spacing 2021-01-29 09:53:48 -05:00
Isaac Connor 5a21ebe3ef allow audio streams 2021-01-28 10:49:46 -05:00
Isaac Connor 8199116c15 Make error message more clear 2021-01-28 10:46:08 -05:00
Isaac Connor ab65a65dfb use camel case on video_stream and audio_stream 2021-01-28 10:45:53 -05:00
Isaac Connor 335c1b1404 populate mVideoStream and mAudioStream so we don't allocate new ones later 2021-01-28 10:45:39 -05:00
Isaac Connor 28d27cc30a use camel case on video_stream and audio_stream 2021-01-28 10:45:19 -05:00
Isaac Connor 4bd813d980 Don't try to transfer image when there is no image available 2021-01-28 10:22:14 -05:00
Isaac Connor f32e546b94 Remove unused members 2021-01-28 10:18:22 -05:00
Isaac Connor acf909d4f3 Move setting codec parameters below the copy in case they get overwritten 2021-01-28 10:17:23 -05:00
Isaac Connor 2baa22dc85 Fix case when hwaccel not compiled in 2021-01-28 10:16:58 -05:00
Isaac Connor 7ff38a3a5c Remove unused code from FFmpegCamera 2021-01-28 10:11:26 -05:00
Isaac Connor d16a7b98eb fix send_packet_receive_frame. Can't just resend the same packet until we get a frame! 2021-01-28 10:04:02 -05:00
Isaac Connor 1212830354 fix AVOCDEC version check 2021-01-28 09:08:51 -05:00
Isaac Connor d64745a5da Add debug in zm_send_packet_receive_frame 2021-01-28 09:08:33 -05:00
Isaac Connor 7923e0c279 fix min_section_length not being honoured 2021-01-27 18:13:16 -05:00
Isaac Connor c4b80e61bc code comments 2021-01-27 16:14:17 -05:00
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 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 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 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 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -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 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 6394c620ad add stream index to debug 2021-01-25 13:23:57 -05:00
Isaac Connor a0df09dcaa Have to check for lock on video keyframe as well 2021-01-25 12:07:56 -05:00
Isaac Connor baf39b0d4f add adts_source 2021-01-24 20:16:54 -05:00
Isaac Connor 8a1686076a break long line 2021-01-22 20:24:29 -05:00
Isaac Connor 7feb252f81 code style 2021-01-22 20:24:12 -05:00
Isaac Connor 9d2598da13 cleanup and add AAC support. Also stop source threads 2021-01-22 20:23:30 -05:00
Isaac Connor afc7c86eac add AAC support 2021-01-22 20:22:50 -05:00
Isaac Connor 2561a07d86 provide a simple SDP line 2021-01-22 20:21:28 -05:00
Isaac Connor d03e5fbe20 cleanup 2021-01-22 19:29:19 -05:00
Isaac Connor 71ebae27eb Use codecpar instead of codec which is deprecated 2021-01-22 19:29:01 -05:00
Isaac Connor c7b8d7bda9 get rid of useThread. We will always have a thread 2021-01-22 19:26:00 -05:00
Isaac Connor afd57ec307 Add a base extractFrame that just treats the entire buffer as a frame 2021-01-22 19:25:38 -05:00
Isaac Connor c94e2c0f13 cleanup 2021-01-22 19:24:27 -05:00
Isaac Connor 08165c06df Add audio details to zm_dump_codecpar 2021-01-22 19:24:15 -05:00
Isaac Connor 1a400be11c add zm_rtsp_server_adts_source.cpp to build 2021-01-22 19:23:36 -05:00
Isaac Connor ea8f264724 Merge branch 'release-1.34' 2021-01-22 15:54:06 -05:00
Terry Sanders c21e02e3c7 Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used. 2021-01-22 12:23:38 -05:00
Isaac Connor f9fc10b394 When not capturing don't try to create mmap. Fixes #3112 2021-01-22 12:23:13 -05:00
Isaac Connor f1686cfe9a When not capturing don't try to create mmap. Fixes #3112 2021-01-22 12:11:43 -05:00
Isaac Connor 01ec57f902 remove test for negative pts. Negative pts is ok. Have been running this in master for a while with no negative effects. 2021-01-22 12:07:47 -05:00
Isaac Connor a30a473981 fix passing in audiostream 2021-01-21 10:27:15 -05:00
Isaac Connor b8eac366b7 pts is an int 2021-01-21 10:27:02 -05:00