Commit graph

659 commits

Author SHA1 Message Date
Thulinma
35b2dd6bee Better working TS input, Pro side. Code by Erik Zandvliet. 2015-11-05 17:11:04 +01:00
Thulinma
8bcda5e57b Merge branch 'development' into LTS_development
# Conflicts:
#	lib/bitstream.h
#	lib/h264.cpp
#	lib/h264.h
#	lib/nal.cpp
#	lib/nal.h
2015-11-05 17:07:17 +01:00
Thulinma
b28a619fc6 Various fixes and improvements, backported from Pro version. Code by Erik Zandvliet. 2015-11-05 17:05:21 +01:00
Thulinma
8678a845f3 Merge branch 'development' into LTS_development 2015-11-02 17:14:44 +01:00
Thulinma
5cce37c521 Fixed RTMP extended timestamp read 2015-11-02 17:14:38 +01:00
Thulinma
4889abb64e Merge branch 'development' into LTS_development 2015-11-02 15:53:01 +01:00
Thulinma
3a07633de5 Improved Socker::Buffer deletion handling. 2015-11-02 15:52:48 +01:00
Thulinma
59a4329266 Merge branch 'development' into LTS_development 2015-10-20 14:12:17 +02:00
Thulinma
500cdf6e71 Improved BPS calculation for live streams. 2015-10-20 14:12:11 +02:00
Thulinma
596689c9ee Merge branch 'development' into LTS_development 2015-10-15 10:28:33 +02:00
Erik Zandvliet
c417630abe Same fix, but for non-const iterator 2015-10-15 10:28:24 +02:00
Thulinma
101de0b81c Merge branch 'development' into LTS_development 2015-10-14 16:53:20 +02:00
Thulinma
9737d9fbdf Added missing return value for JSON class. 2015-10-14 16:53:13 +02:00
Thulinma
de1d202457 Made RTSP max send value runtime configurable. 2015-10-14 14:30:28 +02:00
Thulinma
279add438a Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
2015-10-14 10:48:00 +02:00
Thulinma
b53cc64208 Merge branch 'development' into LTS_development 2015-10-09 15:01:50 +02:00
Thulinma
1eb5725751 Fixes to JSON library. 2015-10-09 15:00:03 +02:00
Thulinma
c20b8f2081 Fixed newlines in debug messages. Also, backported various Pro edition fixes that belonged in OS edition. 2015-10-08 13:54:54 +02:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive.
Co-authored with Diederick.
2015-10-06 13:21:14 +02:00
Erik Zandvliet
b493976f90 MP4 HEVC fix 2015-10-05 17:08:18 +02:00
Thulinma
af9acdd9e2 Merge branch 'development' into LTS_development
# Conflicts:
#	lsp/minified.js
#	lsp/mist.js
2015-10-01 13:58:31 +02:00
Thulinma
1e9ee73bfe Added Util::stringToBool utility function. 2015-10-01 13:49:35 +02:00
Thulinma
ce124cb58d Merge branch 'development' into LTS_development 2015-09-30 20:00:20 +02:00
Thulinma
d7fb7dd779 Fixed boolean support in JSON library. 2015-09-30 19:59:44 +02:00
Thulinma
3b92a56707 Merge branch 'development' into LTS_development 2015-09-29 14:41:26 +02:00
Thulinma
adc34a0ac9 Fixed aspect ratios in MP4. 2015-09-29 14:39:59 +02:00
Thulinma
5c3ff12946 Fixed support for MP4 files without CTTS box in a track header. 2015-09-25 00:36:09 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
073f3a20fc Make RTP much less spammy. 2015-09-04 09:49:27 +02:00
Thulinma
a4602f5626 HEVC in MP4 support, by Oswald de Bruin. 2015-09-03 22:28:02 +02:00
Thulinma
f562369db2 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/mp4.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_generic.h
2015-09-03 22:03:24 +02:00
Thulinma
97b8adf41e Fixes and improvements to various MP4 library functions, by Oswald de Bruin. 2015-09-03 21:36:09 +02:00
Thulinma
c254085579 Added PASP MP4 box pretty printing. 2015-09-03 20:23:20 +02:00
Thulinma
b0b4a5d10d Added Track::finalize call to finish (live) tracks and record their complete duration, by Oswald de Bruin. 2015-09-03 20:20:47 +02:00
Thulinma
a559e27102 Report Pro version flags in --version output. 2015-09-03 20:02:50 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Thulinma
f28b4c9ad1 Added -DBIGMETA=1 compile flag. 2015-09-02 17:38:18 +02:00
Thulinma
8a6dadf279 DTSC Header rewrite
# Conflicts:
#	lib/dtsc.h
#	lib/dtscmeta.cpp
2015-09-02 13:10:33 +02:00
Erik Zandvliet
0913d2607e Working PlayReady/Verimatrix DRM support 2015-09-02 12:09:37 +02:00
Thulinma
27fdbb2468 Merge branch 'development' into LTS_development 2015-08-28 22:17:35 +02:00
Thulinma
2fb1459dff Fixed Windows compile. 2015-08-28 22:17:29 +02:00
Thulinma
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +02:00
Thulinma
71dc32d2d3 Added ability to break through semaphore locks to the controller monitoring thread. 2015-08-28 21:56:27 +02:00
Thulinma
eadd3863fc Merge branch 'development' into LTS_development
# Conflicts:
#	lib/timing.cpp
#	lib/timing.h
2015-07-30 11:58:17 +02:00
Thulinma
610c48ddcb Added getUTCString call to Util library. 2015-07-30 11:57:23 +02:00
Thulinma
e36b05500b Major DASH cleanup/bugfix spree: live DASH now works in bitmovin player. 2015-07-29 22:59:39 +02:00
Thulinma
1c85037584 Merge branch 'development' into LTS_development 2015-07-22 12:38:32 +02:00
Thulinma
4b9c8cee74 Simplified and optimized FLV input and tag to DTSC conversion. 2015-07-22 12:37:09 +02:00