fixed:get media id incorrect for rtc push

Author: xengine-qyt

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_ClientWebRtc.cpp

@@ -180,11 +180,14 @@ bool PushStream_ClientProtocol_Thread()
 		RTPProtocol_Parse_GetPool(1, &ppSt_ListAddr, &nListCount);
 		for (int i = 0; i < nListCount; i++)
 		{
+			int nVideoIndex = 0;
+			int nAudioIndex = 0;
+			ModuleSession_PushStream_RTCIndexGet(ppSt_ListAddr[i]->tszClientAddr, &nVideoIndex, &nAudioIndex);
 			while (true)
 			{
 				STREAMMEDIA_RTPPROTOCOL_HDR st_RTPHdr = {};
 				int nMSGLen = 0;
-				st_RTPHdr.nPayID = 96;
+				st_RTPHdr.nPayID = nVideoIndex;
 				XCHAR* ptszMSGBuffer = NULL;
 				if (!RTPProtocol_Parse_Recv(ppSt_ListAddr[i]->tszClientAddr, &ptszMSGBuffer, &nMSGLen, &st_RTPHdr))
 				{
@@ -197,7 +200,7 @@ bool PushStream_ClientProtocol_Thread()
 			{
 				STREAMMEDIA_RTPPROTOCOL_HDR st_RTPHdr = {};
 				int nMSGLen = 0;
-				st_RTPHdr.nPayID = 111;
+				st_RTPHdr.nPayID = nAudioIndex;
 				XCHAR* ptszMSGBuffer = NULL;
 				if (!RTPProtocol_Parse_Recv(ppSt_ListAddr[i]->tszClientAddr, &ptszMSGBuffer, &nMSGLen, &st_RTPHdr))
 				{

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.cpp

@@ -771,6 +771,14 @@ int main(int argc, char** argv)
 
 		ManagePool_Memory_Destory(xhMemoryPool);
 		HelpComponents_XLog_Destroy(xhLog);
+
+		if (NULL != pSTD_RTCThread)
+		{
+			if (pSTD_RTCThread->joinable())
+			{
+				pSTD_RTCThread->join();
+			}
+		}
 		if (NULL != pSt_AFile)
 		{
 			fclose(pSt_AFile);