From 5ed50d3a5f5725c7ff145399a3bd2aeb6df8af35 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sat, 11 Nov 2023 03:26:15 +0100 Subject: [PATCH] android: added droidcam and changed webcam the droidcam entry was created and linked to various entries. the webcams was moved out of linux due to its general character. the links to the webcams entry were updated and more were added where useful. --- wiki/android.md | 6 ++++++ wiki/android/droidcam.md | 34 ++++++++++++++++++++++++++++++ wiki/android/gadgetbridge.md | 4 ++-- wiki/games/magic:_the_gathering.md | 20 ++++++++++++++++-- wiki/linux/v4l2.md | 3 ++- wiki/obs.md | 3 +-- wiki/video.md | 5 +++++ wiki/{linux => }/webcams.md | 13 ++++++++++-- 8 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 wiki/android/droidcam.md rename wiki/{linux => }/webcams.md (54%) diff --git a/wiki/android.md b/wiki/android.md index fbe0315..6246821 100644 --- a/wiki/android.md +++ b/wiki/android.md @@ -3,3 +3,9 @@ [Android](https://www.android.com/) is a mobile operating system based on a modified [Linux](/wiki/linux.md) kernel. It is designed primarily for mobile devices with touch screens like tablets or smart phones. + +## App Store + +The most used app store of android is the [Google Play Store](https://play.google.com/). +A free and open-source alternative to it is [F-Droid](/wiki/android/f-droid.md) which only features +open-source software. diff --git a/wiki/android/droidcam.md b/wiki/android/droidcam.md new file mode 100644 index 0000000..017f08b --- /dev/null +++ b/wiki/android/droidcam.md @@ -0,0 +1,34 @@ +# DroidCam + +[DroidCam](https://www.dev47apps.com/) is an App developed and published +by Dev47Apps for [Android](/wiki/android.md) systems. +It enables a [smartphone](/wiki/smart_devices.md) to be used as [webcam](/wiki/webcams.md). + +## Setup + +DroidCam needs to be set up on the phone aswell as on the computer to be used. + +On [Android](/wiki/android.md) Gadgetbridge is available on the +[Google Play Store](/wiki/android.md#app-store) in a package called +[DroidCam Webcam](https://play.google.com/store/apps/details?id=com.dev47apps.droidcam). + +On the computer setup files for both [Linux](/wiki/linux.md) and [Windows](/wiki/windows.md) can be +found on the [official Dev47Apps](https://www.dev47apps.com/). +Alternatively most [Linux systems](/wiki/linux/package_manager.md) feature a package named +`droidcam`. + +## Usage + +To initiate a connection between the [smartphone](/wiki/smart_devices.md) and the computer first +start the app on the smartphone. +Make sure to be connected to the same W-LAN as the computer or alternatively connect them with an +USB-cable. +After starting the application an IP and a port will be displayed. +These have to be pasted into the form that is shown on the computer after starting the corresponding +program. +After pressing `Connect` the link will be established. +The [video feed](/wiki/webcams.md) can then be used in other programs such as Discord or +[Matrix](/wiki/matrix.md). +Additionally it can be piped into [OBS](/wiki/obs.md) to edit it more or create a scene. +Despite the option the separate app [DroidCam OBS](https://www.dev47apps.com/obs/) is not +necessarily needed. diff --git a/wiki/android/gadgetbridge.md b/wiki/android/gadgetbridge.md index b585c0f..987aec4 100644 --- a/wiki/android/gadgetbridge.md +++ b/wiki/android/gadgetbridge.md @@ -8,8 +8,8 @@ It is a cloudless replacement for proprietary software for ## Setup -To install F-Droid simply download and install the -[package](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/). +Gadgetbridge is available on [F-Droid](/wiki/android/f-droid.md) in a package called +[gadgetbridge](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/). ## Usage diff --git a/wiki/games/magic:_the_gathering.md b/wiki/games/magic:_the_gathering.md index febc994..03fa95b 100644 --- a/wiki/games/magic:_the_gathering.md +++ b/wiki/games/magic:_the_gathering.md @@ -2,8 +2,8 @@ [Magic: The Gathering](https://magic.wizards.com) - often shortened to MTG or Magic - is a tabletop collectible card game. -There is an online version called [Magic: The Gathering Arena](https://magic.wizards.com/mtgarena) - -or MTGA for short - that has the same rules as the tabletop variant. +MTG is published by [Wizards of the Coast](https://company.wizards.com) - which are commonly +reffered to as Wizards. ## Resources @@ -20,3 +20,19 @@ The following list provides a select few of them. It is free and open-source. Its source code can be looked at on their [GitHub Page](https://github.com/nicho92/MtgDesktopCompanion). + +## Playing Online + +There is a fully digital and online version of MTG called +[Magic: The Gathering Arena](https://magic.wizards.com/mtgarena) - or MTGA for short - that has the +same rules as the tabletop variant. + +It is also possible to remotely play with tabletop cards. +This is most easily done on [Spelltable](https://spelltable.wizards.com/) which is an official +website by Wizards. +For playing Spelltable a [webcam](/wiki/webcams.md) is needed to be set up with a bird's eye view +over the playing field. +An alternative to a normal webcam is [DroidCam](/wiki/android/droidcam.md) for +[Android](/wiki/android.md) which is supported by the website itself. + +Both Spelltable and MTGA use the same login credentials. diff --git a/wiki/linux/v4l2.md b/wiki/linux/v4l2.md index e547287..412839f 100644 --- a/wiki/linux/v4l2.md +++ b/wiki/linux/v4l2.md @@ -2,7 +2,8 @@ V4L2 is the second version of [Video4Linux](https://www.linuxtv.org/wiki/index.php/Main_Page). -It functions as a driver for webcams and tv tuner cards and other devices. +It functions as a driver for [webcams](/wiki/webcams.md) and [tv tuner cards](/wiki/video.md) and +other devices. ## v4l2loopback diff --git a/wiki/obs.md b/wiki/obs.md index 2d56654..dfe8975 100644 --- a/wiki/obs.md +++ b/wiki/obs.md @@ -2,8 +2,7 @@ [Open Broadcaster Software](https://obsproject.com) - short OBS - is a free and open source software for video recording and live streaming. -Additionally see the -[the webcams entry](/wiki/linux/webcams.md#configure-the-webcam) if on Linux. +For webcams and their configuration see [the webcams entry](/wiki/webcams.md#configure-the-webcam). ## Plugins diff --git a/wiki/video.md b/wiki/video.md index 0e42496..e9c539c 100644 --- a/wiki/video.md +++ b/wiki/video.md @@ -1,5 +1,10 @@ # Video +Video is an electronic medium of visual media. +This entry will mostly be focused on movies, tv shows an other media such as +[YouTube](/wiki/youtube.md) aswell as its metadata. +For webcams navigate to the [webcams entry](/wiki/webcams.md). + It is nice to have some movies, tv shows or other videos saved on your system. There are multiple different approaches on how to get it working depending on your needs. diff --git a/wiki/linux/webcams.md b/wiki/webcams.md similarity index 54% rename from wiki/linux/webcams.md rename to wiki/webcams.md index e25900e..bf684d5 100644 --- a/wiki/linux/webcams.md +++ b/wiki/webcams.md @@ -10,11 +10,20 @@ Linux operating system. The editing of a video stream provided by a webcam can be achieved by using [OBS](/wiki/obs.md) together with the [OBS Virtual Camera plugin](/wiki/obs.md#virtual-camera). +This works on [Windows](/wiki/windows.md) aswell as [Linux](/wiki/linux.md) and can be used for any +webcam available. ## Configure the Webcam -A webcam can be configured with [guvcview](https://guvcview.sourceforge.net/). +On Linux a webcam can be configured with [guvcview](https://guvcview.sourceforge.net/). This program provides a simple interface for capturing and viewing video from a -[v4l2](./v4l2.md) device and is thus dependent on v4l2. +[v4l2](/wiki/linux/v4l2.md) device and is thus dependent on v4l2. Additionally guvcview provides an interface to configure various webcam settins and enable a few effects on top of it. + +## Using a Smartphone as Webcam + +A [smartphone](/wiki/smart_devices.md) and its camera aswell as flashlight can be used as a simple +replacement for a webcam. +For [Android](/wiki/android.md) smartphones this can be easily achieved by using +[DroidCam](/wiki/android/droidcam.md).