From e667c59f3c8b7e0e5e4589cc3b590973164f1361 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 11 Mar 2020 20:12:08 +0000 Subject: [PATCH] Bot Updating Templated Files --- README.md | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 86ad9a5..a446fd3 100644 --- a/README.md +++ b/README.md @@ -78,13 +78,15 @@ docker create \ -e UMASK_SET=<022> `#optional` \ -p 8096:8096 \ -p 8920:8920 `#optional` \ - -v :/config \ - -v :/data/tvshows \ - -v :/data/movies \ - -v :/transcode `#optional` \ + -v /path/to/library:/config \ + -v path/to/tvseries:/data/tvshows \ + -v /path/to/movies:/data/movies \ -v /opt/vc/lib:/opt/vc/lib `#optional` \ --device /dev/dri:/dev/dri `#optional` \ --device /dev/vchiq:/dev/vchiq `#optional` \ + --device /dev/video10:/dev/video10 `#optional` \ + --device /dev/video11:/dev/video11 `#optional` \ + --device /dev/video12:/dev/video12 `#optional` \ --restart unless-stopped \ linuxserver/jellyfin ``` @@ -107,10 +109,9 @@ services: - TZ=Europe/London - UMASK_SET=<022> #optional volumes: - - :/config - - :/data/tvshows - - :/data/movies - - :/transcode #optional + - /path/to/library:/config + - path/to/tvseries:/data/tvshows + - /path/to/movies:/data/movies - /opt/vc/lib:/opt/vc/lib #optional ports: - 8096:8096 @@ -118,6 +119,9 @@ services: devices: - /dev/dri:/dev/dri #optional - /dev/vchiq:/dev/vchiq #optional + - /dev/video10:/dev/video10 #optional + - /dev/video11:/dev/video11 #optional + - /dev/video12:/dev/video12 #optional restart: unless-stopped ``` @@ -128,7 +132,7 @@ Container images are configured using parameters passed at runtime (such as thos | Parameter | Function | | :----: | --- | | `-p 8096` | Http webUI. | -| `-p 8920` | Https webUI (you need to setup your own certificate). | +| `-p 8920` | Https webUI (you need to set up your own certificate). | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | @@ -136,10 +140,12 @@ Container images are configured using parameters passed at runtime (such as thos | `-v /config` | Jellyfin data storage location. *This can grow very large, 50gb+ is likely for a large collection.* | | `-v /data/tvshows` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. | | `-v /data/movies` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. | -| `-v /transcode` | Path for transcoding folder, *optional*. | | `-v /opt/vc/lib` | Path for Raspberry Pi OpenMAX libs *optional*. | | `--device /dev/dri` | Only needed if you want to use your Intel GPU for hardware accelerated video encoding (vaapi). | | `--device /dev/vchiq` | Only needed if you want to use your Raspberry Pi OpenMax video encoding (Bellagio). | +| `--device /dev/video10` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | +| `--device /dev/video11` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | +| `--device /dev/video12` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | ## Environment variables from files (Docker secrets) @@ -172,7 +178,7 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel Webui can be found at `http://:8096` -More information can be found in their official documentation [here](https://github.com/MediaBrowser/Wiki/wiki) . +More information can be found in their official documentation [here](https://jellyfin.org/docs/general/quick-start.html) . ## Hardware Acceleration @@ -201,6 +207,15 @@ Hardware acceleration users for Raspberry Pi OpenMAX will need to mount their /d -v /opt/vc/lib:/opt/vc/lib ``` +### V4L2 (Raspberry Pi) + +Hardware acceleration users for Raspberry Pi V4L2 will need to mount their /dev/video1X devices inside of the container by passing the following options when running or creating the container: +``` +--device=/dev/video10:/dev/video10 +--device=/dev/video11:/dev/video11 +--device=/dev/video12:/dev/video12 +``` + ## Support Info @@ -267,6 +282,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.03.20:** - Add v4l2 support on Raspberry Pi; remove optional transcode mapping (location is selected in the gui, defaults to path under `/config`). * **30.01.20:** - Add nightly tag. * **09.01.20:** - Add Pi OpenMax support. * **02.10.19:** - Improve permission fixing for render & dvb devices.