Commit graph

  • 0a8b8e40d8 Merge branch 'development' into LTS_development Thulinma 2016-04-15 13:47:42 +02:00
  • 9239586a89 Added cpu_use response to capabilities API call Thulinma 2016-04-15 13:47:35 +02:00
  • a3a40dbf17 Fix stats not disappearing Thulinma 2016-04-14 16:32:17 +02:00
  • c548077282 Made fillActive calls (stats_streams and current_streams) only count users that have retrieved at least 128KiB of data, in order to filter out index and meta requests. Thulinma 2016-04-14 12:39:20 +02:00
  • 9896b5837e Pro side of encoding fixes. Thulinma 2016-04-14 12:08:26 +02:00
  • d20c4f5ec5 Merge branch 'development' into LTS_development Thulinma 2016-04-14 12:05:55 +02:00
  • 66dc2dc0cb Encoding fixes: - base64 library renamed to encode library - Moved urlencode/urldecode functions from HTTP library to encode library - Moved hex/unhex functions from HTTP library to encode library - Added urldecode support to RTMP urls, fixing XSplit wildcard stream support Thulinma 2016-04-14 12:03:40 +02:00
  • 87e2c774fd Added RTMP unescaping code to fix Xsplit support for wildcard streams. Thulinma 2016-04-13 16:16:56 +02:00
  • 230772f125 fillActive now 15 seconds delayed as opposed to 2 seconds delayed, for more accurate viewer counts. Thulinma 2016-04-13 15:20:23 +02:00
  • 4c2eeb96c8 Fix for handling negative h264 offsets in mp4 Erik Zandvliet 2016-04-06 11:38:49 +02:00
  • 3b9911df71 MP4 header read optimise by Erik Erik Zandvliet 2016-04-12 15:07:17 +02:00
  • 90419e15eb Get width and height from sps when incorrect in mp4 file Erik Zandvliet 2016-04-08 11:06:51 +02:00
  • 939924439d Nasty hack for fixing H264 init data on FLV Erik Zandvliet 2016-04-08 10:03:38 +02:00
  • b244618737 Revert "MP4 header read optimise by Erik" Erik Zandvliet 2016-04-06 15:30:21 +02:00
  • b8054a5200 Added header to enforce newest compatability for IE browsers. They misbehave on intranet addressess otherwise Balder 2016-04-06 10:11:12 +02:00
  • cbaf4107f9 Silly mistake is silly. Thulinma 2016-04-05 10:05:11 +02:00
  • f7b3ecee8c Merge branch 'development' into LTS_development Thulinma 2016-03-05 00:21:42 +01:00
  • 15603bc053 Changed Embed to enable MP4 again in FF as they've added H264 support for Windows beyond XP. XP seems to correctly see it can't play MP4. Balder 2016-02-29 13:44:58 +01:00
  • 211481f8ab Changed Embed to enable MP4 again in FF as they've added H264 support for Windows beyond XP. XP seems to correctly see it can't play MP4. Balder 2016-02-29 13:44:58 +01:00
  • 2029b35361 Tweaked fillActive to have both now and historic modes Made streams no longer show as active for ~10m after being active. Thulinma 2016-02-29 13:02:04 +01:00
  • 56232c1fba Fix typo in recording Add $stream variable to filename Changed $seconds variable to $second Thulinma 2016-02-24 00:45:00 +01:00
  • 99b5b8361d Merge branch 'development' into LTS_development Thulinma 2016-02-29 13:20:52 +01:00
  • 77a6315dfb Wipe sessions when they expire. Thulinma 2016-02-29 13:16:58 +01:00
  • 72c4f9771a Merge branch 'development' into LTS_development Thulinma 2016-02-29 13:05:46 +01:00
  • 203d7b7a67 Fixed long long value in timing library to actually be long long. Thulinma 2016-02-29 11:51:23 +01:00
  • 7710a7d8a7 BalderDash fixes (H264 mp4 codecs weirdness//FF) Balder 2016-02-29 11:35:17 +01:00
  • b79fb8cd6b MP4 header read optimise by Erik Balder 2016-02-26 10:23:45 +01:00
  • f6e2e95b5a Added USER_NEW trigger. Thulinma 2015-12-25 02:22:54 +01:00
  • 4db2ea97ed HLS now won't remove fragments if <= 3 available Thulinma 2015-12-25 00:30:18 +01:00
  • bbf0417b36 Disable resume support for live buffers by default. Thulinma 2015-12-25 15:47:22 +01:00
  • a6ef31d1ea Changed buffer full/empty behaviour to trigger at 3 segments instead of 50% of buffer size. Thulinma 2015-12-24 20:16:36 +01:00
  • b6f03a4591 Undo undone stuff. Bad Erik! Thulinma 2016-02-18 13:33:34 +01:00
  • 6de5aa7d5e Added LTS binary aes_ctr128 to .gitignore Thulinma 2016-02-15 11:53:25 +01:00
  • 4a413f11d4 Merge branch 'development' into LTS_development Thulinma 2016-02-16 09:18:28 +01:00
  • 463e549b4d Fixed naming bug when adding new streams Thulinma 2016-02-16 09:18:02 +01:00
  • 9d2d8646ca Added Ninja files to .gitignore Thulinma 2016-02-15 11:52:56 +01:00
  • 0d9108d1d6 Backported Pro shared_memory edits to OS edition Thulinma 2016-02-15 14:42:19 +01:00
  • 795db7d862 Made resume support disabled the new default. Thulinma 2016-02-12 16:37:32 +01:00
  • bee6ba11e6 Fixed RTSP. Thulinma 2016-02-12 16:33:01 +01:00
  • 62f3a9f4d2 Fixed high CPU usage of TS input during shutdown. Thulinma 2016-02-08 14:53:36 +01:00
  • c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS Erik Zandvliet 2016-01-28 15:00:25 +01:00
  • 1c3e143709 Recording functionality by Diederick Huijbers, slightly tweaked. ozzay 2015-11-26 14:13:07 +01:00
  • c0b5f0d4b1 X-Real-IP support Erik Zandvliet 2016-02-02 13:28:25 +01:00
  • 53febd82d1 Merge branch 'development' into LTS_development Thulinma 2016-02-12 16:18:54 +01:00
  • 243595ff4d UDP socket edits by Erik Zandvliet Thulinma 2016-02-12 16:16:49 +01:00
  • d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) Thulinma 2016-02-12 15:51:54 +01:00
  • 2d78e1e5f1 Improved MistInBuffer CPU usage by 50%. Thulinma 2016-02-12 15:46:23 +01:00
  • 7c759c7664 Optimized getWritableIdentifier to improve the speed of MistInBuffer even further. Thulinma 2016-02-08 16:02:23 +01:00
  • fa6dd9ee56 Merge branch 'development' into LTS_development Thulinma 2016-01-28 11:31:00 +01:00
  • 9631b79e86 Removed DTSC::Stream and DTSC::Ring classes - no longer in use anywhere. Thulinma 2016-01-28 11:27:26 +01:00
  • 1866e4e1e1 Updated CORS headers and the (HTTP) output protocols to work with it. Erik Zandvliet 2016-01-26 14:34:14 +01:00
  • 3f93ca5f82 Merge branch 'development' into LTS_development Erik Zandvliet 2016-01-26 14:33:23 +01:00
  • a39350f83e CORS Headers Erik Zandvliet 2016-01-26 14:31:09 +01:00
  • 90a53ddf70 Merge branch 'development' into LTS_development Erik Zandvliet 2016-01-26 14:15:17 +01:00
  • 3c48a6c03c Embedding of flash players Erik Zandvliet 2016-01-26 14:14:12 +01:00
  • 8eb518606a Merge branch 'development' into LTS_development Thulinma 2015-12-25 15:44:23 +01:00
  • 78d69673f3 Fix HLS start issues for live streams. Thulinma 2015-12-25 14:47:20 +01:00
  • 401fe65979 - Made HLS no longer skip first fragment. - Ignore metadata tracks and invalid tracks for buffer calculations. - Fixed statistics. Thulinma 2015-12-25 14:37:32 +01:00
  • e90c3193d6 Merge branch 'development' into LTS_development Erik Zandvliet 2015-12-17 19:25:16 +01:00
  • a604d616f7 'Ugly' fix for dissapearing metadata Erik Zandvliet 2015-12-17 19:22:55 +01:00
  • c2b1471170 Merge branch 'development' into LTS_development Thulinma 2015-11-28 16:24:14 +01:00
  • c93c0a8b5f Added new triggers to LSP. Thulinma 2015-11-28 16:24:06 +01:00
  • e6e28668a9 Merge branch 'development' into LTS_development Thulinma 2015-11-28 16:10:20 +01:00
  • e5e36df045 such facepalm. cat 2015-11-27 15:38:29 +01:00
  • 3d1784a096 Merge branch 'development' into LTS_development Thulinma 2015-11-28 16:06:33 +01:00
  • 23800d6cbb Fixed shared memory issues under Windows, by Erik Zandvliet. Thulinma 2015-11-28 16:06:26 +01:00
  • ed5440e382 Added ability to disable resume support for live streams. Thulinma 2015-11-27 14:51:15 +01:00
  • bf180a2a35 Added "minimal" API request for requesting minimal responses only. Thulinma 2015-11-27 10:43:22 +01:00
  • 22467d603e Added support for clients and lastms requests in active_streams API call Thulinma 2015-11-27 10:00:57 +01:00
  • 7168a3ffbd Added STREAM_BUFFER trigger. Thulinma 2015-11-26 03:58:14 +01:00
  • 233b31ddee Added RTMP_PUSH_REWRITE trigger. Thulinma 2015-11-26 02:38:13 +01:00
  • 9e1f0fcb7d Merge branch 'development' into LTS_development Thulinma 2015-11-27 10:44:09 +01:00
  • c9ddc3fe1a Fixed level of waiting for track debug message. Thulinma 2015-11-27 10:01:24 +01:00
  • 4397b410d4 Fixed typo in buffer size calculation. Thulinma 2015-11-27 09:53:23 +01:00
  • f90f261116 Merge branch 'development' into LTS_development Thulinma 2015-11-25 21:48:37 +01:00
  • 5ae0cb42a9 UDP binds can now bind to a specific interface, fixed IPv4 support for UDP sockets on IPv6-capable machines. Thulinma 2015-11-24 22:46:37 +01:00
  • be3a852fb0 Made UDP socket binding more robust. Thulinma 2015-11-24 16:57:23 +01:00
  • 8e94528d6f Improved signal and UDP bind debugging information, decreased verbosity of windows SHM errors. Thulinma 2015-11-24 15:57:17 +01:00
  • d887e01aed Merge branch 'development' into LTS_development Thulinma 2015-11-24 15:20:40 +01:00
  • 2919e74d4e forward script params to video url cat 2015-11-24 12:52:41 +01:00
  • 63f9fb52a5 LSP / embed support for appending a string to the video url cat 2015-11-20 12:04:58 +01:00
  • 689129e805 Merge branch 'development' into LTS_development Balder 2015-11-19 14:04:22 +01:00
  • d8bfe8cebc Fixed ability to disable video or audio tracks from HTTP output. Balder 2015-11-19 13:57:41 +01:00
  • 7d9d4e26ae fixed LTS tag for request url Balder 2015-11-19 13:53:22 +01:00
  • c51f1b4955 Merge branch 'development' into LTS_development Thulinma 2015-11-16 16:16:44 +01:00
  • f268988354 Fixed buffer incorrectly nulling indexes for live streams. Thulinma 2015-11-16 16:15:52 +01:00
  • 2bc333956a Merge branch 'development' into LTS_development Thulinma 2015-11-16 11:44:19 +01:00
  • c194396215 Clarified valid page numbers debug message. Thulinma 2015-11-16 11:44:11 +01:00
  • bd836f247d Merge branch 'development' into LTS_development Thulinma 2015-11-12 11:11:40 +01:00
  • e20761e8c7 Fix the case when a keyframe is not the first data pushed. Thulinma 2015-11-12 11:11:32 +01:00
  • 4db86ab2bb Fixed HTTP-based CONN_PLAY triggers URLs Thulinma 2015-11-12 10:13:16 +01:00
  • 35b2dd6bee Better working TS input, Pro side. Code by Erik Zandvliet. Thulinma 2015-11-05 16:56:50 +01:00
  • 8bcda5e57b Merge branch 'development' into LTS_development Thulinma 2015-11-05 17:07:17 +01:00
  • b28a619fc6 Various fixes and improvements, backported from Pro version. Code by Erik Zandvliet. Thulinma 2015-11-05 17:05:21 +01:00
  • 8678a845f3 Merge branch 'development' into LTS_development Thulinma 2015-11-02 17:14:44 +01:00
  • 5cce37c521 Fixed RTMP extended timestamp read Thulinma 2015-11-02 17:14:38 +01:00
  • 4889abb64e Merge branch 'development' into LTS_development Thulinma 2015-11-02 15:53:01 +01:00
  • 3a07633de5 Improved Socker::Buffer deletion handling. Thulinma 2015-11-02 15:52:48 +01:00
  • 01e9a45335 Clarified comment Thulinma 2015-10-29 16:50:36 +01:00
  • 67e1a832a2 Removed confusing comments. Thulinma 2015-10-29 16:34:37 +01:00