Merge pull request #127 from AgoraIO/dev/win-rtmp

DEMO-2792

Author: xia ning

windows/APIExample/APIExample/Advanced/RTMPStream/AgoraRtmpStreaming.cpp

@@ -104,6 +104,30 @@ void CAgoraRtmpStreamingDlgRtcEngineEventHandler::onRtmpStreamingStateChanged(co
 }
 
 
+
+void CAgoraRtmpStreamingDlgRtcEngineEventHandler::onStreamUnpublished(const char *url)
+{
+	if (m_hMsgHanlder) {
+		PStreamPublished streamPublished = new StreamPublished;
+		int len = strlen(url);
+		char* publishUrl = new char[len + 1];
+		memset(publishUrl, 0, sizeof(publishUrl));
+		strcpy_s(publishUrl, len, url);
+		::PostMessage(m_hMsgHanlder, WM_MSGID(EID_RTMP_STREAM_STATE_UNPUBLISHED), (WPARAM)streamPublished, 0);
+	}
+}
+
+void CAgoraRtmpStreamingDlgRtcEngineEventHandler::onStreamPublished(const char *url, int error)
+{
+	if (m_hMsgHanlder) {
+		int len = strlen(url);
+		char* publishUrl = new char[len + 1];
+		memset(publishUrl, 0, sizeof(publishUrl));
+		strcpy_s(publishUrl, len, url);
+		::PostMessage(m_hMsgHanlder, WM_MSGID(EID_RTMP_STREAM_STATE_PUBLISHED), (WPARAM)publishUrl, error);
+	}
+}
+
 IMPLEMENT_DYNAMIC(CAgoraRtmpStreamingDlg, CDialogEx)
 
 CAgoraRtmpStreamingDlg::CAgoraRtmpStreamingDlg(CWnd* pParent /*=nullptr*/)
@@ -145,11 +169,14 @@ BEGIN_MESSAGE_MAP(CAgoraRtmpStreamingDlg, CDialogEx)
 	ON_MESSAGE(WM_MSGID(EID_RTMP_STREAM_STATE_CHANGED), &CAgoraRtmpStreamingDlg::OnEIDRtmpStateChanged)
 	ON_MESSAGE(WM_MSGID(EID_USER_JOINED), &CAgoraRtmpStreamingDlg::OnEIDUserJoined)
 	ON_MESSAGE(WM_MSGID(EID_USER_OFFLINE), &CAgoraRtmpStreamingDlg::OnEIDUserOffline)
+	ON_MESSAGE(WM_MSGID(EID_RTMP_STREAM_STATE_PUBLISHED), &CAgoraRtmpStreamingDlg::OnEIDStreamPublished)
+	ON_MESSAGE(WM_MSGID(EID_RTMP_STREAM_STATE_UNPUBLISHED), &CAgoraRtmpStreamingDlg::OnEIDStreamUnpublished)
 	ON_BN_CLICKED(IDC_BUTTON_JOINCHANNEL, &CAgoraRtmpStreamingDlg::OnBnClickedButtonJoinchannel)
 	ON_BN_CLICKED(IDC_BUTTON_ADDSTREAM, &CAgoraRtmpStreamingDlg::OnBnClickedButtonAddstream)
 	ON_BN_CLICKED(IDC_BUTTON_REMOVE_STREAM, &CAgoraRtmpStreamingDlg::OnBnClickedButtonRemoveStream)
 	ON_BN_CLICKED(IDC_BUTTON_REMOVE_ALLSTREAM, &CAgoraRtmpStreamingDlg::OnBnClickedButtonRemoveAllstream)
 	ON_LBN_SELCHANGE(IDC_LIST_INFO_BROADCASTING, &CAgoraRtmpStreamingDlg::OnSelchangeListInfoBroadcasting)
+	ON_WM_TIMER()
 END_MESSAGE_MAP()
 
 
@@ -631,5 +658,84 @@ BOOL CAgoraRtmpStreamingDlg::PreTranslateMessage(MSG* pMsg)
 	return CDialogEx::PreTranslateMessage(pMsg);
 }
 
