zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-12 15:21:07 +02:00
Code Issues Projects Releases Wiki Activity
1231 commits 18 branches 115 tags 3.7 MiB
Commit graph

1231 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laura Hausmann e73d44f0fb
Write ENDLIST tag on stream end 2022-02-09 23:08:41 +01:00
Sergey Dryabzhinsky 8e344d7994 For issue #332 - bigger buffers for HLS/DASH, allow define them on compile time 2021-06-03 15:40:00 +03:00
Sergey Dryabzhinsky 4d15e2c0f1 One more fix for fall through warnings 2021-06-03 12:51:03 +03:00
Sergey Dryabzhinsky d4d762e917
Merge pull request #331 from sergey-dryabzhinsky/issue-317-fix-double-ampersand-in-event-request 
Issue 317 fix double ampersand in event request
 2021-06-03 10:24:03 +03:00
Sergey Dryabzhinsky 5cb0be7f09 Fix warning-error about reproducible builds 2021-06-02 21:23:09 +03:00
Sergey Dryabzhinsky 1688a23f0a Simplify request string format 2021-06-02 21:08:37 +03:00
Sergey Dryabzhinsky a2895a03d9 Try to fix #317 - check for session vars and add ampersand only if they exists 2021-06-02 21:00:06 +03:00
Sergey Dryabzhinsky 649d220306 Version bump - merged all? fixes from arut 2021-06-02 20:45:44 +03:00
Sergey Dryabzhinsky ca1f3eeaa2 One more type cast 2021-06-02 20:43:18 +03:00
Sergey Dryabzhinsky a4a1343bb8
Merge pull request #176 from sergey-dryabzhinsky/fix-hls-playlist-length-on-varsize-fragments 
Fix hls playlist length on varsize fragments
 2021-06-01 19:06:41 +03:00
Sergey Dryabzhinsky 14221340d3 Fix miscast 2021-06-01 19:06:04 +03:00
Sergey Dryabzhinsky f7254ae5e8
Merge pull request #272 from eutychus/dev 
Stats improvements
 2021-06-01 18:59:59 +03:00
Sergey Dryabzhinsky fe35e3e98b
Merge pull request #329 from sergey-dryabzhinsky/merge-arut-122 
Backport fixes from 1.2.2 by arut
 2021-06-01 18:53:04 +03:00
Sergey Dryabzhinsky cdbb1d4dc1 Backport fixes from 1.2.2 by arut 2021-06-01 18:50:46 +03:00
root d743c36996 revert variant playlist code 2020-12-30 18:19:23 +00:00
root 59c2454b23 Revert "Intellegent variant playlist entries. Auto stream inf, skip if not live" 
This reverts commit 7b7d30f36c.

Conflicts:
	hls/ngx_rtmp_hls_module.c
 2020-12-30 04:01:12 +00:00
root 6c4be06423 Merge branch 'dev' of github.com:sergey-dryabzhinsky/nginx-rtmp-module into dev 2020-12-30 03:50:17 +00:00
Sergey Dryabzhinsky 23ec4ce2d7
Merge pull request #273 from baxerus/dev 
Added millisecond accuracy to EXT-X-PROGRAM-DATE-TIME
 2020-04-23 17:43:38 +03:00
Sergey Dryabzhinsky 882ef5ca1e
Merge pull request #294 from AdrianDroid/dev 
Aglin case use with Adobe FMS
 2020-04-23 17:25:13 +03:00
Sergey Dryabzhinsky eee3c5eb15
Merge pull request #307 from southernsun/patch-1 
Fixed typo
 2020-04-23 17:19:49 +03:00
southernsun a0a55be887
Fixed typo 2020-04-23 08:57:00 +02:00
adrian ce5a10a0d1 Aglin case use with Adobe FMS 2019-07-03 15:42:04 +12:00
Sergey Dryabzhinsky 3bf7523267
Merge pull request #293 from ssamjh/patch-2 
Fix URL (attempt 2)
 2019-05-04 11:13:59 +03:00
ssamjh b2049f3c39
Fix URL (attempt 2) 2019-05-04 13:55:18 +12:00
Sergey Dryabzhinsky a5ac72c274
Merge pull request #288 from asticode/patch-1 
Fix fallthrough
 2019-02-18 08:36:52 +03:00
