winlin

change meeting hls to an

@@ -202,12 +202,7 @@ vhost players_chat { @@ -202,12 +202,7 @@ vhost players_chat {
202 vparams { 202 vparams {
203 g 30; 203 g 30;
204 } 204 }
205 - acodec libaacplus;  
206 - abitrate 30;  
207 - asample_rate 44100;  
208 - achannels 2;  
209 - aparams {  
210 - } 205 + acodec an;
211 output rtmp://127.0.0.1:[port]/[app]?vhost=chat_hls/[stream]; 206 output rtmp://127.0.0.1:[port]/[app]?vhost=chat_hls/[stream];
212 } 207 }
213 } 208 }
@@ -122,12 +122,12 @@ void SrsThread::thread_cycle() @@ -122,12 +122,12 @@ void SrsThread::thread_cycle()
122 { 122 {
123 int ret = ERROR_SUCCESS; 123 int ret = ERROR_SUCCESS;
124 124
125 - _cid = _srs_context->get_id();  
126 - srs_assert(handler);  
127 -  
128 _srs_context->generate_id(); 125 _srs_context->generate_id();
129 srs_info("thread cycle start"); 126 srs_info("thread cycle start");
130 - 127 +
  128 + _cid = _srs_context->get_id();
  129 +
  130 + srs_assert(handler);
131 handler->on_thread_start(); 131 handler->on_thread_start();
132 132
133 loop = true; 133 loop = true;