+LRESULT CAgoraRtmpStreamingDlg::OnEIDStreamUnpublished(WPARAM wParam, LPARAM lParam)
+{
+	char* url = (char*)wParam;
+
+	if (m_mapRepublishFlag.find(url) != m_mapRepublishFlag.end()
+		&& m_mapRemoveFlag.find(url) != m_mapRemoveFlag.end()) {
+		if (m_mapRepublishFlag[url]
+			&& !m_mapRemoveFlag[url]) {//republish, removePublish when error
+			m_rtcEngine->addPublishStreamUrl(url, false);
+		}
+	}
 
+	delete[] url;
+	url = nullptr;
+	return 0;
+}
 
+LRESULT CAgoraRtmpStreamingDlg::OnEIDStreamPublished(WPARAM wParam, LPARAM lParam)
+{
+	char* url = (char*)wParam;
+	int error = lParam;
+
+	if (error == 1 || error == 10 || error == 154) {
+		m_mapRemoveFlag[url] = false;
+		m_rtcEngine->removePublishStreamUrl(url);
+		m_mapRepublishFlag[url] = true;
+		CString  strUrl;
+		strUrl.Format(_T("%S"), url);
+		for (int i = 0; i < m_cmbRtmpUrl.GetCount(); ++i) {
+			CString strText;
+			m_cmbRtmpUrl.GetLBText(i, strText);
+			if (strText.Compare(strUrl) == 0) {
+				m_cmbRtmpUrl.DeleteString(i);
+				break;
+			}
+		}
+
+		if (m_urlSet.find(strUrl) != m_urlSet.end()) {
+			m_urlSet.erase(strUrl);
+		}
+
+		if (m_cmbRtmpUrl.GetCurSel() < 0 && m_cmbRtmpUrl.GetCount() > 0)
+			m_cmbRtmpUrl.SetCurSel(0);
+	}
+	else if (error == 155) {
+		m_rtcEngine->addPublishStreamUrl(url, false);
+		
+		if (m_mapUrlToTimer.find(url) == m_mapUrlToTimer.end()) {
+			LastTimer_Republish_id++;
+			m_mapUrlToTimer[url] = LastTimer_Republish_id;
+			m_mapTimerToUrl[LastTimer_Republish_id] = url;
+			m_mapTimerToRepublishCount[LastTimer_Republish_id] = 1;
+			
+			SetTimer(LastTimer_Republish_id, 1000, NULL);
+		}
+	
+	}
+
+
+	delete[] url;
+	url = nullptr;
+	return 0;
+}
+
+
+void CAgoraRtmpStreamingDlg::OnTimer(UINT_PTR nIDEvent)
+{
+	if (m_mapTimerToRepublishCount.find(nIDEvent)
+		!= m_mapTimerToRepublishCount.end()) {
+		if (m_mapTimerToRepublishCount[nIDEvent] == 5) {
+			KillTimer(nIDEvent);
+			m_mapUrlToTimer.erase(m_mapTimerToUrl[nIDEvent]);
+			m_mapTimerToRepublishCount.erase(nIDEvent);
+			m_mapTimerToUrl.erase(nIDEvent);
+			return;
+		}
+
+		m_mapTimerToRepublishCount[nIDEvent]++;
+		m_rtcEngine->addPublishStreamUrl(m_mapTimerToUrl[nIDEvent].c_str(), false);
+	}
+}

windows/APIExample/APIExample/Advanced/RTMPStream/AgoraRtmpStreaming.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "AGVideoWnd.h"
 #include <set>
 
@@ -73,6 +73,36 @@ class CAgoraRtmpStreamingDlgRtcEngineEventHandler
    */
 	virtual void onRtmpStreamingStateChanged(const char *url, RTMP_STREAM_PUBLISH_STATE state, RTMP_STREAM_PUBLISH_ERROR errCode)override;
 
