Skip to content

Commit 53cd27f

Browse files
author
xianing
committed
adapt 3.6.1 windows
1 parent 74c8e51 commit 53cd27f

4 files changed

Lines changed: 32 additions & 1 deletion

File tree

windows/APIExample/APIExample/Advanced/ScreenShare/AgoraScreenCapture.cpp

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,14 @@ LRESULT CAgoraScreenCapture::OnEIDRemoteVideoStateChanged(WPARAM wParam, LPARAM
230230
return 0;
231231
}
232232

233+
LRESULT CAgoraScreenCapture::OnEIDScreenCaptureInfoUpdated(WPARAM wParam, LPARAM lParam)
234+
{
235+
CString strInfo;
236+
strInfo.Format(_T("OnScreenCaptureInfoUpdated state:\n%s: error:\n%u"), wParam, lParam);
237+
m_lstInfo.InsertString(m_lstInfo.GetCount(), strInfo);
238+
return TRUE;
239+
}
240+
233241
LRESULT CAgoraScreenCapture::OnEIDLocalVideoStateChanged(WPARAM wParam, LPARAM lParam)
234242
{
235243
LOCAL_VIDEO_STREAM_STATE localVideoState =(LOCAL_VIDEO_STREAM_STATE) wParam;
@@ -305,6 +313,7 @@ BEGIN_MESSAGE_MAP(CAgoraScreenCapture, CDialogEx)
305313
ON_MESSAGE(WM_MSGID(EID_USER_OFFLINE), &CAgoraScreenCapture::OnEIDUserOffline)
306314
ON_MESSAGE(WM_MSGID(EID_REMOTE_VIDEO_STATE_CHANED), &CAgoraScreenCapture::OnEIDRemoteVideoStateChanged)
307315
ON_MESSAGE(WM_MSGID(EID_LOCAL_VIDEO_STATE_CHANGED), &CAgoraScreenCapture::OnEIDLocalVideoStateChanged)
316+
ON_MESSAGE(WM_MSGID(EID_SCREEN_CAPTURE_INFO_UPDATED), &CAgoraScreenCapture::OnEIDScreenCaptureInfoUpdated)
308317

309318
ON_WM_SHOWWINDOW()
310319
ON_BN_CLICKED(IDC_BUTTON_UPDATEPARAM, &CAgoraScreenCapture::OnBnClickedButtonUpdateparam)
@@ -637,6 +646,19 @@ void CScreenCaptureEventHandler::onRemoteVideoStateChanged(uid_t uid, REMOTE_VID
637646
}
638647
}
639648

649+
/** Occurs when screencapture fail to filter window
650+
*
651+
*
652+
* @param ScreenCaptureInfo
653+
*/
654+
void CScreenCaptureEventHandler::onScreenCaptureInfoUpdated(agora::rtc::ScreenCaptureInfo& info)
655+
{
656+
if (m_hMsgHanlder)
657+
{
658+
::PostMessage(m_hMsgHanlder, WM_MSGID(EID_SCREEN_CAPTURE_INFO_UPDATED), (WPARAM)info.cardType, (LPARAM)info.errCode);
659+
}
660+
}
661+
640662
static
641663
BOOL IsWindowCloaked(HWND hwnd)
642664
{

windows/APIExample/APIExample/Advanced/ScreenShare/AgoraScreenCapture.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ class CScreenCaptureEventHandler : public IRtcEngineEventHandler
8383
SDK triggers this callback.
8484
*/
8585
virtual void onRemoteVideoStateChanged(uid_t uid, REMOTE_VIDEO_STATE state, REMOTE_VIDEO_STATE_REASON reason, int elapsed) override;
86+
/** Occurs when screencapture fail to filter window
87+
*
88+
*
89+
* @param ScreenCaptureInfo
90+
*/
91+
virtual void onScreenCaptureInfoUpdated(agora::rtc::ScreenCaptureInfo & info) override;
8692
private:
8793
HWND m_hMsgHanlder;
8894
};
@@ -152,6 +158,7 @@ class CAgoraScreenCapture : public CDialogEx
152158
afx_msg LRESULT OnEIDUserOffline(WPARAM wParam, LPARAM lParam);
153159
afx_msg LRESULT OnEIDRemoteVideoStateChanged(WPARAM wParam, LPARAM lParam);
154160
afx_msg LRESULT OnEIDLocalVideoStateChanged(WPARAM wParam, LPARAM lParam);
161+
afx_msg LRESULT OnEIDScreenCaptureInfoUpdated(WPARAM wParam, LPARAM lParam);
155162

156163
protected:
157164
virtual void DoDataExchange(CDataExchange* pDX);

windows/APIExample/APIExample/stdafx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ using namespace agora::media;
8888
#define EID_AUDIO_DEVICE_STATE_CHANGED 0x00000019
8989

9090
#define EID_RTMP_STREAM_EVENT 0x00000020
91+
#define EID_SCREEN_CAPTURE_INFO_UPDATED 0x00000021
9192
typedef struct _StreamPublished {
9293
char* url;
9394
int error;
@@ -110,6 +111,7 @@ typedef struct _tagVideoStateStateChanged {
110111
REMOTE_VIDEO_STATE_REASON reason;
111112
}VideoStateStateChanged, *PVideoStateStateChanged;
112113

114+
113115
std::string cs2utf8(CString str);
114116
CString utf82cs(std::string utf8);
115117
CString getCurrentTime();

windows/APIExample/install.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ThirdPartysrc = 'https://agora-adc-artifacts.oss-cn-beijing.aliyuncs.com/libs/ThirdParty.zip'
22
$ThirdPartydes = 'ThirdParty.zip'
3-
$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_5_0_3_FULL.zip'
3+
$agora_sdk = 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_6_1_FULL.zip'
44
$agora_des = 'Agora_Native_SDK_for_Windows.zip'
55
$MediaPlayerSDK = 'https://download.agora.io/sdk/release/Agora_Media_Player_for_Windows_x86_32597_20200923_2306.zip'
66
$MediaPlayerDes = 'MediaPlayerPartSave.zip'

0 commit comments

Comments
 (0)