7.0.112

libmetartccore7/src/yangrtc/YangRtcConnection.c

@@ -219,10 +219,6 @@ static int32_t yang_rtcconn_on_rtcp_feedback_remb(YangRtcSession *session,	YangR
 	return Yang_Ok;
 }
 
-//static void yang_rtcconn_do_request_keyframe(YangRtcSession *session, uint32_t ssrc) {
-//	if (session->context.streamConfig&&session->context.streamConfig->rtcCallback.sendRequest)
-//		session->context.streamConfig->rtcCallback.sendRequest(session->context.streamConfig->rtcCallback.context,session->context.streamConfig->uid, ssrc, Yang_Req_Sendkeyframe);
-//}
 
 static int32_t yang_rtcconn_dispatch_rtcp(YangRtcSession *session,YangRtcpCommon *rtcp) {
 	int32_t err = Yang_Ok;
@@ -493,7 +489,6 @@ static void yang_rtcconn_receive(YangRtcSession *session, char *data, int32_t si
 				session->context.state=Yang_Conn_State_Connecting;
 				yang_onConnectionStateChange(session,Yang_Conn_State_Connecting);
 			}
-			//	session->lastStunTime=yang_get_system_time();
 
 		}else if(bt==0x01&&data[1]==0x01){
 			if ((err = session->ice.session.stun.decode2(data, size)) != Yang_Ok) {
@@ -774,7 +769,6 @@ int32_t yang_create_rtcConnection(YangRtcConnection* conn,YangStreamConfig* stre
 
 	session->context.avinfo=avinfo;
 
-
 	if(streamconfig->remotePort==0)
 		streamconfig->remotePort=8000;
 
@@ -786,7 +780,6 @@ int32_t yang_create_rtcConnection(YangRtcConnection* conn,YangStreamConfig* stre
 
 
 	conn->close=yang_rtcconn_close;
-	//conn->init=yang_rtcconn_init;
 	conn->on_video=yang_rtcconn_onVideo;
 	conn->on_audio=yang_rtcconn_onAudio;
 	conn->on_message=yang_rtcconn_onMessage;

libmetartccore7/src/yangutil/sys/YangWebsocket.c

@@ -56,9 +56,6 @@ int yang_websocket_callback(struct lws *wsi, enum lws_callback_reasons reason,
 
 	if(reason==LWS_CALLBACK_CLIENT_RECEIVE){
     // 接收到服务器数据后的回调，数据为in，其长度为len
-
-
-
 		YangSample pdata;
 		pdata.bytes = (char*) in;
 		pdata.nb = len;
@@ -69,28 +66,7 @@ int yang_websocket_callback(struct lws *wsi, enum lws_callback_reasons reason,
 	if(reason==LWS_CALLBACK_CLIENT_ESTABLISHED){
 		yang_info("Connected to server ok!\n");
 	}
-	/**switch (reason) {
-	case LWS_CALLBACK_CLIENT_ESTABLISHED:   // 连接到服务器后的回调
-		yang_info("Connected to server ok!\n");
-		break;
-	case LWS_CALLBACK_CLIENT_RECEIVE:       // 接收到服务器数据后的回调，数据为in，其长度为len
-	{
-		//yang_trace("Rx: %s\n", (char* ) in);
-
-		YangSample pdata;
-		pdata.bytes = (char*) in;
-		pdata.nb = len;
-
-		if (obj->callback)	obj->callback->receive(obj->callback->context, &pdata);
-
-		break;
-	}
-	case LWS_CALLBACK_CLIENT_WRITEABLE:     // 当此客户端可以发送数据时的回调
-	{
-		break;
-	}
 
-	}**/
 	return Yang_Ok;
 }