3823 Commits

Author	SHA1	Message	Date
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
Isaac Connor	d0380fb89b	cleanup, start roughing in audio stream support	2021-01-21 10:26:46 -05:00
Isaac Connor	44245a9a4f	spacing typos	2021-01-21 10:25:26 -05:00
Isaac Connor	8a9111d0b3	spacing	2021-01-21 10:25:09 -05:00
Isaac Connor	35c72b32dd	Cleanup. Remove stats stuff. Code now works so remove other options. Re-implement extractFrame as it was broken. It would skip shortmarkers.	2021-01-21 10:23:30 -05:00
Isaac Connor	66c78e5a9b	Merge branch 'zma_to_thread' into rtsp_server	2021-01-19 13:43:25 -05:00
Terry Sanders	ef006ca407	Fixed issue where mysql_free_result can get called twice when a vaild username with an incorrect password is used.	2021-01-19 14:47:11 +00:00
Isaac Connor	b1b72ec85b	Improve debugging. Add parenthesis to fix test for end. I think the * dereference is not being applied at the right time.	2021-01-19 09:46:08 -05:00
Isaac Connor	256080abb1	Fix crash of Reload() due to Load() clearing shared_data and mem_ptr. Load() shouldn't do these kinds of initialisations.	2021-01-19 09:44:53 -05:00
Isaac Connor	fec3dc763f	Cleanups. Apply crf to encoding to fix encoding video	2021-01-15 17:02:26 -05:00
Isaac Connor	430d64ba67	create fix_deprecated_pix_fmt function to adjust deprecated pixfmts	2021-01-15 17:01:59 -05:00