+	/** @deprecated This method is deprecated, use the \ref agora::rtc::IRtcEngineEventHandler::onRtmpStreamingStateChanged "onRtmpStreamingStateChanged" callback instead.
+
+	 Reports the result of calling the \ref agora::rtc::IRtcEngine::removePublishStreamUrl "removePublishStreamUrl" method. (CDN live only.)
+
+	 This callback indicates whether you have successfully removed an RTMP stream from the CDN.
+
+	 @param url The RTMP URL address.
+	 */
+	virtual void onStreamUnpublished(const char *url) override;
+
+	/** @deprecated This method is deprecated, use the \ref agora::rtc::IRtcEngineEventHandler::onRtmpStreamingStateChanged "onRtmpStreamingStateChanged" callback instead.
+
+	Reports the result of calling the \ref IRtcEngine::addPublishStreamUrl "addPublishStreamUrl" method. (CDN live only.)
+
+	@param url The RTMP URL address.
+	@param error Error code: #ERROR_CODE_TYPE. Main errors include:
+	- #ERR_OK (0): The publishing succeeds.
+	- #ERR_FAILED (1): The publishing fails.
+	- #ERR_INVALID_ARGUMENT (2): Invalid argument used. If, for example, you did not call \ref agora::rtc::IRtcEngine::setLiveTranscoding "setLiveTranscoding" to configure LiveTranscoding before calling \ref agora::rtc::IRtcEngine::addPublishStreamUrl "addPublishStreamUrl", the SDK reports #ERR_INVALID_ARGUMENT.
+	- #ERR_TIMEDOUT (10): The publishing timed out.
+	- #ERR_ALREADY_IN_USE (19): The chosen URL address is already in use for CDN live streaming.
+	- #ERR_RESOURCE_LIMITED (22): The backend system does not have enough resources for the CDN live streaming.
+	- #ERR_ENCRYPTED_STREAM_NOT_ALLOWED_PUBLISH (130): You cannot publish an encrypted stream.
+	- #ERR_PUBLISH_STREAM_CDN_ERROR (151)
+	- #ERR_PUBLISH_STREAM_NUM_REACH_LIMIT (152)
+	- #ERR_PUBLISH_STREAM_NOT_AUTHORIZED (153)
+	- #ERR_PUBLISH_STREAM_INTERNAL_SERVER_ERROR (154)
+	- #ERR_PUBLISH_STREAM_FORMAT_NOT_SUPPORTED (156)
+	*/
+	virtual void onStreamPublished(const char *url, int error);
 private:
 	HWND m_hMsgHanlder;
 };
@@ -119,6 +149,9 @@ class CAgoraRtmpStreamingDlg : public CDialogEx
 	int  m_removeUrlCount = 0;
 	std::set<CString> m_urlSet;
 
+	std::map<std::string, bool> m_mapRepublishFlag;
+	std::map<std::string, bool> m_mapRemoveFlag;// remove falg when leavechannel 
+
 	LiveTranscoding m_liveTransCoding;
 public:
 	virtual BOOL OnInitDialog();
@@ -134,6 +167,9 @@ class CAgoraRtmpStreamingDlg : public CDialogEx
 	afx_msg LRESULT OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam);
 	afx_msg LRESULT OnEIDRtmpStateChanged(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnSelchangeListInfoBroadcasting();
+	afx_msg LRESULT OnEIDStreamUnpublished(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnEIDStreamPublished(WPARAM wParam, LPARAM lParam);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 
 	CEdit m_edtChannelName;
@@ -151,4 +187,9 @@ class CAgoraRtmpStreamingDlg : public CDialogEx
 	CStatic m_staVideoArea;
 	CStatic m_staDetail;
 	CButton m_chkTransCoding;
+	int LastTimer_Republish_id = 100000;
+	
+	std::map<std::string, int> m_mapUrlToTimer;
+	std::map<int, std::string> m_mapTimerToUrl;
+	std::map<int, int> m_mapTimerToRepublishCount;
 };

windows/APIExample/APIExample/stdafx.h

@@ -82,8 +82,12 @@ using namespace agora::media;
 #define EID_LOCAL_VIDEO_STATS						0x00000013
 #define EID_CHANNEL_MEDIA_RELAY_STATE_CHNAGENED		0x00000014
 #define EID_CHANNEL_MEDIA_RELAY_EVENT		 		0x00000015
-
-
+#define EID_RTMP_STREAM_STATE_PUBLISHED		 		0x00000016
+#define EID_RTMP_STREAM_STATE_UNPUBLISHED		 	0x00000017
+typedef struct _StreamPublished {
+	char* url;
+	int error;
+}StreamPublished, *PStreamPublished, *LPStreamPublished;
 
 typedef struct _tagRtmpStreamStateChanged {
     char* url;