beauty enhance

Author: sbd021

windows/APIExample/APIExample/APIExample.rc

@@ -437,27 +437,6 @@ BEGIN
     LTEXT           "vloume",IDC_STATIC_AUDIO_VLOUME,327,386,42,8
 END
 
-IDD_DIALOG_BEAUTY DIALOGEX 0, 0, 632, 400
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    LTEXT           "",IDC_STATIC_VIDEO,1,0,483,310,NOT WS_VISIBLE
-    LISTBOX         IDC_LIST_INFO_BROADCASTING,491,0,139,312,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-    LTEXT           "Channel Name",IDC_STATIC_CHANNELNAME,11,328,48,8
-    EDITTEXT        IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,50,14
-    LTEXT           "lightening contrast",IDC_STATIC_BEAUTY_LIGHTENING_CONTRAST_LEVEL,11,353,93,8
-    COMBOBOX        IDC_COMBO_BEAUTE_LIGHTENING_CONTRAST_LEVEL,80,352,79,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "",IDC_STATIC_DETAIL,442,325,181,58
-    LTEXT           "lightening",IDC_STATIC_BEAUTY_LIGHTENING,11,370,48,8
-    EDITTEXT        IDC_EDIT_LIGHTENING,79,369,80,13,ES_AUTOHSCROLL
-    LTEXT           "redness",IDC_STATIC_BEAUTY_REDNESS,166,353,48,8
-    LTEXT           "smoothness",IDC_STATIC_BEAUTY_SMOOTHNESS,166,371,48,8
-    EDITTEXT        IDC_EDIT_BEAUTY_REDNESS,222,351,80,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BEAUTY_SMOOTHNESS,222,370,80,13,ES_AUTOHSCROLL
-    CONTROL         "Beauty Enable",IDC_CHECK_BEAUTY_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,310,358,62,10
-END
-
 IDD_DIALOG_PERCALL_TEST DIALOGEX 0, 0, 632, 400
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -620,6 +599,37 @@ BEGIN
     LTEXT           "Share Info",IDC_STATIC_SHARE,17,370,38,8
 END
 
+IDD_DIALOG_BEAUTY DIALOGEX 0, 0, 632, 400
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_STATIC_VIDEO,0,0,483,289,NOT WS_VISIBLE
+    LISTBOX         IDC_LIST_INFO_BROADCASTING,491,0,139,286,LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+    LTEXT           "Channel Name",IDC_STATIC_CHANNELNAME,12,309,48,8
+    EDITTEXT        IDC_EDIT_CHANNELNAME,72,307,115,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "JoinChannel",IDC_BUTTON_JOINCHANNEL,194,306,50,14
+    LTEXT           "lightening contrast",IDC_STATIC_BEAUTY_LIGHTENING_CONTRAST_LEVEL,12,334,64,8
+    COMBOBOX        IDC_COMBO_BEAUTE_LIGHTENING_CONTRAST_LEVEL,81,333,79,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "",IDC_STATIC_DETAIL,485,297,132,56
+    LTEXT           "lightening",IDC_STATIC_BEAUTY_LIGHTENING,12,351,45,8
+    LTEXT           "redness",IDC_STATIC_BEAUTY_REDNESS,167,334,41,8
+    LTEXT           "smoothness",IDC_STATIC_BEAUTY_SMOOTHNESS,167,352,42,8
+    CONTROL         "Beauty Enable",IDC_CHECK_BEAUTY_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,251,307,62,10
+    GROUPBOX        "Beauty",IDC_STATIC_BEaUTY,0,300,352,67
+    GROUPBOX        "Enhance",IDC_STATIC,0,373,412,24
+    CONTROL         "Colorful Enhance",IDC_CHECK_ENHANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,384,75,13
+    CONTROL         "",IDC_SLIDER_STRENGTH,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,130,382,104,15
+    LTEXT           "Strength",IDC_STATIC_STRENTH,92,389,29,8
+    LTEXT           "Skin Protect",IDC_STATIC_SKIN_PROTECT,241,389,40,8
+    LTEXT           "Strength",IDC_STATIC_STRENTH2,95,389,29,8
+    LTEXT           "Static",IDC_STATIC,267,389,19,8
+    CONTROL         "",IDC_SLIDER_SKIN_PROTECT,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,294,382,110,15
+    CONTROL         "Video Denoise",IDC_CHECK_VIDEO_DENOISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,370,299,58,10
+    CONTROL         "",IDC_SLIDER_REDNESS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,219,330,121,15
+    CONTROL         "",IDC_SLIDER_LIGHTENING,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,55,348,100,15
+    CONTROL         "",IDC_SLIDER_SMOOTHNESS,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,222,346,117,15
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -732,12 +742,6 @@ BEGIN
         BOTTOMMARGIN, 397
     END
 
