diff --git a/README.md b/README.md index 9b79cb6..f81c32f 100644 --- a/README.md +++ b/README.md @@ -178,19 +178,34 @@ Windows 10 -## Setup tutorial - - - -Windows 10 x64 - -Linux build info - ## Documentation -User FAQ + + +Windows + -Developer FAQ +Main setup + +- additional setup for streaming + +- additional setup for video calls + +Using Android phone camera + + + +Linux + +Build info + + +Frequently asked questions + + +for User + +for Developer diff --git a/doc/windows/DroidCam_0.jpg b/doc/windows/DroidCam_0.jpg new file mode 100644 index 0000000..62eea68 Binary files /dev/null and b/doc/windows/DroidCam_0.jpg differ diff --git a/doc/windows/DroidCam_1.jpg b/doc/windows/DroidCam_1.jpg new file mode 100644 index 0000000..f60e483 Binary files /dev/null and b/doc/windows/DroidCam_1.jpg differ diff --git a/doc/windows/DroidCam_2.jpg b/doc/windows/DroidCam_2.jpg new file mode 100644 index 0000000..8ccc721 Binary files /dev/null and b/doc/windows/DroidCam_2.jpg differ diff --git a/doc/windows/DroidCam_3.jpg b/doc/windows/DroidCam_3.jpg new file mode 100644 index 0000000..3110331 Binary files /dev/null and b/doc/windows/DroidCam_3.jpg differ diff --git a/doc/windows/DroidCam_4.jpg b/doc/windows/DroidCam_4.jpg new file mode 100644 index 0000000..bab2c63 Binary files /dev/null and b/doc/windows/DroidCam_4.jpg differ diff --git a/doc/windows/DroidCam_5.jpg b/doc/windows/DroidCam_5.jpg new file mode 100644 index 0000000..0067485 Binary files /dev/null and b/doc/windows/DroidCam_5.jpg differ diff --git a/doc/setup_tutorial_windows/OBS_start_virtual_camera.jpg b/doc/windows/OBS_start_virtual_camera.jpg similarity index 100% rename from doc/setup_tutorial_windows/OBS_start_virtual_camera.jpg rename to doc/windows/OBS_start_virtual_camera.jpg diff --git a/doc/setup_tutorial_windows/VBCable_install_button.jpg b/doc/windows/VBCable_install_button.jpg similarity index 100% rename from doc/setup_tutorial_windows/VBCable_install_button.jpg rename to doc/windows/VBCable_install_button.jpg diff --git a/doc/setup_tutorial_windows/VBCable_setup_x64.jpg b/doc/windows/VBCable_setup_x64.jpg similarity index 100% rename from doc/setup_tutorial_windows/VBCable_setup_x64.jpg rename to doc/windows/VBCable_setup_x64.jpg diff --git a/doc/setup_tutorial_windows/add_audio_input_capture.jpg b/doc/windows/add_audio_input_capture.jpg similarity index 100% rename from doc/setup_tutorial_windows/add_audio_input_capture.jpg rename to doc/windows/add_audio_input_capture.jpg diff --git a/doc/setup_tutorial_windows/add_window_capture.jpg b/doc/windows/add_window_capture.jpg similarity index 100% rename from doc/setup_tutorial_windows/add_window_capture.jpg rename to doc/windows/add_window_capture.jpg diff --git a/doc/setup_tutorial_windows/advanced_audio_properties.jpg b/doc/windows/advanced_audio_properties.jpg similarity index 100% rename from doc/setup_tutorial_windows/advanced_audio_properties.jpg rename to doc/windows/advanced_audio_properties.jpg diff --git a/doc/setup_tutorial_windows/audiorepeater_buffer_ms.jpg b/doc/windows/audiorepeater_buffer_ms.jpg similarity index 100% rename from doc/setup_tutorial_windows/audiorepeater_buffer_ms.jpg rename to doc/windows/audiorepeater_buffer_ms.jpg diff --git a/doc/setup_tutorial_windows/audiorepeater_select_devices.jpg b/doc/windows/audiorepeater_select_devices.jpg similarity index 100% rename from doc/setup_tutorial_windows/audiorepeater_select_devices.jpg rename to doc/windows/audiorepeater_select_devices.jpg diff --git a/doc/setup_tutorial_windows/audiorepeater_start.jpg b/doc/windows/audiorepeater_start.jpg similarity index 100% rename from doc/setup_tutorial_windows/audiorepeater_start.jpg rename to doc/windows/audiorepeater_start.jpg diff --git a/doc/setup_tutorial_windows/choose_dflive_output_window.jpg b/doc/windows/choose_dflive_output_window.jpg similarity index 100% rename from doc/setup_tutorial_windows/choose_dflive_output_window.jpg rename to doc/windows/choose_dflive_output_window.jpg diff --git a/doc/setup_tutorial_windows/choose_face_detector.jpg b/doc/windows/choose_face_detector.jpg similarity index 100% rename from doc/setup_tutorial_windows/choose_face_detector.jpg rename to doc/windows/choose_face_detector.jpg diff --git a/doc/setup_tutorial_windows/choose_face_marker.jpg b/doc/windows/choose_face_marker.jpg similarity index 100% rename from doc/setup_tutorial_windows/choose_face_marker.jpg rename to doc/windows/choose_face_marker.jpg diff --git a/doc/setup_tutorial_windows/choose_face_swapper.jpg b/doc/windows/choose_face_swapper.jpg similarity index 100% rename from doc/setup_tutorial_windows/choose_face_swapper.jpg rename to doc/windows/choose_face_swapper.jpg diff --git a/doc/setup_tutorial_windows/deepfacelive_window.jpg b/doc/windows/deepfacelive_window.jpg similarity index 100% rename from doc/setup_tutorial_windows/deepfacelive_window.jpg rename to doc/windows/deepfacelive_window.jpg diff --git a/doc/setup_tutorial_windows/dflive_output.jpg b/doc/windows/dflive_output.jpg similarity index 100% rename from doc/setup_tutorial_windows/dflive_output.jpg rename to doc/windows/dflive_output.jpg diff --git a/doc/setup_tutorial_windows/discord_video_settings_virtual_camera.jpg b/doc/windows/discord_video_settings_virtual_camera.jpg similarity index 100% rename from doc/setup_tutorial_windows/discord_video_settings_virtual_camera.jpg rename to doc/windows/discord_video_settings_virtual_camera.jpg diff --git a/doc/setup_tutorial_windows/discord_voice_settings_input_device.jpg b/doc/windows/discord_voice_settings_input_device.jpg similarity index 100% rename from doc/setup_tutorial_windows/discord_voice_settings_input_device.jpg rename to doc/windows/discord_voice_settings_input_device.jpg diff --git a/doc/setup_tutorial_windows/download_build.jpg b/doc/windows/download_build.jpg similarity index 100% rename from doc/setup_tutorial_windows/download_build.jpg rename to doc/windows/download_build.jpg diff --git a/doc/setup_tutorial_windows/final_frame.jpg b/doc/windows/final_frame.jpg similarity index 100% rename from doc/setup_tutorial_windows/final_frame.jpg rename to doc/windows/final_frame.jpg diff --git a/doc/setup_tutorial_windows/setup_for_streaming.md b/doc/windows/for_streaming.md similarity index 100% rename from doc/setup_tutorial_windows/setup_for_streaming.md rename to doc/windows/for_streaming.md diff --git a/doc/setup_tutorial_windows/setup_for_video_calls.md b/doc/windows/for_video_calls.md similarity index 100% rename from doc/setup_tutorial_windows/setup_for_video_calls.md rename to doc/windows/for_video_calls.md diff --git a/doc/setup_tutorial_windows/index.md b/doc/windows/general_setup.md similarity index 92% rename from doc/setup_tutorial_windows/index.md rename to doc/windows/general_setup.md index ca77049..42deb83 100644 --- a/doc/setup_tutorial_windows/index.md +++ b/doc/windows/general_setup.md @@ -101,15 +101,6 @@ - - - -continue setup for streaming - -or - -continue setup for video calls - diff --git a/doc/setup_tutorial_windows/media_source.png b/doc/windows/media_source.png similarity index 100% rename from doc/setup_tutorial_windows/media_source.png rename to doc/windows/media_source.png diff --git a/doc/setup_tutorial_windows/media_source_config.png b/doc/windows/media_source_config.png similarity index 100% rename from doc/setup_tutorial_windows/media_source_config.png rename to doc/windows/media_source_config.png diff --git a/doc/setup_tutorial_windows/media_source_stream_output.png b/doc/windows/media_source_stream_output.png similarity index 100% rename from doc/setup_tutorial_windows/media_source_stream_output.png rename to doc/windows/media_source_stream_output.png diff --git a/doc/setup_tutorial_windows/run_and_unpack.jpg b/doc/windows/run_and_unpack.jpg similarity index 100% rename from doc/setup_tutorial_windows/run_and_unpack.jpg rename to doc/windows/run_and_unpack.jpg diff --git a/doc/setup_tutorial_windows/run_dfl_bat.jpg b/doc/windows/run_dfl_bat.jpg similarity index 100% rename from doc/setup_tutorial_windows/run_dfl_bat.jpg rename to doc/windows/run_dfl_bat.jpg diff --git a/doc/setup_tutorial_windows/run_obs_studio.jpg b/doc/windows/run_obs_studio.jpg similarity index 100% rename from doc/setup_tutorial_windows/run_obs_studio.jpg rename to doc/windows/run_obs_studio.jpg diff --git a/doc/setup_tutorial_windows/select_camera_source.jpg b/doc/windows/select_camera_source.jpg similarity index 100% rename from doc/setup_tutorial_windows/select_camera_source.jpg rename to doc/windows/select_camera_source.jpg diff --git a/doc/setup_tutorial_windows/select_microphone_device.jpg b/doc/windows/select_microphone_device.jpg similarity index 100% rename from doc/setup_tutorial_windows/select_microphone_device.jpg rename to doc/windows/select_microphone_device.jpg diff --git a/doc/setup_tutorial_windows/select_video_file.jpg b/doc/windows/select_video_file.jpg similarity index 100% rename from doc/setup_tutorial_windows/select_video_file.jpg rename to doc/windows/select_video_file.jpg diff --git a/doc/setup_tutorial_windows/stream_output.jpg b/doc/windows/stream_output.jpg similarity index 100% rename from doc/setup_tutorial_windows/stream_output.jpg rename to doc/windows/stream_output.jpg diff --git a/doc/setup_tutorial_windows/sync_offset.jpg b/doc/windows/sync_offset.jpg similarity index 100% rename from doc/setup_tutorial_windows/sync_offset.jpg rename to doc/windows/sync_offset.jpg diff --git a/doc/windows/using_android_phone_camera.md b/doc/windows/using_android_phone_camera.md new file mode 100644 index 0000000..0ca798f --- /dev/null +++ b/doc/windows/using_android_phone_camera.md @@ -0,0 +1,40 @@ + + + +
+ +# Using Android phone camera + +### Download and install **_DroidCam_** + +Phone and PC should be in the same network. + +Connect Phone to network through WiFi + +### Run Phone App. + + + +now we can see phone's IP and port. + + + +### Run PC app + + + +Check whether the data coincide with the data on the phone, if the figures differ, then bring them to the values that are on the phone screen, then press "Start" + + + +If you have done everything correctly, the video from the phone camera should appear in the DroidCam window + + + +### in **_CameraSource_** section +### in **_Driver_** select **_DirectShow_** +### in **_Device index_** select **_DroidCamSource_** + + + +
\ No newline at end of file diff --git a/doc/setup_tutorial_windows/video_card_icon.png b/doc/windows/video_card_icon.png similarity index 100% rename from doc/setup_tutorial_windows/video_card_icon.png rename to doc/windows/video_card_icon.png diff --git a/doc/setup_tutorial_windows/virtual_memory.jpg b/doc/windows/virtual_memory.jpg similarity index 100% rename from doc/setup_tutorial_windows/virtual_memory.jpg rename to doc/windows/virtual_memory.jpg