Skip to content

New module bandwidth detection #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 19 commits into
base: dev
Choose a base branch
from
Open

New module bandwidth detection #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a613300
New module for bandwidth detection
sergey-dryabzhinsky Feb 28, 2016
1c57ac0
Fix _result log values
sergey-dryabzhinsky Feb 28, 2016
6a53980
Fix sending messages
sergey-dryabzhinsky Feb 28, 2016
20c8296
My fork link in stat
sergey-dryabzhinsky Feb 28, 2016
dbc5553
More debug, add _error handler
sergey-dryabzhinsky Feb 28, 2016
5a32fd4
Remove unused var
sergey-dryabzhinsky Feb 28, 2016
272f719
Create bw context if none, send errors in some cases
sergey-dryabzhinsky Feb 28, 2016
58c4ddd
Remove live context use, reorder files and module
sergey-dryabzhinsky Feb 28, 2016
7f64585
Set payload length
sergey-dryabzhinsky Feb 28, 2016
2d9b53f
Add client side bandwidth detection
sergey-dryabzhinsky Feb 28, 2016
753442d
Fix fucntion definition
sergey-dryabzhinsky Feb 28, 2016
c444223
Fix undefined var, remove unused
sergey-dryabzhinsky Feb 28, 2016
8321054
Add fast detection mode. Less accurate.
sergey-dryabzhinsky Feb 28, 2016
4599878
Try to fix payload length sent and bw fast calculation
sergey-dryabzhinsky Feb 28, 2016
175cc47
Try to fix sent messages
sergey-dryabzhinsky Feb 28, 2016
41d7b0e
Try to send right amf data
sergey-dryabzhinsky Feb 28, 2016
d5ae995
Adjust var types
sergey-dryabzhinsky Feb 28, 2016
6f0fdca
Update bandwidth detection module
sergey-dryabzhinsky Apr 16, 2016
f365781
Change option names, bw fast calculation
sergey-dryabzhinsky Apr 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RTMP_CORE_MODULES=" \
ngx_rtmp_codec_module \
ngx_rtmp_access_module \
ngx_rtmp_record_module \
ngx_rtmp_bandwidth_detection_module \
ngx_rtmp_live_module \
ngx_rtmp_play_module \
ngx_rtmp_flv_module \
Expand All @@ -32,6 +33,7 @@ RTMP_DEPS=" \
$ngx_addon_dir/ngx_rtmp_eval.h \
$ngx_addon_dir/ngx_rtmp.h \
$ngx_addon_dir/ngx_rtmp_version.h \
$ngx_addon_dir/ngx_rtmp_bandwidth_detection_module.h \
$ngx_addon_dir/ngx_rtmp_live_module.h \
$ngx_addon_dir/ngx_rtmp_netcall_module.h \
$ngx_addon_dir/ngx_rtmp_play_module.h \
Expand All @@ -58,6 +60,7 @@ RTMP_CORE_SRCS=" \
$ngx_addon_dir/ngx_rtmp_codec_module.c \
$ngx_addon_dir/ngx_rtmp_access_module.c \
$ngx_addon_dir/ngx_rtmp_record_module.c \
$ngx_addon_dir/ngx_rtmp_bandwidth_detection_module.c \
$ngx_addon_dir/ngx_rtmp_live_module.c \
$ngx_addon_dir/ngx_rtmp_play_module.c \
$ngx_addon_dir/ngx_rtmp_flv_module.c \
Expand Down Expand Up @@ -111,6 +114,6 @@ fi

USE_OPENSSL=YES

CFLAGS="$CFLAGS -I$ngx_addon_dir"
# CFLAGS="$CFLAGS -I$ngx_addon_dir"
# Debug build with all warnings as errors
# CFLAGS="$CFLAGS -I$ngx_addon_dir -Wall -Wpointer-arith -Wno-unused-parameter -Werror"
CFLAGS="$CFLAGS -I$ngx_addon_dir -Wall -Wpointer-arith -Wno-unused-parameter -Werror"
5 changes: 5 additions & 0 deletions ngx_rtmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,11 @@ ngx_int_t ngx_rtmp_send_close_method(ngx_rtmp_session_t *s, char *methodName);
ngx_int_t ngx_rtmp_send_fcpublish(ngx_rtmp_session_t *s, u_char *desc);
ngx_int_t ngx_rtmp_send_fcunpublish(ngx_rtmp_session_t *s, u_char *desc);
ngx_int_t ngx_rtmp_send_fi(ngx_rtmp_session_t *s);
ngx_int_t ngx_rtmp_send_bwcheck(ngx_rtmp_session_t *s, u_char *payload, size_t plength);
ngx_int_t ngx_rtmp_send_bwdone(ngx_rtmp_session_t *s,
double kbitDown, ngx_uint_t deltaDown, double deltaTime, ngx_msec_t latency);
ngx_int_t ngx_rtmp_send_onclientbwcheck(ngx_rtmp_session_t *s, double inTrans,
double cOutBytes, double cInBytes, ngx_uint_t inTime);


/* Frame types */
Expand Down
Loading