-    IDD_DIALOG_BEAUTY, DIALOG
-    BEGIN
-        RIGHTMARGIN, 630
-        BOTTOMMARGIN, 397
-    END
-
     IDD_DIALOG_PERCALL_TEST, DIALOG
     BEGIN
         RIGHTMARGIN, 630
@@ -779,6 +783,12 @@ BEGIN
         RIGHTMARGIN, 630
         BOTTOMMARGIN, 397
     END
+
+    IDD_DIALOG_BEAUTY, DIALOG
+    BEGIN
+        RIGHTMARGIN, 630
+        BOTTOMMARGIN, 397
+    END
 END
 #endif    // APSTUDIO_INVOKED
 
@@ -873,11 +883,6 @@ BEGIN
     0
 END
 
-IDD_DIALOG_BEAUTY AFX_DIALOG_LAYOUT
-BEGIN
-    0
-END
-
 IDD_DIALOG_PERCALL_TEST AFX_DIALOG_LAYOUT
 BEGIN
     0
@@ -913,6 +918,11 @@ BEGIN
     0
 END
 
+IDD_DIALOG_BEAUTY AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //

windows/APIExample/APIExample/Advanced/Beauty/CAgoraBeautyDlg.cpp

@@ -111,9 +111,7 @@ void CAgoraBeautyDlg::RenderLocalVideo()
 void CAgoraBeautyDlg::ResumeStatus()
 {
 	m_edtChannel.SetWindowText(_T(""));
-	m_edtLightLevel.SetWindowText(_T(""));
-	m_edtReadness.SetWindowText(_T(""));
-	m_edtSmoothness.SetWindowText(_T(""));
+	
 	m_staDetail.SetWindowText(_T(""));
 
 	m_chkBeauty.SetCheck(BST_UNCHECKED);
@@ -122,6 +120,18 @@ void CAgoraBeautyDlg::ResumeStatus()
 	SetBeauty(false);
 	m_joinChannel = false;
 	m_initialize = false;
+
+	m_sldStrength.SetRange(0, 100);
+	m_sldStrength.SetPos(50);
+	m_sldSkin.SetRange(0, 100);
+	m_sldSkin.SetPos(100);
+
+	m_sdlLightening.SetRange(0, 100);
+	m_sdlLightening.SetPos(0);
+	m_sldRedness.SetRange(0, 100);
+	m_sldRedness.SetPos(0);
+	m_sldSmoothness.SetRange(0, 100);
+	m_sldSmoothness.SetPos(0);
 }
 
 
@@ -133,16 +143,24 @@ void CAgoraBeautyDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_CHECK_BEAUTY_ENABLE, m_chkBeauty);
 	DDX_Control(pDX, IDC_BUTTON_JOINCHANNEL, m_btnJoinChannel);
 	DDX_Control(pDX, IDC_COMBO_BEAUTE_LIGHTENING_CONTRAST_LEVEL, m_cmbBeautyLevel);
-	DDX_Control(pDX, IDC_EDIT_LIGHTENING, m_edtLightLevel);
+
 	DDX_Control(pDX, IDC_STATIC_BEAUTY_REDNESS, m_staRedness);
 	DDX_Control(pDX, IDC_STATIC_BEAUTY_SMOOTHNESS, m_staSoomthness);
-	DDX_Control(pDX, IDC_EDIT_BEAUTY_REDNESS, m_edtReadness);
-	DDX_Control(pDX, IDC_EDIT_BEAUTY_SMOOTHNESS, m_edtSmoothness);
+
 	DDX_Control(pDX, IDC_STATIC_VIDEO, m_staVideoArea);
 	DDX_Control(pDX, IDC_LIST_INFO_BROADCASTING, m_lstInfo);
 	DDX_Control(pDX, IDC_STATIC_BEAUTY_LIGHTENING_CONTRAST_LEVEL, m_staLightContrast);
 	DDX_Control(pDX, IDC_STATIC_BEAUTY_LIGHTENING, m_staLight);
 	DDX_Control(pDX, IDC_STATIC_DETAIL, m_staDetail);