Quentin Renard 00fd6cfa53 Fix fallthrough 2019-02-17 11:09:10 +01:00
Benedict Endemann b4ee055393 Added millisecond accuracy to EXT-X-PROGRAM-DATE-TIME 
to become more compatible to:
https://tools.ietf.org/html/draft-pantos-http-live-streaming-23#section-4.3.2.6
(see "EXT-X-PROGRAM-DATE-TIME tags SHOULD provide millisecond accuracy.").
 2018-04-23 12:53:42 +02:00
Brad Murray e2a626ac04 Code cleanup, change codec string for mp3 audio 2018-04-19 23:51:20 -04:00
Brad Murray 7b7d30f36c Intellegent variant playlist entries. Auto stream inf, skip if not live 2018-04-19 15:02:03 -04:00
Brad Murray e5b78f2de7 Merge branch 'dev' of https://github.com/eutychus/nginx-rtmp-module into dev 2018-04-16 18:13:19 -04:00
Brad Murray a65297410e track meta videokeyframe_frequency, add to stats 2018-04-16 18:08:23 -04:00
Brad Murray 669059f41b track meta videokeyframe_frequency, add to stats 2018-04-16 17:54:22 -04:00
Brad Murray ff3536996c Add metadata audio+video data rate to stats 2018-04-16 17:03:53 -04:00
Brad Murray 15cc5d0226 Increase length for flashver. It was truncated for wirecast. 2018-04-16 16:54:59 -04:00
Sergey Dryabzhinsky 504b9ee29d
Merge pull request #270 from benwilber/insert-datetime-before-discontinuity 
Write EXT-X-PROGRAM-DATE-TIME before any EXT-X-DISCONTINUITY
 2018-03-30 05:20:22 +03:00
Ben Wilber 23d67822b2 Write EXT-X-PROGRAM-DATE-TIME before any EXT-X-DISCONTINUITY 2018-03-29 16:49:53 -04:00
Sergey Dryabzhinsky 21db986d97
Merge pull request #260 from cryptofuture/dev 
Fix multiple fallthrough warnings
 2017-12-11 16:09:14 +03:00
Anonymous a01cc448ee
Fix multiple fallthrough warnings 2017-12-02 19:33:11 +00:00
Sergey Dryabzhinsky a898a09d87 Merge pull request #247 from heftig/master 
Minor fixes
 2017-05-23 13:40:46 +04:00
Jan Alexander Steffens (heftig) 916f3f8374
Simplify freeing the data chain 2017-05-23 10:11:27 +02:00
Jan Alexander Steffens (heftig) 1c3dc989ef
Work around deletion of still-needed init segments 
I assume they get accidentally deleted right after they're
written, before the playlist is first created.

Leave them around for another cleanup cycle rather than
risk deleting them while still needed.
 2017-05-23 10:11:27 +02:00
Sergey Dryabzhinsky d25c56fa69 Merge pull request #245 from sergey-dryabzhinsky/revert-199-drop-all-connections-on-reload 
Revert "Add event-based handle of reload/exit signal"
 2017-05-19 02:00:27 +04:00
Sergey Dryabzhinsky e65f2d099b Revert "Add event-based handle of reload/exit signal" 2017-05-19 00:59:11 +03:00
Sergey Dryabzhinsky f31e27fbaf Merge pull request #236 from Gamec/patch-1 
EXT-X-ALLOW-CACHE using YES|NO instead of 1|0
 2017-04-18 15:27:20 +03:00
Paweł Burda bb4190e248 EXT-X-ALLOW-CACHE using YES|NO instead of 1|0 
https://tools.ietf.org/html/draft-pantos-http-live-streaming-07#section-3.3.6
 2017-04-18 14:01:35 +02:00
Sergey 542106e4de Merge pull request #199 from sergey-dryabzhinsky/drop-all-connections-on-reload 
Add event-based handle of reload/exit signal
 2017-04-15 21:08:29 +03:00
Sergey 9121b34bdc Merge pull request #233 from mbeacom/openssl11 
OpenSSL-1.1 support cherrypick
 2017-04-14 20:04:06 +03:00
Sergey ff86f5c3fd Merge pull request #228 from securogroup/auto-crc-mpegts 
Automatically generate CRC for MPEG-TS packets.
 2017-04-13 23:11:58 +03:00
Roman Arutyunyan f23323a51a
OpenSSL-1.1 support 2017-04-13 15:12:47 -04:00
Chris Wiggins f8992e572f Automatically generate CRC for MPEG-TS packets. 
Includes descriptions from @premultiply from pull sergey-dryabzhinsky/nginx-rtmp-module#123
 2017-03-27 12:06:18 +13:00