Sergey
7db5ef0ea5
Merge pull request #138 from sergey-dryabzhinsky/fix-121-dash-availabilityEndTime
...
Rewrite availabilityStart and publish time generation to DASH manifest
2016-07-06 18:02:14 +03:00
Sergey Dryabzhinsky
77ba897d2f
Another compiler warning fix
2016-06-25 13:55:08 +03:00
Sergey Dryabzhinsky
341b07409d
Update time generation:
...
- add msec granularity,
- revert availability constant change,
- add some time tricks to prevert playlist end on client too early
- add more debug to codecs
2016-05-24 15:13:24 +03:00
Sergey
2d4613c906
Merge pull request #89 from sergey-dryabzhinsky/74-fix-metadata
...
Revert previous fix.
2016-02-28 02:15:44 +03:00
Sergey Dryabzhinsky
fc013040b6
Revert previous fix.
2016-02-28 02:13:07 +03:00
Sergey
12595a21aa
Merge pull request #88 from sergey-dryabzhinsky/74-fix-metadata
...
Wrong lines removed. Fix it. Also change link to project in info.
2016-02-28 01:26:09 +03:00
Sergey Dryabzhinsky
f9d89634ad
Wrong lines removed. Fix it. Also change link to project in info.
2016-02-28 01:23:11 +03:00
Sergey Dryabzhinsky
b9bdd89676
Store audio and video bitrate in variables of type double
...
Bitrate's fraction part is lost when casting to integer type, so it
should be stored in double.
2016-02-26 20:44:48 +03:00
Sergey Dryabzhinsky
b937376041
Flash video stream's meta data (onMetaData) contains only an object (and
...
no string before it), so read the object only.
2016-02-26 20:36:25 +03:00
Sergey Dryabzhinsky
f1cde7d4a4
Missing fixes from upstreams
2015-09-20 06:35:48 +03:00
Sergey Dryabzhinsky
509a9e2f75
Fix data type for frame rate and duration
2015-09-20 00:22:50 +03:00
Sergey Dryabzhinsky
f8097173ab
Frame rate are double not int
2015-09-19 03:15:38 +03:00
Sergey
961fde23f7
Merge pull request #12 from sqbing/patch-1
...
Update ngx_rtmp_codec_module.c
2015-07-03 01:55:52 +03:00
Sergey Dryabzhinsky
0d77210815
Merge branch 'dont-overwrite-with-invalid-metadata' of https://github.com/cine-io/nginx-rtmp-module into cine-io-dont-overwrite-with-invalid-metadata
2015-07-03 01:35:53 +03:00
Sergey
859540db60
Merge pull request #5 from berg/parse-scaling-list
...
Parse scaling list from SPS
2015-07-03 01:22:50 +03:00
BeenWoo
cb36f9c23c
Update ngx_rtmp_codec_module.c
...
Some encoders send "setDataFrame" instead of "@setDataFrame", which makes rtmp module can't show correct video frame rate in stat page.
2015-02-03 15:37:46 +08:00
Jeffrey Wescott
d069f36f86
to avoid writing invalid metadata, don't overwrite metadata from previous @setDataFrame / onMetaData invocations unless the metadata has actually changed
2014-10-27 18:46:55 -07:00
Bryan Berg
2262649c1f
Don't truncate framerate for MPEG-DASH
...
When pushing 29.97fps RTMP streams, the manifest shows an
incorrect frame rate of "29", not "30000/1001" as it should be.
2014-09-07 13:03:58 -07:00
Bryan Berg
9ebfcc1978
Parse scaling list from SPS
...
This is required for the dimensions to be calcuated properly when
streaming using the high profile (at least for the encoder I'm
using). Without this, the scaling list isn't skipped over and
the parsed dimensions are incorrect.
When the dimensions are incorrect, the MPEG-DASH manifest is
generated incorrectly.
2014-09-07 12:48:56 -07:00
Roman Arutyunyan
da0128a2fc
fixed windows compilation
2013-12-23 08:06:38 +04:00
Roman Arutyunyan
3a5f9eea78
added aac-he & aac-hev2 support
2013-12-21 09:29:39 +04:00
Roman Arutyunyan
18fa7a5016
implemented avc sps parser & improved dash & stats
2013-12-21 00:47:00 +04:00
Roman Arutyunyan
b9fcf7d880
removed trailing spaces
2013-11-30 11:21:53 +04:00
Roman Arutyunyan
047b72c192
added h264 profile/compat/level parser and fixed dash avc1 codec string
2013-11-29 12:55:42 +04:00
Roman Arutyunyan
f599c70568
updated copyright line
2013-11-03 23:11:37 +04:00
Roman Arutyunyan
67443c28b4
added timestamp to meta-copy packet
2013-09-18 16:55:19 +04:00
Roman Arutyunyan
f052e4cc48
fixed repeated onMetaData string
2013-09-18 12:25:15 +04:00
Roman Arutyunyan
0f8641d0c8
implemented meta copy
2013-09-17 16:36:12 +04:00
Roman Arutyunyan
49f8f4d097
fixed type casting
2013-06-12 20:47:25 +04:00
Roman Arutyunyan
f94fcee9fb
included ngx_config.h & ngx_core.h to every file
2013-06-12 20:47:23 +04:00
Roman Arutyunyan
e5e5766ebb
Merge branch 'record-keyframes'
2012-12-25 19:50:11 +04:00
Roman Arutyunyan
0a4296b9a2
implemented rtmp aggregate message support; fixed rtmp acks
2012-12-17 21:22:51 +04:00
Roman Arutyunyan
8658d99529
fixed h264 header considered by recorder as a key with intermediate frames following
2012-12-16 01:07:01 +04:00
Roman Arutyunyan
6ed71b7c22
removed codec header versions
2012-11-14 12:29:46 +04:00
Roman Arutyunyan
9f85961535
fixed codec header csid in interleaved mode
2012-10-26 19:47:31 +04:00
Roman Arutyunyan
cb4623aa4f
removed legacy constants
2012-10-20 17:40:21 +04:00
Roman Arutyunyan
5aac8b5cb3
fixed AAC header parser
2012-10-13 09:28:35 +04:00
Roman Arutyunyan
5cd5f83d8d
fixed AAC real sample rate parsing
2012-10-12 21:10:39 +04:00
Roman Arutyunyan
67e7f4818f
fixed logging
2012-10-12 21:08:12 +04:00
Roman Arutyunyan
ebb20b848e
implemented MPEG-TS sample re-arranging in HLS stream to fix crackles because of low-resolution timestamp in RTMP vs MPEG-TS
2012-10-12 20:45:47 +04:00
Roman Arutyunyan
35425eeedb
fixed compilation on FreeBSD
2012-08-13 17:09:05 +04:00
Roman Arutyunyan
64b24423d5
added meta csid constant
2012-07-05 00:18:00 +04:00
Roman Arutyunyan
f2eadabf0e
fixed module address
2012-07-02 18:13:54 +04:00
Roman Arutyunyan
792f5aedc7
fixed metadata output
2012-07-02 18:04:50 +04:00
Roman Arutyunyan
bf487dba0b
added sending metadata to clients
2012-07-02 13:42:56 +04:00
Roman Arutyunyan
1e0e98a439
added more audio codec params to codec module
2012-06-19 17:05:05 +04:00
Roman Arutyunyan
1da4bb923e
added H264 profile & level parsers
2012-06-14 17:44:30 +04:00
Roman Arutyunyan
bf04e66862
added fps - alias for framerate
2012-06-14 17:23:48 +04:00
Roman Arutyunyan
95e2c4172a
moved metadata handlers from live to codec module & fixed setDataFrame handler to handle ffmpeg packets
2012-06-14 17:07:31 +04:00
Roman Arutyunyan
356b824af3
removed useless header initializers
2012-06-13 23:48:49 +04:00