+	DDX_Control(pDX, IDC_CHECK_ENHANCE, m_chkEnhance);
+	DDX_Control(pDX, IDC_SLIDER_STRENGTH, m_sldStrength);
+	DDX_Control(pDX, IDC_STATIC_SKIN_PROTECT, m_staSkin);
+	DDX_Control(pDX, IDC_SLIDER_SKIN_PROTECT, m_sldSkin);
+	DDX_Control(pDX, IDC_CHECK_VIDEO_DENOISE, m_chkVideoDenoise);
+	
+	DDX_Control(pDX, IDC_SLIDER_LIGHTENING, m_sdlLightening);
+	DDX_Control(pDX, IDC_SLIDER_REDNESS, m_sldRedness);
+	DDX_Control(pDX, IDC_SLIDER_SMOOTHNESS, m_sldSmoothness);
 }
 
 
@@ -156,9 +174,36 @@ BEGIN_MESSAGE_MAP(CAgoraBeautyDlg, CDialogEx)
 	ON_WM_SHOWWINDOW()
 	ON_BN_CLICKED(IDC_CHECK_BEAUTY_ENABLE, &CAgoraBeautyDlg::OnBnClickedCheckbeautyCtrlEnable)
 	ON_LBN_SELCHANGE(IDC_LIST_INFO_BROADCASTING, &CAgoraBeautyDlg::OnSelchangeListInfoBroadcasting)
+	ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_REDNESS, &CAgoraBeautyDlg::OnNMCustomdrawSliderRedness)
+	ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_LIGHTENING, &CAgoraBeautyDlg::OnNMCustomdrawSliderLightening)
+	ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_SMOOTHNESS, &CAgoraBeautyDlg::OnNMCustomdrawSliderSmoothness)
+	ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_STRENGTH, &CAgoraBeautyDlg::OnNMCustomdrawSliderStrength)
+	ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_SKIN_PROTECT, &CAgoraBeautyDlg::OnNMCustomdrawSliderSkinProtect)
+	ON_BN_CLICKED(IDC_CHECK_ENHANCE, &CAgoraBeautyDlg::OnBnClickedCheckEnhance)
+	ON_BN_CLICKED(IDC_CHECK_VIDEO_DENOISE, &CAgoraBeautyDlg::OnBnClickedCheckVideoDenoise)
+	ON_CBN_SELCHANGE(IDC_COMBO_BEAUTE_LIGHTENING_CONTRAST_LEVEL, &CAgoraBeautyDlg::OnSelchangeComboBeauteLighteningContrastLevel)
 END_MESSAGE_MAP()
 
 
+void CAgoraBeautyDlg::SetBeauty()
+{
+	if (!m_rtcEngine) return;
+	BeautyOptions option;
+	option.rednessLevel = m_sldRedness.GetPos() / 100.0f;
+	option.lighteningLevel = m_sdlLightening.GetPos() / 100.0f;
+	option.smoothnessLevel = m_sldSmoothness.GetPos() / 100.0f;
+	option.lighteningContrastLevel = (agora::rtc::BeautyOptions::LIGHTENING_CONTRAST_LEVEL)m_cmbBeautyLevel.GetCurSel();
+	m_rtcEngine->setBeautyEffectOptions(m_chkBeauty.GetCheck() != 0, option);
+}
+
+void CAgoraBeautyDlg::SetColorful()
+{
+	if (!m_rtcEngine) return;
+	ColorEnhanceOptions options;
+	options.skinProtectLevel = m_sldSkin.GetPos() / 100.0f;
+	options.strengthLevel = m_sldStrength.GetPos() / 100.0f;
+	m_rtcEngine->setColorEnhanceOptions(m_chkEnhance.GetCheck()!=0,options);
+}
 
 // join channel or level channel.
 void CAgoraBeautyDlg::OnBnClickedButtonJoinchannel()
