Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2017-01-22 13:12:56 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6706bda42cf8a8fd4e6e5d255a1f8234154c79f9
6706bda4
1 parent
80dfe601
for #752, release the io then free it for kbps. 2.0.232
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
19 行增加
和
13 行删除
README.md
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_forward.cpp
trunk/src/core/srs_core.hpp
trunk/src/protocol/srs_protocol_kbps.hpp
README.md
查看文件 @
6706bda
...
...
@@ -346,6 +346,7 @@ Remark:
## History
*
v2.0, 2017-01-22, for
[
#752
][
bug #752
]
release the io then free it for kbps. 2.0.232
*
v2.0, 2017-01-18, fix
[
#750
][
bug #750
]
use specific error code for dns resolve. 2.0.231
*
<strong>
v2.0, 2017-01-18,
[
2.0 beta4(2.0.230)
][
r2.0b4
]
released. 86334 lines.
</strong>
*
v2.0, 2017-01-18, fix
[
#749
][
bug #749
]
, timestamp overflow for ATC. 2.0.230
...
...
@@ -1283,6 +1284,7 @@ Winlin
[
bug #740
]:
https://github.com/ossrs/srs/issues/740
[
bug #749
]:
https://github.com/ossrs/srs/issues/749
[
bug #750
]:
https://github.com/ossrs/srs/issues/750
[
bug #752
]:
https://github.com/ossrs/srs/issues/752
[
bug #xxxxxxxxxx
]:
https://github.com/ossrs/srs/issues/xxxxxxxxxx
[
exo #828
]:
https://github.com/google/ExoPlayer/pull/828
...
...
trunk/src/app/srs_app_edge.cpp
查看文件 @
6706bda
...
...
@@ -110,9 +110,9 @@ void SrsEdgeIngester::stop()
close_underlayer_socket
();
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
kbps
->
set_io
(
NULL
,
NULL
);
// notice to unpublish.
_source
->
on_unpublish
();
...
...
@@ -376,6 +376,7 @@ int SrsEdgeIngester::connect_server(string& ep_server, string& ep_port)
return
ret
;
}
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
...
...
@@ -478,9 +479,9 @@ void SrsEdgeForwarder::stop()
queue
->
clear
();
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
kbps
->
set_io
(
NULL
,
NULL
);
}
#define SYS_MAX_EDGE_SEND_MSGS 128
...
...
@@ -626,6 +627,7 @@ int SrsEdgeForwarder::connect_server(string& ep_server, string& ep_port)
return
ret
;
}
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
6706bda
...
...
@@ -150,9 +150,9 @@ void SrsForwarder::on_unpublish()
close_underlayer_socket
();
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
kbps
->
set_io
(
NULL
,
NULL
);
}
int
SrsForwarder
::
on_meta_data
(
SrsSharedPtrMessage
*
shared_metadata
)
...
...
@@ -313,6 +313,7 @@ int SrsForwarder::connect_server(string& ep_server, string& ep_port)
return
ret
;
}
kbps
->
set_io
(
NULL
,
NULL
);
srs_freep
(
client
);
srs_freep
(
io
);
...
...
trunk/src/core/srs_core.hpp
查看文件 @
6706bda
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 23
1
#define VERSION_REVISION 23
2
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
trunk/src/protocol/srs_protocol_kbps.hpp
查看文件 @
6706bda
...
...
@@ -161,7 +161,7 @@ public:
* SrsKbps* kbps = ...;
* kbps->set_io(in, out);
* // both kbps->get_recv_bytes() and kbps->get_send_bytes() are available.
* // we can use the kbps as the data source of another kbps:
* // we can use the kbps as the data source of another kbps:
* SrsKbps* user = ...;
* user->set_io(kbps, kbps);
* the server never know how many bytes already send/recv, for the connection maybe closed.
...
...
@@ -176,14 +176,15 @@ public:
virtual
~
SrsKbps
();
public
:
/**
* set io to start new session.
* set the underlayer reader/writer,
* if the io destroied, for instance, the forwarder reconnect,
* user must set the io of SrsKbps to NULL to continue to use the kbps object.
* @param in the input stream statistic. can be NULL.
* @param out the output stream statistic. can be NULL.
* @remark if in/out is NULL, use the cached data for kbps.
*/
* set io to start new session.
* set the underlayer reader/writer,
* if the io destroied, for instance, the forwarder reconnect,
* user must set the io of SrsKbps to NULL to continue to use the kbps object.
* @param in the input stream statistic. can be NULL.
* @param out the output stream statistic. can be NULL.
* @remark if in/out is NULL, use the cached data for kbps.
* @remark User must set_io(NULL, NULL) then free the in and out.
*/
virtual
void
set_io
(
ISrsProtocolStatistic
*
in
,
ISrsProtocolStatistic
*
out
);
public
:
/**
...
...
请
注册
或
登录
后发表评论