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

change meeting hls to an

Browse source
This commit is contained in:
winlin 2014-04-16 16:18:02 +08:00
parent 5af1da17ed
commit ae3f7d9cb8
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/conf/demo.conf
View file

@ -202,12 +202,7 @@ vhost players_chat {
vparams { vparams {
g 30; g 30;
} }
acodec libaacplus; acodec an;
abitrate 30;
asample_rate 44100;
achannels 2;
aparams {
}
output rtmp://127.0.0.1:[port]/[app]?vhost=chat_hls/[stream]; output rtmp://127.0.0.1:[port]/[app]?vhost=chat_hls/[stream];
} }
} }

8
trunk/src/app/srs_app_thread.cpp
View file

@ -122,12 +122,12 @@ void SrsThread::thread_cycle()
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
_cid = _srs_context->get_id();
srs_assert(handler);
_srs_context->generate_id(); _srs_context->generate_id();
srs_info("thread cycle start"); srs_info("thread cycle start");
_cid = _srs_context->get_id();
srs_assert(handler);
handler->on_thread_start(); handler->on_thread_start();
loop = true; loop = true;