From 2c1dbf73ff99a3c36642af296c152591ede07901 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 11 Apr 2020 21:58:40 +0000 Subject: [PATCH] Bot Updating Documentation --- images/docker-jellyfin.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/images/docker-jellyfin.md b/images/docker-jellyfin.md index 437629f7c5..a0d6d083fc 100644 --- a/images/docker-jellyfin.md +++ b/images/docker-jellyfin.md @@ -56,6 +56,7 @@ docker create \ -v /path/to/movies:/data/movies \ -v /opt/vc/lib:/opt/vc/lib `#optional` \ --device /dev/dri:/dev/dri `#optional` \ + --device /dev/vc-mem:/dev/vc-mem `#optional` \ --device /dev/vchiq:/dev/vchiq `#optional` \ --device /dev/video10:/dev/video10 `#optional` \ --device /dev/video11:/dev/video11 `#optional` \ @@ -71,7 +72,7 @@ Compatible with docker-compose v2 schemas. ```yaml --- -version: "2" +version: "2.1" services: jellyfin: image: linuxserver/jellyfin @@ -93,6 +94,7 @@ services: - 8920:8920 #optional devices: - /dev/dri:/dev/dri #optional + - /dev/vc-mem:/dev/vc-mem #optional - /dev/vchiq:/dev/vchiq #optional - /dev/video10:/dev/video10 #optional - /dev/video11:/dev/video11 #optional @@ -134,12 +136,14 @@ Docker images are configured using parameters passed at runtime (such as those a | Parameter | Function | | :-----: | --- | | `/dev/dri` | Only needed if you want to use your Intel GPU for hardware accelerated video encoding (vaapi). | +| `/dev/vc-mem` | Only needed if you want to use your Raspberry Pi MMAL video decoding (Enabled as OpenMax H264 decode in gui settings). | | `/dev/vchiq` | Only needed if you want to use your Raspberry Pi OpenMax video encoding. | | `/dev/video10` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | | `/dev/video11` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | | `/dev/video12` | Only needed if you want to use your Raspberry Pi V4L2 video encoding. | + ## User / Group Identifiers When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. @@ -165,7 +169,7 @@ More information can be found in their official documentation [here](https://jel Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container: -```--device=/dev/dri:/dev/dri``` +`--device=/dev/dri:/dev/dri` We will automatically ensure the abc user inside of the container has the proper permissions to access this device. @@ -179,16 +183,17 @@ We automatically add the necessary environment variable that will utilise all th ### OpenMAX (Raspberry Pi) -Hardware acceleration users for Raspberry Pi OpenMAX will need to mount their /dev/vchiq video device inside of the container and their system OpenMax libs by passing the following options when running or creating the container: +Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vc-mem` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container: ``` +--device=/dev/vc-mem:/dev/vc-mem --device=/dev/vchiq:/dev/vchiq -v /opt/vc/lib:/opt/vc/lib ``` ### V4L2 (Raspberry Pi) -Hardware acceleration users for Raspberry Pi V4L2 will need to mount their /dev/videoX video devices inside of the container by passing the following options when running or creating the container: +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 @@ -197,6 +202,11 @@ Hardware acceleration users for Raspberry Pi V4L2 will need to mount their /dev/ ``` +## Docker Mods +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27jellyfin%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=jellyfin "view available mods for this container.") + +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. + ## Support Info @@ -211,6 +221,7 @@ Hardware acceleration users for Raspberry Pi V4L2 will need to mount their /dev/ ## Versions +* **11.04.20:** - Enable hw decode (mmal) on Raspberry Pi, update readme instructions, add donation info, create missing default transcodes folder. * **11.03.20:** - Add Pi V4L2 support, 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.