@@ -213,25 +258,24 @@ void CAgoraBeautyDlg::SetBeauty(bool enabled,
 void CAgoraBeautyDlg::OnBnClickedCheckbeautyCtrlEnable()
 {
 	bool enabled = m_chkBeauty.GetCheck() == BST_CHECKED ? TRUE : FALSE;
+	m_sldRedness.EnableWindow(enabled);
+	m_sldSmoothness.EnableWindow(enabled);
+	m_sdlLightening.EnableWindow(enabled);
+
 	//Beauty options to set 
 	CString tmp;
 	auto lighteningContrastLevel = (agora::rtc::BeautyOptions::LIGHTENING_CONTRAST_LEVEL)m_cmbBeautyLevel.GetCurSel();
 	float lighteningLevel;
 	float rednessLevel;
 	float smoothnessLevel;
-	m_edtLightLevel.GetWindowText(tmp);
-	auto func = [](float a)->float {
-		return a <0.0f ? 0.0f : a>1.0f ? 1.0f : a;
-	};
-	lighteningLevel = func(static_cast<float>(_ttof(tmp)/10));
-	m_edtReadness.GetWindowText(tmp);
-	rednessLevel = func(static_cast<float>(_ttof(tmp)/10));
-	m_edtSmoothness.GetWindowText(tmp);
-	smoothnessLevel = func(static_cast<float>(_ttof(tmp)/10));
+	lighteningLevel = m_sdlLightening.GetPos() / 100.0f;
+	rednessLevel = m_sldRedness.GetPos() / 100.0f;
+	smoothnessLevel = m_sldSmoothness.GetPos() / 100.0f;
 	CString strInfo;
 	CString strlighteningContrastLevel;
 	m_cmbBeautyLevel.GetWindowText(strlighteningContrastLevel);
 	SetBeauty(enabled, lighteningContrastLevel, lighteningLevel, rednessLevel, smoothnessLevel);
+	SetColorful();
 	if (enabled)
 	{
 		strInfo.Format(_T("lighteningContrastLevel:%s,\nlightening:%.1f,\nredness:%.1f,\nsmoothness:%.1f"),
@@ -485,3 +529,55 @@ void CAgoraBeautyDlg::OnSelchangeListInfoBroadcasting()
 	m_lstInfo.GetText(sel, strDetail);
 	m_staDetail.SetWindowText(strDetail);
 }
+
+
+void CAgoraBeautyDlg::OnNMCustomdrawSliderRedness(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	SetBeauty();
+}
+
+
+void CAgoraBeautyDlg::OnNMCustomdrawSliderLightening(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	SetBeauty();
+}
+
+
+void CAgoraBeautyDlg::OnNMCustomdrawSliderSmoothness(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	SetBeauty();
+}
+
+
+void CAgoraBeautyDlg::OnNMCustomdrawSliderStrength(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	SetColorful();
+}
+
+
+void CAgoraBeautyDlg::OnNMCustomdrawSliderSkinProtect(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	SetColorful();
+}
+
+
+void CAgoraBeautyDlg::OnBnClickedCheckEnhance()
+{
+	m_sldStrength.EnableWindow(m_chkEnhance.GetCheck() != 0);
+	m_sldSkin.EnableWindow(m_chkEnhance.GetCheck() != 0);
+
+	SetColorful();
+}
+
+
+void CAgoraBeautyDlg::OnBnClickedCheckVideoDenoise()
+{
+	VideoDenoiserOptions options;
+	m_rtcEngine->setVideoDenoiserOptions(m_chkVideoDenoise.GetCheck() != 0,options);
+}
+
+
+void CAgoraBeautyDlg::OnSelchangeComboBeauteLighteningContrastLevel()
+{
+	SetBeauty();
+}

windows/APIExample/APIExample/Advanced/Beauty/CAgoraBeautyDlg.h

@@ -115,6 +115,8 @@ class CAgoraBeautyDlg : public CDialogEx
 	CBeautyEventHandler m_eventHandler;
 
 protected:
+	void SetBeauty();
+	void SetColorful();
 	virtual void DoDataExchange(CDataExchange* pDX);
 	LRESULT OnEIDJoinChannelSuccess(WPARAM wParam, LPARAM lParam);
 	LRESULT OnEIDLeaveChannel(WPARAM wParam, LPARAM lParam);
@@ -129,11 +131,9 @@ class CAgoraBeautyDlg : public CDialogEx
 	CButton m_chkBeauty;
 	CButton m_btnJoinChannel;
 	CComboBox m_cmbBeautyLevel;
-	CEdit m_edtLightLevel;
+	
 	CStatic m_staRedness;
 	CStatic m_staSoomthness;
-	CEdit m_edtReadness;
-	CEdit m_edtSmoothness;
 	CStatic m_staVideoArea;
 	CListBox m_lstInfo;
 	CStatic m_staLightContrast;
@@ -146,6 +146,23 @@ class CAgoraBeautyDlg : public CDialogEx
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	CStatic m_staDetail;
 	afx_msg void OnSelchangeListInfoBroadcasting();
+
+	CSliderCtrl m_sldStrength;
+	CStatic m_staSkin;
+	CSliderCtrl m_sldSkin;
+	CButton m_chkVideoDenoise;
+	CButton m_chkEnhance;
+	CSliderCtrl m_sdlLightening;
+	CSliderCtrl m_sldRedness;
+	CSliderCtrl m_sldSmoothness;
+	afx_msg void OnNMCustomdrawSliderRedness(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMCustomdrawSliderLightening(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMCustomdrawSliderSmoothness(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMCustomdrawSliderStrength(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnNMCustomdrawSliderSkinProtect(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnBnClickedCheckEnhance();
+	afx_msg void OnBnClickedCheckVideoDenoise();
+	afx_msg void OnSelchangeComboBeauteLighteningContrastLevel();
 };