Merge pull request #128 from AgoraIO/dev/win-mediaio

csd-22934

Author: xia ning

windows/APIExample/APIExample/APIExample.rc

@@ -381,14 +381,18 @@ 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
+    LTEXT           "Channel Name",IDC_STATIC_CHANNELNAME,11,328,52,8
     EDITTEXT        IDC_EDIT_CHANNELNAME,71,326,218,13,ES_AUTOHSCROLL
     PUSHBUTTON      "JoinChannel",IDC_BUTTON_JOINCHANNEL,307,326,50,14
-    LTEXT           "Caputre Video",IDC_STATIC_CAPTUREDEVICE,12,353,48,8
-    PUSHBUTTON      "Start Capture",IDC_BUTTON_START_CAPUTRE,384,352,50,14
-    COMBOBOX        IDC_COMBO_CAPTURE_VIDEO_DEVICE,71,353,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "External Camera",IDC_STATIC_CAPTUREDEVICE,11,345,52,8
+    COMBOBOX        IDC_COMBO_CAPTURE_VIDEO_DEVICE,71,345,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "",IDC_STATIC_DETAIL,442,325,181,58
-    COMBOBOX        IDC_COMBO_CAPTURE_VIDEO_TYPE,225,353,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO_CAPTURE_VIDEO_TYPE,225,345,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "SDK Camera",IDC_STATIC_SDKCAMERA,11,363,52,8
+    COMBOBOX        IDC_COMBO_SDKCAMERA,71,359,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_COMBO_SDK_RESOLUTION,226,359,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Capture Type",IDC_STATIC_CAPTURE_TYPE,11,380,52,8
+    COMBOBOX        IDC_CMB_MEDIO_CAPTURETYPE,71,376,149,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_DIALOG_AUDIO_EFFECT DIALOGEX 0, 0, 632, 400

windows/APIExample/APIExample/APIExample.vcxproj

@@ -114,7 +114,8 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
+      <Command>copy Advanced\MediaIOCustomVideoCaptrue\screen.yuv $(SolutionDir)$(Configuration)
+if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
 if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
 if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
 if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\AgoraMediaPlayer.dll $(SolutionDir)$(Configuration))</Command>
@@ -195,7 +196,8 @@ if exist en.ini (copy en.ini $(SolutionDir)$(Platform)\$(Configuration))
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <PostBuildEvent>
-      <Command>if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
+      <Command>copy Advanced\MediaIOCustomVideoCaptrue\screen.yuv $(SolutionDir)$(Configuration)
+if exist $(SolutionDir)libs (copy $(SolutionDir)libs\x86\*.dll $(SolutionDir)$(Configuration))
 if exist zh-cn.ini (copy zh-cn.ini $(SolutionDir)$(Configuration))
 if exist en.ini (copy en.ini $(SolutionDir)$(Configuration))
 if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\AgoraMediaPlayer.dll $(SolutionDir)$(Configuration))</Command>