Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f926ceab0d
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	lib/dtscmeta.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output.h
#	src/output/output_http.cpp
#	src/output/output_http.h
#	src/output/output_progressive_mp4.cpp
#	src/output/output_rtmp.h 
							
						 | 
						
							2018-07-04 11:56:00 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4e9ffe864
								
							
						 | 
						
							
							
								
								Edited JSON codec format
							
							
							
							
							
						 | 
						
							2018-07-04 11:51:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d48967d549
								
							
						 | 
						
							
							
								
								Improved selectDefaultTracks function to give feedback on selection changes.
							
							
							
							
							
						 | 
						
							2018-07-04 11:51:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								75501c54f7
								
							
						 | 
						
							
							
								
								RTSP live timestamp syncing implemented, syncs with RTMP and/or JSON inputs
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:58 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee195f0089
								
							
						 | 
						
							
							
								
								Implemented basic version of DTSC::RetimedPacket
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								921e6827dc
								
							
						 | 
						
							
							
								
								Updated generic HTTP output to support websockets. Added basic websocket JSON push support.
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a028fa309
								
							
						 | 
						
							
							
								
								Added bootMsOffset to DTSC::Meta, RTMP now syncs on it.
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								5de902eee1
								
							
						 | 
						
							
							
								
								Added JSON output duplicate checking and persistent connections
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e82b5a485
								
							
						 | 
						
							
							
								
								Allow downloading of MP4 output as file through ?dl=1 and/or ?dl=filename.ext GET parameter
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0ee58e3096
								
							
						 | 
						
							
							
								
								Improved audio/video/subtitle GET param selectors to no longer select tracks when unable to select requested tracks
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b352b17de8
								
							
						 | 
						
							
							
								
								Improved track selection logic for JSON output
							
							
							
							
							
						 | 
						
							2018-07-04 11:50:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								67cba61ed7
								
							
						 | 
						
							
							
								
								Edited JSON codec format
							
							
							
							
							
						 | 
						
							2018-07-04 11:48:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								9723159592
								
							
						 | 
						
							
							
								
								Improved selectDefaultTracks function to give feedback on selection changes.
							
							
							
							
							
						 | 
						
							2018-07-04 11:48:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a984243d56
								
							
						 | 
						
							
							
								
								Implemented basic version of DTSC::RetimedPacket
							
							
							
							
							
						 | 
						
							2018-07-04 11:48:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								9104d68a5d
								
							
						 | 
						
							
							
								
								Updated generic HTTP output to support websockets. Added basic websocket JSON push support.
							
							
							
							
							
						 | 
						
							2018-07-04 11:48:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								43934cf69c
								
							
						 | 
						
							
							
								
								Added bootMsOffset to DTSC::Meta, RTMP now syncs on it.
							
							
							
							
							
						 | 
						
							2018-07-04 11:48:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd0b820577
								
							
						 | 
						
							
							
								
								Added JSON output duplicate checking and persistent connections
							
							
							
							
							
						 | 
						
							2018-07-04 11:25:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6adfc2c970
								
							
						 | 
						
							
							
								
								Allow downloading of MP4 output as file through ?dl=1 and/or ?dl=filename.ext GET parameter
							
							
							
							
							
						 | 
						
							2018-07-04 11:24:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								1451b64e00
								
							
						 | 
						
							
							
								
								Improved track selection logic for JSON output
							
							
							
							
							
						 | 
						
							2018-07-04 11:19:02 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3eb87bda47
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-06-28 10:49:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e442bde5a6
								
							
						 | 
						
							
							
								
								Fixed RTSP auth
							
							
							
							
							
						 | 
						
							2018-06-28 10:49:22 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f618877a65
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-06-27 13:52:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ac475ca95
								
							
						 | 
						
							
							
								
								Fixed statistics. 😒
							
							
							
							
							
						 | 
						
							2018-06-27 13:51:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6d214a285
								
							
						 | 
						
							
							
								
								Fixed h264::nalFactory function
							
							
							
							
							
						 | 
						
							2018-06-19 13:55:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc6d49ac1f
								
							
						 | 
						
							
							
								
								Fixed race condition in prometheus output when adding new protocols
							
							
							
							
							
						 | 
						
							2018-06-14 15:02:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebdaf6e063
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output.cpp 
							
						 | 
						
							2018-06-12 11:25:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								967bc5729c
								
							
						 | 
						
							
							
								
								Improved input start behavior for live pushed streams
							
							
							
							
							
						 | 
						
							2018-06-12 11:24:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								72bae90ead
								
							
						 | 
						
							
							
								
								Fixed compatibility with broken RTSP implementation of Larix
							
							
							
							
							
						 | 
						
							2018-05-31 17:17:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								98b704a764
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-29 16:09:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								72ce4fb852
								
							
						 | 
						
							
							
								
								Fixed logging
							
							
							
							
							
						 | 
						
							2018-05-29 16:08:26 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a232cdf7b2
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-29 13:53:57 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ramkoemar
								
							 
						 | 
						
							
							
							
							
								
							
							
								1240f6bbaa
								
							
						 | 
						
							
							
								
								Fixed skipBytes implementation in Socket::Connection
							
							
							
							
							
						 | 
						
							2018-05-29 13:47:30 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f4a6c9367
								
							
						 | 
						
							
							
								
								Live mp4 working again
							
							
							
							
							
						 | 
						
							2018-05-24 15:13:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								10a7590891
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-22 10:02:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7e8d80edb
								
							
						 | 
						
							
							
								
								Improved logging system: now uses a separate process for logs when not running under the controller.
							
							
							
							
							
						 | 
						
							2018-05-22 10:02:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8eef54d81
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-21 09:54:13 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								8c2360fd56
								
							
						 | 
						
							
							
								
								Replaced all instances of localtime with localtime_r
							
							
							
							
							
						 | 
						
							2018-05-21 09:54:05 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d9e9f3c8b
								
							
						 | 
						
							
							
								
								Replaced all instances of localtime with localtime_r
							
							
							
							
							
						 | 
						
							2018-05-21 09:53:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ce86d0e4c
								
							
						 | 
						
							
							
								
								Replaced non-thread-safe localtime with thread-safe equivalent localtime_r
							
							
							
							
							
						 | 
						
							2018-05-19 21:03:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b16f03674
								
							
						 | 
						
							
							
								
								Added HLS protocol option to disable session IDs, merging together all views from a single user into a single session.
							
							
							
							
							
						 | 
						
							2018-05-18 17:20:55 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								93f8b01a0b
								
							
						 | 
						
							
							
								
								Added USER_END trigger
							
							
							
							
							
						 | 
						
							2018-05-18 17:20:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								46615efe49
								
							
						 | 
						
							
							
								
								Changed Content-Type of HTTP triggers from application/x-www-form-urlencoded to text/plain
							
							
							
							
							
						 | 
						
							2018-05-18 17:20:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								937653bc0d
								
							
						 | 
						
							
							
								
								LIVE_BANDWIDTH trigger readability improvement, triggers no longer block stderr.
							
							
							
							
							
						 | 
						
							2018-05-18 17:20:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3947fceeed
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-17 21:45:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f1fca24d7
								
							
						 | 
						
							
							
								
								Added non-chunked options to DASH and HLS outputs
							
							
							
							
							
						 | 
						
							2018-05-17 21:45:14 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6f0b596b2
								
							
						 | 
						
							
							
								
								Add support for boolean options to HTTP-based outputs
							
							
							
							
							
						 | 
						
							2018-05-17 21:44:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a22be819d
								
							
						 | 
						
							
							
								
								Fixed socket binding for TS UDP push output
							
							
							
							
							
						 | 
						
							2018-05-17 12:26:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								25ed47c97f
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-05-16 11:12:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc64ad647f
								
							
						 | 
						
							
							
								
								Fix in RAX library
							
							
							
							
							
						 | 
						
							2018-05-16 11:12:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								96563c0971
								
							
						 | 
						
							
							
								
								Fix for triggers
							
							
							
							
							
						 | 
						
							2018-05-16 11:12:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |