Merge pull request #73 from CvH/vaapi-support

Vaapi support
add vaapi to readme
2018-02-18 21:12:07 +00:00 · 2018-02-18 21:23:56 +01:00 · 2018-02-18 21:23:54 +01:00 · 2018-02-18 21:23:53 +01:00 · 2018-02-18 21:23:51 +01:00 · 2018-02-18 21:23:50 +01:00
2 changed files with 26 additions and 12 deletions
--- a/32
+++ b/32
@@ -32,17 +32,18 @@ RUN \
 	git \
 	libgcrypt-dev \
 	libhdhomerun-dev \
-	libressl-dev \
 	libtool \
+	libva-dev \
 	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	make \
-	mercurial \
+	openssl-dev \
 	opus-dev \
 	patch \
 	pcre2-dev \
 	perl-dev \
+	pngquant \
 	pkgconf \
 	sdl-dev \
 	uriparser-dev \
@@ -64,12 +65,13 @@ RUN \
 	libcrypto1.0 \
 	libcurl	\
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
+	libva \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -137,26 +139,36 @@ RUN \
 echo "**** install perl modules for xmltv ****" && \
 curl -L http://cpanmin.us | perl - App::cpanminus && \
 cpanm --installdeps /tmp/patches && \
- echo "**** build dvb-apps ****" && \
- hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
- cd /tmp/dvb-apps && \
- make -C lib && \
- make -C lib install && \
 echo "**** build tvheadend ****" && \
 git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
 cd /tmp/tvheadend && \
 ./configure \
+	`#Encoding` \
 	--disable-ffmpeg_static \
-	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
-	--disable-libmfx_static \
 	--disable-libtheora_static \
+	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
+	--disable-libfdkaac \
+	--enable-libopus \
+	--enable-libvorbis \
+	--enable-libvpx \
+	--enable-libx264 \
+	--enable-libx265 \
+	\
+	`#Options` \
+	--disable-avahi \
+	--disable-dbus_1 \
+	--disable-bintray_cache \
+	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
--- a/README.md
+++ b/README.md
@@ -33,11 +33,12 @@ docker create \
  -e RUN_OPTS=<parameter> \
  -p 9981:9981 \
  -p 9982:9982 \
-  --device=/dev/dvb
+  --device=/dev/dvb \
+  --device=/dev/dri
  linuxserver/tvheadend
 ```
 The --device=/dev/dvb is only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out.
-
+The --device=/dev/dri is only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi).

 You can choose between ,using tags, latest (default, and no tag required or a specific release branch of tvheadend.

@@ -68,6 +69,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
 * `-e PUID` for UserID - see below for explanation
 * `-e RUN_OPTS` additional runtime parameters - see below for explanation
 * `--device=/dev/dvb` - for passing through DVB-cards
+* `--device=/dev/dri` - for passing through GPU
 * `--net=host` - for IPTV, SAT>IP and HDHomeRun
 * `-e TZ` - for timezone information *eg Europe/London, etc*
Author	SHA1	Message	Date
sparklyballs	0321b4d01a	Merge pull request #73 from CvH/vaapi-support Vaapi support	2018-02-18 21:12:07 +00:00
cvh	c0fe17d93e	add vaapi to readme	2018-02-18 21:23:56 +01:00
cvh	b1a069a702	remove dvb-apps dependency - Tvh ships now an own implementation	2018-02-18 21:23:54 +01:00
cvh	a68b5c32a4	add some build options - disable-avahi to prevent error at buildlog - disable-dbus_1 to prevent error at buildlog - disable-bintray_cache to prevent known problems with that cache - enable-trace to allow the usage of advanced debug functions (this is a devel branch)	2018-02-18 21:23:53 +01:00
cvh	880d45e6fe	add png compression - all pics at the help get compressed without viewable quality loss	2018-02-18 21:23:51 +01:00
cvh	a6a8e1b6d4	add vaapi support	2018-02-18 21:23:50 +01:00