1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge branch '2.0release' into develop

This commit is contained in:
winlin 2016-09-13 18:08:19 +08:00
commit 77bca7cc05

View file

@ -2028,6 +2028,9 @@ int64_t srs_utils_send_bytes(srs_rtmp_t rtmp)
{ {
srs_assert(rtmp != NULL); srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp; Context* context = (Context*)rtmp;
if (!context->rtmp) {
return 0;
}
return context->rtmp->get_send_bytes(); return context->rtmp->get_send_bytes();
} }
@ -2035,6 +2038,9 @@ int64_t srs_utils_recv_bytes(srs_rtmp_t rtmp)
{ {
srs_assert(rtmp != NULL); srs_assert(rtmp != NULL);
Context* context = (Context*)rtmp; Context* context = (Context*)rtmp;
if (!context->rtmp) {
return 0;
}
return context->rtmp->get_recv_bytes(); return context->rtmp->get_recv_bytes();
} }