mirror of
https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
synced 2023-10-10 17:16:51 +00:00
Compare commits
No commits in common. "master" and "0.5.1" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,7 +4,7 @@
|
|||||||
.*.swp
|
.*.swp
|
||||||
.gdb_history
|
.gdb_history
|
||||||
# work directory
|
# work directory
|
||||||
.chaos
|
chaos
|
||||||
# generated files
|
# generated files
|
||||||
.dependencies
|
.dependencies
|
||||||
libvdr-softhddevice.so*
|
libvdr-softhddevice.so*
|
||||||
|
|||||||
256
ChangeLog
256
ChangeLog
@ -1,259 +1,3 @@
|
|||||||
User johns
|
|
||||||
Date:
|
|
||||||
|
|
||||||
Preparations for new ffmpeg VDPAU API.
|
|
||||||
Added VDPAU multi decoder loop changes to VA-API code.
|
|
||||||
Reenabled VA-API auto detection.
|
|
||||||
Check and enforce USE_PIP is defined, for new code.
|
|
||||||
Fix comment spelling.
|
|
||||||
Disabled old code before removement.
|
|
||||||
Handle change of audio ac3 downmix direct.
|
|
||||||
Speedup queuing output surface, when decoder buffers are full.
|
|
||||||
Fix bug: info shows wrong decoded video surfaces.
|
|
||||||
Calculate queued output surfaces and show them in info message.
|
|
||||||
Add support for new API of vdr 2.3.1.
|
|
||||||
Fix bug: EnableDPMSatBlackScreen only available with USE_SCREENSAVER.
|
|
||||||
- H264_EOS_TRICKSPEED and USE_MPEG_COMPLETE enabled as default.
|
|
||||||
|
|
||||||
User master_red
|
|
||||||
Date: Mon Aug 10 15:29:33 CEST 2015
|
|
||||||
|
|
||||||
Configurable enable DPMS, while black screen is displayed.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Jun 30 10:12:09 CET 2015
|
|
||||||
|
|
||||||
Fix bug: wrong and crash, if vdr draws pixmaps outside OSD.
|
|
||||||
Fix bug: wrong version number check for av_frame_alloc(), ...
|
|
||||||
Workaround for ffmpeg 2.6 artifacts.
|
|
||||||
Fix bug: brightness and .. are calculated wrong.
|
|
||||||
Add automatic frame rate detection for older ffmpeg versions.
|
|
||||||
Fix bug: destroyed vdpau surfaces still used in queue.
|
|
||||||
Fix bug: need signed char, if compiler has unsigned chars.
|
|
||||||
Try smaller audio puffer, if default size fails.
|
|
||||||
Fix bug: center cut-out didn't use cut off pixels.
|
|
||||||
Fix bug #2058: support for Make.plgcfg.
|
|
||||||
Fix for compile with vdr 2.1.10, for older vdr versions.
|
|
||||||
|
|
||||||
User jinx
|
|
||||||
Date: Mon Feb 16 09:58:06 CET 2015
|
|
||||||
|
|
||||||
Enable toggle AC3 downmix.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Thu Feb 12 10:30:50 CET 2015
|
|
||||||
|
|
||||||
Compile with vdr 2.1.10.
|
|
||||||
Fix bug: AVCodecContext.framerate not supported.
|
|
||||||
Use video stream frame rate for A/V sync.
|
|
||||||
|
|
||||||
User Antti Seppälä
|
|
||||||
Date: Thu Oct 16 14:15:15 CEST 2014
|
|
||||||
|
|
||||||
Corrected black surface for va-api.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Thu Oct 16 14:05:17 CEST 2014
|
|
||||||
|
|
||||||
Newer va-api intel drivers support PutImage.
|
|
||||||
Use more portable fork for vfork.
|
|
||||||
Fix crash with VA-API vdpau backend.
|
|
||||||
|
|
||||||
User mini73
|
|
||||||
Date: Sat Oct 11 16:53:18 CEST 2014
|
|
||||||
|
|
||||||
Fix bug: random rubbish at the end of letter.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Sep 23 12:36:39 CEST 2014
|
|
||||||
|
|
||||||
Fix audio thread close race condition.
|
|
||||||
Support ffmpeg new AVFrame API in the audio codec.
|
|
||||||
Config for automatic AES parameters.
|
|
||||||
Use GCC built-in functions for atomic operations.
|
|
||||||
|
|
||||||
User master_red
|
|
||||||
Date: Wed Jun 4 14:44:32 CEST 2014
|
|
||||||
|
|
||||||
Support detach or suspend in plugin menu.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Fri May 30 10:18:20 CEST 2014
|
|
||||||
|
|
||||||
Fix "make clean-plugins".
|
|
||||||
Fix compile with newer libav.
|
|
||||||
Fix OSD bugs.
|
|
||||||
Add some VA-API VPP info outputs.
|
|
||||||
Remove build files for old unstable VDR.
|
|
||||||
|
|
||||||
User hd.brummy
|
|
||||||
Date: Thu Jan 30 10:40:49 CET 2014
|
|
||||||
|
|
||||||
Update gentoo ebuild.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Thu Jan 30 10:36:53 CET 2014
|
|
||||||
|
|
||||||
Fix spelling in arguments help.
|
|
||||||
Add Workaround for alsa blocking audio device.
|
|
||||||
Improves thread handling for audio flush and close.
|
|
||||||
|
|
||||||
User mini73
|
|
||||||
Date: Fri Jan 24 11:30:49 CET 2014
|
|
||||||
|
|
||||||
Fix bug: learing x11 remote keys fails.
|
|
||||||
Add support for umlauts in input fields.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Jan 14 14:59:44 CET 2014
|
|
||||||
|
|
||||||
Fix alternative OSD support with VDPAU bitmap surfaces.
|
|
||||||
Fix compile error with VDR 2.1.3.
|
|
||||||
Fix bug: memory leak.
|
|
||||||
PIP close clears the last used PIP channel.
|
|
||||||
Fix bug: -DOSD_DEBUG uses old (deleted) variable.
|
|
||||||
Fix bug: Option softhddevice.BlackPicture has no effect.
|
|
||||||
|
|
||||||
User Dr. Seltsam
|
|
||||||
Date: Tue Nov 5 16:46:34 CET 2013
|
|
||||||
|
|
||||||
Add support to configure and clear buffers on channel switch.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Oct 8 10:18:04 CET 2013
|
|
||||||
|
|
||||||
CLOCK_REALTIME -> CLOCK_MONOTONIC to allow time changes.
|
|
||||||
Add function VideoStreamOpen and always use VideoStreamClose.
|
|
||||||
Softer audio/video sync.
|
|
||||||
Add function GetStats to the video output module.
|
|
||||||
Add function ResetStart to the video output module.
|
|
||||||
Add function SetClosing to the video output module.
|
|
||||||
Generalize GetVaapiContext to GetHwAccelContext.
|
|
||||||
Add compile time configurable trickspeed packets dump.
|
|
||||||
Fix bug #1410: wrong spelled AC-3 and E-AC-3.
|
|
||||||
Add compile time selectable h264 trickspeed workaround.
|
|
||||||
Use ffmpeg new names AVCodecID, AV_CODEC_... .
|
|
||||||
Fix bug: video lagging behind after recording stop.
|
|
||||||
Reduce PES error messages.
|
|
||||||
Fix bug #1392: Wrong value for mixing LFE.
|
|
||||||
Fix bug: wrong grab size, introduced with AMD VDPAU.
|
|
||||||
Use VDR SPU decoder as default.
|
|
||||||
Fix bug: grab image negative quality isn't the default 100.
|
|
||||||
Support AMD VDPAU with surface size != requested size.
|
|
||||||
Add cache for auto-crop buffer.
|
|
||||||
Fix opengl and opengl threads bugs.
|
|
||||||
Initial opengl support with va-api only.
|
|
||||||
Fix "broken driver" message if empty ring buffer.
|
|
||||||
Enable seamless audio track change.
|
|
||||||
Fix bug #1302: Unsupported pixel format crash.
|
|
||||||
Fix the fix, when sillpicture is called in suspend mode.
|
|
||||||
Fix crash, when sillpicture is called in suspend mode.
|
|
||||||
Add workaround for zero width+height and ffmpeg >= 1.2.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Sun Mar 17 15:52:42 CET 2013
|
|
||||||
|
|
||||||
Release Version 0.6.0
|
|
||||||
Adds H264 only hardware decoder for still-pictures.
|
|
||||||
Enable optional VDR-SPU deocder support.
|
|
||||||
|
|
||||||
User anbr
|
|
||||||
Date: Sun Mar 17 15:49:46 CET 2013
|
|
||||||
|
|
||||||
Update german translation.
|
|
||||||
|
|
||||||
User cyril
|
|
||||||
Date: Wed Mar 6 17:05:10 CET 2013
|
|
||||||
|
|
||||||
Adds raise softhddevice video window support.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Wed Mar 6 10:30:27 CET 2013
|
|
||||||
|
|
||||||
Adds optional only complete mpeg packets support.
|
|
||||||
Fixes text of EAC-3 pass-through setup.
|
|
||||||
Try to start or connect to X11 server with -xx.
|
|
||||||
Try to use HBR (High Bit-Rate) for EAC3.
|
|
||||||
Improved pass-through (PCM+EAC3) support.
|
|
||||||
Support VDR 1.7.36 new build system.
|
|
||||||
Improves VDPAU display preemption handling.
|
|
||||||
Add modifiers to X11 remote key names (from Sibbi).
|
|
||||||
Add compatibility with >=ffmpeg 1.1.
|
|
||||||
Adds PIP (Picture-in-Picture) support.
|
|
||||||
Split mpeg packets in receiver thread.
|
|
||||||
|
|
||||||
User horchi
|
|
||||||
Date: Tue Jan 1 17:58:54 CET 2013
|
|
||||||
|
|
||||||
Adds VDR SeduAtmo Plugin support.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Jan 1 15:21:28 CET 2013
|
|
||||||
|
|
||||||
Support multiple streams with ScaleVideo.
|
|
||||||
Makes 4:3 and 16:9 display format configurable.
|
|
||||||
Don't use DVB display format.
|
|
||||||
|
|
||||||
User Zoolook
|
|
||||||
Date: Tue Jan 1 12:49:19 CET 2013
|
|
||||||
|
|
||||||
Add support for new vdr ScaleVideo API.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Jan 1 12:40:12 CET 2013
|
|
||||||
|
|
||||||
Add support for old PES HDTV recording.
|
|
||||||
Disable trickspeed hack, to prevent ffmpeg crash.
|
|
||||||
Makes X11 server arguments configurable.
|
|
||||||
Add german translation.
|
|
||||||
|
|
||||||
User FireFly
|
|
||||||
Date: Sun Nov 18 21:15:50 CET 2012
|
|
||||||
|
|
||||||
Add german translation.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Thu Nov 15 22:28:55 CET 2012
|
|
||||||
|
|
||||||
Release Version 0.5.2
|
|
||||||
|
|
||||||
User maverick-me
|
|
||||||
Date: Mon Nov 5 23:13:42 CET 2012
|
|
||||||
|
|
||||||
Fix 3d OSD position.
|
|
||||||
|
|
||||||
User maverick-me
|
|
||||||
Date: Tue Oct 30 16:50:25 CET 2012
|
|
||||||
|
|
||||||
Add support to change the OSD for 3d SBS/TB streams.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Tue Oct 30 12:11:25 CEST 2012
|
|
||||||
|
|
||||||
Use software decoder for still-pictures.
|
|
||||||
Add Feature #1103: change audio devices without vdr restart.
|
|
||||||
Fix bug #1089: Vdpau decoder used wrong number of mpeg reference frames.
|
|
||||||
Fix bug: with some streams endless loop in pes audio parser.
|
|
||||||
Report correct video size in cSoftHdDevice::GetVideoSize.
|
|
||||||
Add picture adjustment support for vdpau.
|
|
||||||
Revert "mpeg_vdpau" back to "mpegvideo_vdpau".
|
|
||||||
Fix bug: Can't use software decoder with VDPAU.
|
|
||||||
Resume plugin, if suspend control stops.
|
|
||||||
Removes old audio code (!USE_AUDIORING).
|
|
||||||
Use -DOSD_DEBUG to debug OSD.
|
|
||||||
|
|
||||||
User arttupii
|
|
||||||
Date: Tue Aug 7 16:46:23 2012 +0200
|
|
||||||
|
|
||||||
Fix bug #909: Subtitles destroy menu.
|
|
||||||
Fix bug #1003: Subtitles overlapping.
|
|
||||||
|
|
||||||
User johns
|
|
||||||
Date: Fri Jul 27 19:15:48 CEST 2012
|
|
||||||
|
|
||||||
Free used X11 resources colormap, pixmap, cursor.
|
|
||||||
Fix bug: spelling USE_VAPI wrong, missing functions.
|
|
||||||
|
|
||||||
User johns
|
User johns
|
||||||
Date: Tue Jul 3 16:35:46 CEST 2012
|
Date: Tue Jul 3 16:35:46 CEST 2012
|
||||||
|
|
||||||
|
|||||||
244
Makefile
244
Makefile
@ -6,209 +6,152 @@
|
|||||||
# The official name of this plugin.
|
# The official name of this plugin.
|
||||||
# This name will be used in the '-P...' option of VDR to load the plugin.
|
# This name will be used in the '-P...' option of VDR to load the plugin.
|
||||||
# By default the main source file also carries this name.
|
# By default the main source file also carries this name.
|
||||||
|
# IMPORTANT: the presence of this macro is important for the Make.config
|
||||||
|
# file. So it must be defined, even if it is not used here!
|
||||||
|
#
|
||||||
PLUGIN = softhddevice
|
PLUGIN = softhddevice
|
||||||
|
|
||||||
### Configuration (edit this for your needs)
|
|
||||||
|
|
||||||
# support alsa audio output module
|
|
||||||
ALSA ?= $(shell pkg-config --exists alsa && echo 1)
|
|
||||||
# support OSS audio output module
|
|
||||||
OSS ?= 1
|
|
||||||
# support VDPAU video output module
|
|
||||||
VDPAU ?= $(shell pkg-config --exists vdpau && echo 1)
|
|
||||||
# support VA-API video output module (deprecated)
|
|
||||||
VAAPI ?= $(shell pkg-config --exists libva && echo 1)
|
|
||||||
# support glx output
|
|
||||||
OPENGL ?= $(shell pkg-config --exists gl glu && echo 1)
|
|
||||||
# screensaver disable/enable
|
|
||||||
SCREENSAVER ?= 1
|
|
||||||
# use ffmpeg libswresample
|
|
||||||
SWRESAMPLE ?= $(shell pkg-config --exists libswresample && echo 1)
|
|
||||||
# use libav libavresample
|
|
||||||
ifneq ($(SWRESAMPLE),1)
|
|
||||||
AVRESAMPLE ?= $(shell pkg-config --exists libavresample && echo 1)
|
|
||||||
endif
|
|
||||||
|
|
||||||
CONFIG := # -DDEBUG #-DOSD_DEBUG # enable debug output+functions
|
|
||||||
#CONFIG += -DSTILL_DEBUG=2 # still picture debug verbose level
|
|
||||||
|
|
||||||
CONFIG += -DAV_INFO -DAV_INFO_TIME=3000 # info/debug a/v sync
|
|
||||||
CONFIG += -DUSE_PIP # PIP support
|
|
||||||
#CONFIG += -DHAVE_PTHREAD_NAME # supports new pthread_setname_np
|
|
||||||
#CONFIG += -DNO_TS_AUDIO # disable ts audio parser
|
|
||||||
#CONFIG += -DUSE_TS_VIDEO # build new ts video parser
|
|
||||||
CONFIG += -DUSE_MPEG_COMPLETE # support only complete mpeg packets
|
|
||||||
CONFIG += -DH264_EOS_TRICKSPEED # insert seq end packets for trickspeed
|
|
||||||
#CONDIF += -DDUMP_TRICKSPEED # dump trickspeed packets
|
|
||||||
#CONFIG += -DUSE_BITMAP # VDPAU, use bitmap surface for OSD
|
|
||||||
CONFIG += -DUSE_VDR_SPU # use VDR SPU decoder.
|
|
||||||
#CONFIG += -DUSE_SOFTLIMIT # (tobe removed) limit the buffer fill
|
|
||||||
|
|
||||||
### The version number of this plugin (taken from the main source file):
|
### The version number of this plugin (taken from the main source file):
|
||||||
|
|
||||||
VERSION = $(shell grep 'static const char \*const VERSION *=' $(PLUGIN).cpp | awk '{ print $$7 }' | sed -e 's/[";]//g')
|
VERSION = $(shell grep 'static const char \*const VERSION *=' $(PLUGIN).cpp | awk '{ print $$7 }' | sed -e 's/[";]//g')
|
||||||
GIT_REV = $(shell git describe --always 2>/dev/null)
|
GIT_REV = $(shell git describe --always 2>/dev/null)
|
||||||
|
|
||||||
|
### Configuration (edit this for your needs)
|
||||||
|
|
||||||
|
CONFIG := #-DDEBUG
|
||||||
|
CONFIG += -DAV_INFO -DAV_INFO_TIME=3000 # debug a/v sync
|
||||||
|
#CONFIG += -DHAVE_PTHREAD_NAME # supports new pthread_setname_np
|
||||||
|
#CONFIG += -DNO_TS_AUDIO # disable ts audio parser
|
||||||
|
#CONFIG += -DUSE_TS_VIDEO # build new ts video parser
|
||||||
|
CONFIG += $(shell pkg-config --exists vdpau && echo "-DUSE_VDPAU")
|
||||||
|
CONFIG += $(shell pkg-config --exists libva && echo "-DUSE_VAAPI")
|
||||||
|
CONFIG += $(shell pkg-config --exists alsa && echo "-DUSE_ALSA")
|
||||||
|
CONFIG += -DUSE_OSS
|
||||||
|
|
||||||
|
### The C++ compiler and options:
|
||||||
|
|
||||||
|
CC ?= gcc
|
||||||
|
CXX ?= g++
|
||||||
|
CFLAGS ?= -g -O2 -W -Wall -Wextra -Winit-self \
|
||||||
|
-Wdeclaration-after-statement \
|
||||||
|
-ftree-vectorize -msse3 -flax-vector-conversions
|
||||||
|
CXXFLAGS ?= -g -O2 -W -Wall -Wextra -Werror=overloaded-virtual
|
||||||
|
|
||||||
### The directory environment:
|
### The directory environment:
|
||||||
|
|
||||||
# Use package data if installed...otherwise assume we're under the VDR source directory:
|
VDRDIR ?= ../../..
|
||||||
PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
|
LIBDIR ?= ../../lib
|
||||||
LIBDIR = $(call PKGCFG,libdir)
|
|
||||||
LOCDIR = $(call PKGCFG,locdir)
|
|
||||||
PLGCFG = $(call PKGCFG,plgcfg)
|
|
||||||
#
|
|
||||||
TMPDIR ?= /tmp
|
TMPDIR ?= /tmp
|
||||||
|
|
||||||
### The compiler options:
|
### Make sure that necessary options are included:
|
||||||
|
|
||||||
export CFLAGS = $(call PKGCFG,cflags)
|
-include $(VDRDIR)/Make.global
|
||||||
export CXXFLAGS = $(call PKGCFG,cxxflags)
|
|
||||||
|
|
||||||
ifeq ($(CFLAGS),)
|
|
||||||
$(warning CFLAGS not set)
|
|
||||||
endif
|
|
||||||
ifeq ($(CXXFLAGS),)
|
|
||||||
$(warning CXXFLAGS not set)
|
|
||||||
endif
|
|
||||||
|
|
||||||
### The version number of VDR's plugin API:
|
|
||||||
|
|
||||||
APIVERSION = $(call PKGCFG,apiversion)
|
|
||||||
|
|
||||||
### Allow user defined options to overwrite defaults:
|
### Allow user defined options to overwrite defaults:
|
||||||
|
|
||||||
-include $(PLGCFG)
|
-include $(VDRDIR)/Make.config
|
||||||
|
|
||||||
|
### The version number of VDR's plugin API (taken from VDR's "config.h"):
|
||||||
|
|
||||||
|
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
|
||||||
|
|
||||||
### The name of the distribution archive:
|
### The name of the distribution archive:
|
||||||
|
|
||||||
ARCHIVE = $(PLUGIN)-$(VERSION)
|
ARCHIVE = $(PLUGIN)-$(VERSION)
|
||||||
PACKAGE = vdr-$(ARCHIVE)
|
PACKAGE = vdr-$(ARCHIVE)
|
||||||
|
|
||||||
### The name of the shared object file:
|
### Includes, Defines and dependencies (add further entries here):
|
||||||
|
|
||||||
SOFILE = libvdr-$(PLUGIN).so
|
INCLUDES += -I$(VDRDIR)/include
|
||||||
|
|
||||||
### Parse softhddevice config
|
DEFINES += $(CONFIG) -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \
|
||||||
|
|
||||||
ifeq ($(ALSA),1)
|
|
||||||
CONFIG += -DUSE_ALSA
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags alsa)
|
|
||||||
LIBS += $(shell pkg-config --libs alsa)
|
|
||||||
endif
|
|
||||||
ifeq ($(OSS),1)
|
|
||||||
CONFIG += -DUSE_OSS
|
|
||||||
endif
|
|
||||||
ifeq ($(VDPAU),1)
|
|
||||||
CONFIG += -DUSE_VDPAU
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags vdpau)
|
|
||||||
LIBS += $(shell pkg-config --libs vdpau)
|
|
||||||
endif
|
|
||||||
ifeq ($(VAAPI),1)
|
|
||||||
CONFIG += -DUSE_VAAPI
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags libva-x11 libva)
|
|
||||||
LIBS += $(shell pkg-config --libs libva-x11 libva)
|
|
||||||
ifeq ($(OPENGL),1)
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags libva-glx)
|
|
||||||
LIBS += $(shell pkg-config --libs libva-glx)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq ($(OPENGL),1)
|
|
||||||
CONFIG += -DUSE_GLX
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags gl glu)
|
|
||||||
LIBS += $(shell pkg-config --libs gl glu)
|
|
||||||
endif
|
|
||||||
ifeq ($(SCREENSAVER),1)
|
|
||||||
CONFIG += -DUSE_SCREENSAVER
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags xcb-screensaver xcb-dpms)
|
|
||||||
LIBS += $(shell pkg-config --libs xcb-screensaver xcb-dpms)
|
|
||||||
endif
|
|
||||||
ifeq ($(SWRESAMPLE),1)
|
|
||||||
CONFIG += -DUSE_SWRESAMPLE
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags libswresample)
|
|
||||||
LIBS += $(shell pkg-config --libs libswresample)
|
|
||||||
endif
|
|
||||||
ifeq ($(AVRESAMPLE),1)
|
|
||||||
CONFIG += -DUSE_AVRESAMPLE
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags libavresample)
|
|
||||||
LIBS += $(shell pkg-config --libs libavresample)
|
|
||||||
endif
|
|
||||||
|
|
||||||
_CFLAGS += $(shell pkg-config --cflags libavcodec x11 x11-xcb xcb xcb-icccm)
|
|
||||||
LIBS += -lrt $(shell pkg-config --libs libavcodec x11 x11-xcb xcb xcb-icccm)
|
|
||||||
|
|
||||||
### Includes and Defines (add further entries here):
|
|
||||||
|
|
||||||
INCLUDES +=
|
|
||||||
|
|
||||||
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE $(CONFIG) \
|
|
||||||
$(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"')
|
$(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"')
|
||||||
|
|
||||||
### Make it standard
|
_CFLAGS = $(DEFINES) $(INCLUDES) \
|
||||||
|
$(shell pkg-config --cflags libavcodec) \
|
||||||
|
`pkg-config --cflags x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\
|
||||||
|
xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\
|
||||||
|
`pkg-config --cflags gl glu` \
|
||||||
|
$(if $(findstring USE_VDPAU,$(CONFIG)), \
|
||||||
|
`pkg-config --cflags vdpau`) \
|
||||||
|
$(if $(findstring USE_VAAPI,$(CONFIG)), \
|
||||||
|
`pkg-config --cflags libva-x11 libva-glx libva`) \
|
||||||
|
$(if $(findstring USE_ALSA,$(CONFIG)), \
|
||||||
|
`pkg-config --cflags alsa`)
|
||||||
|
|
||||||
override CXXFLAGS += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
|
#override _CFLAGS += -Werror
|
||||||
-g -W -Wall -Wextra -Winit-self -Werror=overloaded-virtual
|
override CXXFLAGS += $(_CFLAGS)
|
||||||
override CFLAGS += $(_CFLAGS) $(DEFINES) $(INCLUDES) \
|
override CFLAGS += $(_CFLAGS)
|
||||||
-g -W -Wall -Wextra -Winit-self -Wdeclaration-after-statement
|
|
||||||
|
LIBS += -lrt \
|
||||||
|
$(shell pkg-config --libs libavcodec) \
|
||||||
|
`pkg-config --libs x11 x11-xcb xcb xcb-xv xcb-shm xcb-dpms xcb-atom\
|
||||||
|
xcb-screensaver xcb-randr xcb-glx xcb-icccm xcb-keysyms`\
|
||||||
|
`pkg-config --libs gl glu` \
|
||||||
|
$(if $(findstring USE_VDPAU,$(CONFIG)), \
|
||||||
|
`pkg-config --libs vdpau`) \
|
||||||
|
$(if $(findstring USE_VAAPI,$(CONFIG)), \
|
||||||
|
`pkg-config --libs libva-x11 libva-glx libva`) \
|
||||||
|
$(if $(findstring USE_ALSA,$(CONFIG)), \
|
||||||
|
`pkg-config --libs alsa`)
|
||||||
|
|
||||||
### The object files (add further files here):
|
### The object files (add further files here):
|
||||||
|
|
||||||
OBJS = $(PLUGIN).o softhddev.o video.o audio.o codec.o ringbuffer.o
|
OBJS = $(PLUGIN).o softhddev.o video.o audio.o codec.o ringbuffer.o
|
||||||
|
|
||||||
SRCS = $(wildcard $(OBJS:.o=.c)) $(PLUGIN).cpp
|
SRCS = $(wildcard $(OBJS:.o=.c)) $(PLUGIN).cpp
|
||||||
|
|
||||||
### The main target:
|
### The main target:
|
||||||
|
|
||||||
all: $(SOFILE) i18n
|
all: libvdr-$(PLUGIN).so i18n
|
||||||
|
|
||||||
|
### Implicit rules:
|
||||||
|
#
|
||||||
|
#%.o: %.cpp
|
||||||
|
# $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
||||||
MAKEDEP = $(CXX) -MM -MG
|
MAKEDEP = $(CC) -MM -MG
|
||||||
DEPFILE = .dependencies
|
DEPFILE = .dependencies
|
||||||
$(DEPFILE): Makefile
|
$(DEPFILE): Makefile
|
||||||
@$(MAKEDEP) $(CXXFLAGS) $(SRCS) > $@
|
@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(SRCS) >$@
|
||||||
|
|
||||||
|
$(OBJS): Makefile
|
||||||
|
|
||||||
-include $(DEPFILE)
|
-include $(DEPFILE)
|
||||||
|
|
||||||
### Internationalization (I18N):
|
### Internationalization (I18N):
|
||||||
|
|
||||||
PODIR = po
|
PODIR = po
|
||||||
|
LOCALEDIR = $(VDRDIR)/locale
|
||||||
I18Npo = $(wildcard $(PODIR)/*.po)
|
I18Npo = $(wildcard $(PODIR)/*.po)
|
||||||
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
|
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
|
||||||
I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
|
|
||||||
I18Npot = $(PODIR)/$(PLUGIN).pot
|
I18Npot = $(PODIR)/$(PLUGIN).pot
|
||||||
|
|
||||||
%.mo: %.po
|
%.mo: %.po
|
||||||
msgfmt -c -o $@ $<
|
msgfmt -c -o $@ $<
|
||||||
|
|
||||||
$(I18Npot): $(SRCS)
|
$(I18Npot): $(wildcard *.cpp) $(wildcard *.c)
|
||||||
xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP \
|
xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP \
|
||||||
-k_ -k_N --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) \
|
-k_ -k_N --package-name=VDR --package-version=$(VDRVERSION) \
|
||||||
--msgid-bugs-address='<see README>' -o $@ `ls $^`
|
--msgid-bugs-address='<see README>' -o $@ $^
|
||||||
|
|
||||||
%.po: $(I18Npot)
|
%.po: $(I18Npot)
|
||||||
msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
|
msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
|
$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
|
||||||
install -D -m644 $< $@
|
@mkdir -p $(dir $@)
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
.PHONY: i18n
|
.PHONY: i18n
|
||||||
i18n: $(I18Nmo) $(I18Npot)
|
i18n: $(I18Nmsgs) $(I18Npot)
|
||||||
|
|
||||||
install-i18n: $(I18Nmsgs)
|
|
||||||
|
|
||||||
### Targets:
|
### Targets:
|
||||||
|
|
||||||
$(OBJS): Makefile
|
libvdr-$(PLUGIN).so: $(OBJS) Makefile
|
||||||
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -fPIC $(OBJS) -o $@ $(LIBS)
|
||||||
$(SOFILE): $(OBJS)
|
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
|
||||||
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
|
|
||||||
|
|
||||||
install-lib: $(SOFILE)
|
|
||||||
install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
|
|
||||||
|
|
||||||
install: install-lib install-i18n
|
|
||||||
|
|
||||||
dist: $(I18Npo) clean
|
dist: $(I18Npo) clean
|
||||||
@-rm -rf $(TMPDIR)/$(ARCHIVE)
|
@-rm -rf $(TMPDIR)/$(ARCHIVE)
|
||||||
@ -219,20 +162,19 @@ dist: $(I18Npo) clean
|
|||||||
@echo Distribution package created as $(PACKAGE).tgz
|
@echo Distribution package created as $(PACKAGE).tgz
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
|
@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
|
||||||
@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
|
|
||||||
|
|
||||||
## Private Targets:
|
install: libvdr-$(PLUGIN).so
|
||||||
|
cp --remove-destination libvdr-$(PLUGIN).so \
|
||||||
|
/usr/lib/vdr/plugins/libvdr-$(PLUGIN).so.$(APIVERSION)
|
||||||
|
|
||||||
HDRS= $(wildcard *.h)
|
HDRS= $(wildcard *.h)
|
||||||
|
|
||||||
indent:
|
indent:
|
||||||
for i in $(SRCS) $(HDRS); do \
|
for i in $(wildcard $(OBJS:.o=.c)) $(HDRS); do \
|
||||||
indent $$i; \
|
indent $$i; unexpand -a $$i > $$i.up; mv $$i.up $$i; \
|
||||||
unexpand -a $$i | sed -e s/constconst/const/ > $$i.up; \
|
|
||||||
mv $$i.up $$i; \
|
|
||||||
done
|
done
|
||||||
|
|
||||||
video_test: video.c Makefile
|
video_test: video.c Makefile
|
||||||
$(CC) -DVIDEO_TEST -DVERSION='"$(VERSION)"' $(CFLAGS) $(LDFLAGS) $< \
|
$(CC) -DVIDEO_TEST -DVERSION='"$(VERSION)"' $(CFLAGS) $(LDFLAGS) $< $(LIBS) \
|
||||||
$(LIBS) -o $@
|
-o $@
|
||||||
|
|||||||
99
README.txt
99
README.txt
@ -1,6 +1,6 @@
|
|||||||
@file README.txt @brief A software HD output device for VDR
|
@file README.txt @brief A software HD output device for VDR
|
||||||
|
|
||||||
Copyright (c) 2011 - 2013 by Johns. All Rights Reserved.
|
Copyright (c) 2011, 2012 by Johns. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
||||||
@ -20,27 +20,25 @@ $Id$
|
|||||||
|
|
||||||
A software and GPU emulated HD output device plugin for VDR.
|
A software and GPU emulated HD output device plugin for VDR.
|
||||||
|
|
||||||
o Video decoder CPU / VDPAU
|
o Video decoder CPU / VA-API / VDPAU
|
||||||
o Video output VDPAU
|
o Video output VA-API / VDPAU
|
||||||
o Audio FFMpeg / Alsa / Analog
|
o Audio FFMpeg / Alsa / Analog
|
||||||
o Audio FFMpeg / Alsa / Digital
|
o Audio FFMpeg / Alsa / Digital
|
||||||
o Audio FFMpeg / OSS / Analog
|
o Audio FFMpeg / OSS / Analog
|
||||||
o HDMI/SPDIF pass-through
|
o HDMI/SPDIF pass-through
|
||||||
o Software volume, compression, normalize and channel resample
|
o Software volume, compression, normalize and channel resample
|
||||||
o VDR ScaleVideo API
|
o YaepgHD support
|
||||||
o Software deinterlacer Bob (VA-API only)
|
o Software deinterlacer Bob (VA-API only)
|
||||||
o Autocrop
|
o Autocrop
|
||||||
o Grab image (VDPAU only)
|
o Grab image (VDPAU only)
|
||||||
o Suspend / Dettach
|
o Suspend
|
||||||
o Letterbox, Stretch and Center cut-out video display modes
|
o Letterbox, Stretch and Center cut-out video display modes
|
||||||
o atmo light support with plugin http://github.com/durchflieger/DFAtmo
|
o atmo light support with plugin http://github.com/durchflieger/DFAtmo
|
||||||
o PIP (Picture-in-Picture) (VDPAU only)
|
|
||||||
|
|
||||||
o planned: Remove VA-API decoder and output support
|
o planned: Video decoder VA-API Branch: vaapi-ext/staging
|
||||||
o planned: Video decoder OpenMax
|
o planned: Video output XvBA / Opengl / Xv
|
||||||
o planned: Video output Opengl / Xv
|
o planned: VA-API grab image
|
||||||
o planned: Improved software deinterlacer (yadif or/and ffmpeg filters)
|
o planned: Improved Software Deinterlacer (yadif or/and ffmpeg filters)
|
||||||
o XvBa support is no longer planned (use future Radeon UVD VDPAU)
|
|
||||||
|
|
||||||
To compile you must have the 'requires' installed.
|
To compile you must have the 'requires' installed.
|
||||||
|
|
||||||
@ -58,8 +56,8 @@ Install:
|
|||||||
|
|
||||||
git clone git://projects.vdr-developer.org/vdr-plugin-softhddevice.git
|
git clone git://projects.vdr-developer.org/vdr-plugin-softhddevice.git
|
||||||
cd vdr-plugin-softhddevice
|
cd vdr-plugin-softhddevice
|
||||||
make
|
make VDRDIR=<path-to-your-vdr-files> LIBDIR=.
|
||||||
make install
|
gentoo: make VDRDIR=/usr/include/vdr LIBDIR=.
|
||||||
|
|
||||||
2a) tarball
|
2a) tarball
|
||||||
|
|
||||||
@ -68,11 +66,10 @@ Install:
|
|||||||
|
|
||||||
tar vxf vdr-softhddevice-*.tar.bz2
|
tar vxf vdr-softhddevice-*.tar.bz2
|
||||||
cd softhddevice-*
|
cd softhddevice-*
|
||||||
make
|
make VDRDIR=<path-to-your-vdr-files> LIBDIR=.
|
||||||
make install
|
|
||||||
|
|
||||||
You can edit Makefile to enable/disable VDPAU / VA-API / Alsa / OSS
|
You can edit Makefile to enable/disable VDPAU / VA-API / Alsa / OSS
|
||||||
support. The default is to autodetect as much as possible.
|
support.
|
||||||
|
|
||||||
Setup: environment
|
Setup: environment
|
||||||
------
|
------
|
||||||
@ -84,12 +81,14 @@ Setup: environment
|
|||||||
if set don't use the hardware decoders
|
if set don't use the hardware decoders
|
||||||
NO_MPEG_HW=1
|
NO_MPEG_HW=1
|
||||||
if set don't use the hardware decoder for mpeg1/2
|
if set don't use the hardware decoder for mpeg1/2
|
||||||
|
STUDIO_LEVELS=1
|
||||||
|
if set use studio levels with vdpau (deprecated use setup)
|
||||||
|
|
||||||
only if alsa is configured
|
only if alsa is configured
|
||||||
ALSA_DEVICE=default
|
ALSA_DEVICE=default
|
||||||
alsa PCM device name
|
alsa PCM device name
|
||||||
ALSA_PASSTHROUGH_DEVICE=
|
ALSA_AC3_DEVICE=
|
||||||
alsa pass-though (AC-3,E-AC-3,DTS,...) device name
|
alsa AC3/pass-though device name
|
||||||
ALSA_MIXER=default
|
ALSA_MIXER=default
|
||||||
alsa control device name
|
alsa control device name
|
||||||
ALSA_MIXER_CHANNEL=PCM
|
ALSA_MIXER_CHANNEL=PCM
|
||||||
@ -98,8 +97,8 @@ Setup: environment
|
|||||||
only if oss is configured
|
only if oss is configured
|
||||||
OSS_AUDIODEV=/dev/dsp
|
OSS_AUDIODEV=/dev/dsp
|
||||||
oss dsp device name
|
oss dsp device name
|
||||||
OSS_PASSTHROUGHDEV=
|
OSS_AC3_AUDIODEV=
|
||||||
oss pass-though (AC-3,E-AC-3,DTS,...) device name
|
oss AC3/pass-though device name
|
||||||
OSS_MIXERDEV=/dev/mixer
|
OSS_MIXERDEV=/dev/mixer
|
||||||
oss mixer device name
|
oss mixer device name
|
||||||
OSS_MIXER_CHANNEL=pcm
|
OSS_MIXER_CHANNEL=pcm
|
||||||
@ -129,7 +128,7 @@ Setup: /etc/vdr/setup.conf
|
|||||||
|
|
||||||
softhddevice.<res>.Deinterlace = 0
|
softhddevice.<res>.Deinterlace = 0
|
||||||
0 = bob, 1 = weave, 2 = temporal, 3 = temporal_spatial, 4 = software
|
0 = bob, 1 = weave, 2 = temporal, 3 = temporal_spatial, 4 = software
|
||||||
(only 0, 1, 4 supported with VA-API)
|
(only 0, 1 supported with vaapi)
|
||||||
|
|
||||||
softhddevice.<res>.SkipChromaDeinterlace = 0
|
softhddevice.<res>.SkipChromaDeinterlace = 0
|
||||||
0 = disabled, 1 = enabled (for slower cards, poor qualität)
|
0 = disabled, 1 = enabled (for slower cards, poor qualität)
|
||||||
@ -155,17 +154,13 @@ Setup: /etc/vdr/setup.conf
|
|||||||
delay audio or delay video
|
delay audio or delay video
|
||||||
|
|
||||||
softhddevice.AudioPassthrough = 0
|
softhddevice.AudioPassthrough = 0
|
||||||
0 = none, 1 = PCM, 2 = MPA, 4 = AC-3, 8 = EAC-3, -X disable
|
0 = none, 1 = AC-3
|
||||||
|
|
||||||
for PCM/AC-3/EAC-3 the pass-through device is used and the audio
|
for AC-3 the pass-through device is used.
|
||||||
stream is passed undecoded to the output device.
|
|
||||||
z.b. 12 = AC-3+EAC-3, 13 = PCM+AC-3+EAC-3
|
|
||||||
note: MPA/DTS/TrueHD/... aren't supported yet
|
|
||||||
negative values disable passthrough
|
|
||||||
|
|
||||||
softhddevice.AudioDownmix = 0
|
softhddevice.AudioDownmix = 0
|
||||||
0 = none, 1 = downmix
|
0 = none, 1 = downmix
|
||||||
Use ffmpeg/libav downmix of AC-3/EAC-3 audio to stereo.
|
downmix AC-3 to stero.
|
||||||
|
|
||||||
softhddevice.AudioSoftvol = 0
|
softhddevice.AudioSoftvol = 0
|
||||||
0 = off, use hardware volume control
|
0 = off, use hardware volume control
|
||||||
@ -233,45 +228,11 @@ Setup: /etc/vdr/setup.conf
|
|||||||
0 disable black picture during channel switch
|
0 disable black picture during channel switch
|
||||||
1 enable black picture during channel switch
|
1 enable black picture during channel switch
|
||||||
|
|
||||||
softhddevice.ClearOnSwitch = 0
|
VideoDisplayFormat = ?
|
||||||
0 keep video und audio buffers during channel switch
|
|
||||||
1 clear video and audio buffers on channel switch
|
|
||||||
|
|
||||||
softhddevice.Video4to3DisplayFormat = 1
|
|
||||||
0 pan and scan
|
0 pan and scan
|
||||||
1 letter box
|
1 letter box
|
||||||
2 center cut-out
|
2 center cut-out
|
||||||
|
|
||||||
softhddevice.VideoOtherDisplayFormat = 1
|
|
||||||
0 pan and scan
|
|
||||||
1 pillar box
|
|
||||||
2 center cut-out
|
|
||||||
|
|
||||||
softhddevice.pip.X = 79
|
|
||||||
softhddevice.pip.Y = 78
|
|
||||||
softhddevice.pip.Width = 18
|
|
||||||
softhddevice.pip.Height = 18
|
|
||||||
PIP pip window position and size in percent.
|
|
||||||
|
|
||||||
softhddevice.pip.VideoX = 0
|
|
||||||
softhddevice.pip.VideoY = 0
|
|
||||||
softhddevice.pip.VideoWidth = 0
|
|
||||||
softhddevice.pip.VideoHeight = 0
|
|
||||||
PIP video window position and size in percent.
|
|
||||||
|
|
||||||
softhddevice.pip.Alt.X = 0
|
|
||||||
softhddevice.pip.Alt.Y = 50
|
|
||||||
softhddevice.pip.Alt.Width = 0
|
|
||||||
softhddevice.pip.Alt.Height = 50
|
|
||||||
PIP alternative pip window position and size in percent.
|
|
||||||
|
|
||||||
softhddevice.pip.Alt.VideoX = 0
|
|
||||||
softhddevice.pip.Alt.VideoY = 0
|
|
||||||
softhddevice.pip.Alt.VideoWidth = 0
|
|
||||||
softhddevice.pip.Alt.VideoHeight = 50
|
|
||||||
PIP alternative video window position and size in percent.
|
|
||||||
|
|
||||||
|
|
||||||
Setup: /etc/vdr/remote.conf
|
Setup: /etc/vdr/remote.conf
|
||||||
------
|
------
|
||||||
|
|
||||||
@ -321,7 +282,6 @@ Keymacros:
|
|||||||
@softhddevice Blue 1 2 toggle pass-through
|
@softhddevice Blue 1 2 toggle pass-through
|
||||||
@softhddevice Blue 1 3 decrease audio delay by 10ms
|
@softhddevice Blue 1 3 decrease audio delay by 10ms
|
||||||
@softhddevice Blue 1 4 increase audio delay by 10ms
|
@softhddevice Blue 1 4 increase audio delay by 10ms
|
||||||
@softhddevice Blue 1 5 toggle ac3 mixdown
|
|
||||||
@softhddevice Blue 2 0 disable fullscreen
|
@softhddevice Blue 2 0 disable fullscreen
|
||||||
@softhddevice Blue 2 1 enable fullscreen
|
@softhddevice Blue 2 1 enable fullscreen
|
||||||
@softhddevice Blue 2 2 toggle fullscreen
|
@softhddevice Blue 2 2 toggle fullscreen
|
||||||
@ -345,19 +305,14 @@ Warning:
|
|||||||
|
|
||||||
Known Bugs:
|
Known Bugs:
|
||||||
-----------
|
-----------
|
||||||
VA-API doesn't v-sync h264 interlaced streams
|
VA-API doesn't v-sync 1080i streams
|
||||||
vdr-image not working
|
vdr-image not working
|
||||||
|
|
||||||
Requires:
|
Requires:
|
||||||
---------
|
---------
|
||||||
media-video/vdr (version >=1.7.xx)
|
|
||||||
Video Disk Recorder - turns a pc into a powerful set top box
|
|
||||||
for DVB.
|
|
||||||
http://www.tvdr.de/
|
|
||||||
|
|
||||||
media-video/ffmpeg (version >=0.7)
|
media-video/ffmpeg (version >=0.7)
|
||||||
Complete solution to record, convert and stream audio and
|
Complete solution to record, convert and stream audio and
|
||||||
video. Includes libavcodec and libswresample.
|
video. Includes libavcodec.
|
||||||
http://ffmpeg.org
|
http://ffmpeg.org
|
||||||
media-libs/alsa-lib
|
media-libs/alsa-lib
|
||||||
Advanced Linux Sound Architecture Library
|
Advanced Linux Sound Architecture Library
|
||||||
@ -365,7 +320,7 @@ Requires:
|
|||||||
or
|
or
|
||||||
kernel support for oss/oss4 or alsa oss emulation
|
kernel support for oss/oss4 or alsa oss emulation
|
||||||
|
|
||||||
x11-libs/libva (deprecated)
|
x11-libs/libva
|
||||||
Video Acceleration (VA) API for Linux
|
Video Acceleration (VA) API for Linux
|
||||||
http://www.freedesktop.org/wiki/Software/vaapi
|
http://www.freedesktop.org/wiki/Software/vaapi
|
||||||
x11-libs/libva-intel-driver
|
x11-libs/libva-intel-driver
|
||||||
|
|||||||
25
Todo
25
Todo
@ -1,6 +1,6 @@
|
|||||||
@file Todo @brief A software HD output device for VDR
|
@file Todo @brief A software HD output device for VDR
|
||||||
|
|
||||||
Copyright (c) 2011 - 2013 by Johns. All Rights Reserved.
|
Copyright (c) 2011, 2012 by Johns. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
||||||
@ -19,9 +19,6 @@ GNU Affero General Public License for more details.
|
|||||||
$Id: $
|
$Id: $
|
||||||
|
|
||||||
missing:
|
missing:
|
||||||
documentation of the PIP hotkeys.
|
|
||||||
svdrp help page missing PIP hotkeys.
|
|
||||||
svdrp stat: add X11 crashed status.
|
|
||||||
more software deinterlace (yadif, ...)
|
more software deinterlace (yadif, ...)
|
||||||
more software decoder with software deinterlace
|
more software decoder with software deinterlace
|
||||||
suspend output / energie saver: stop and restart X11
|
suspend output / energie saver: stop and restart X11
|
||||||
@ -42,16 +39,9 @@ video:
|
|||||||
some low-bandwidth tv channels have hiccups.
|
some low-bandwidth tv channels have hiccups.
|
||||||
check start with 24Hz display rate
|
check start with 24Hz display rate
|
||||||
crash with ffmpeg without vaapi and vdpau.
|
crash with ffmpeg without vaapi and vdpau.
|
||||||
still-picture of PES recordings should use VideoMpegEnqueue.
|
|
||||||
convert PIX_FMT_... PixelFormat to new names AV_PIX_FMT_..., AVPixelFormat.
|
|
||||||
atmo service support 3D grab
|
|
||||||
no warnings during still picture
|
|
||||||
|
|
||||||
vdpau:
|
vdpau:
|
||||||
software deinterlace path not working.
|
software decoder path not working
|
||||||
OSD looses transparency, during channel switch.
|
|
||||||
OSD looses transparency, while moving cut marks.
|
|
||||||
ffmpeg >=1.2 supports same API like VA-API.
|
|
||||||
|
|
||||||
libva:
|
libva:
|
||||||
yaepghd (VaapiSetOutputPosition) support
|
yaepghd (VaapiSetOutputPosition) support
|
||||||
@ -61,9 +51,6 @@ libva:
|
|||||||
still many: (workaround export NO_MPEG_HW=1)
|
still many: (workaround export NO_MPEG_HW=1)
|
||||||
[drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung
|
[drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung
|
||||||
[drm:i915_wait_request] *ERROR* i915_wait_request returns -11 ...
|
[drm:i915_wait_request] *ERROR* i915_wait_request returns -11 ...
|
||||||
missing OSD support for 3d SBS / Top-Bottom streams, like VPDAU.
|
|
||||||
PIP support / multistream handling
|
|
||||||
VA-AP VaapiCleanup crash after channel without video.
|
|
||||||
|
|
||||||
libva: branch vaapi-ext / staging
|
libva: branch vaapi-ext / staging
|
||||||
add support for vaapi-ext / staging
|
add support for vaapi-ext / staging
|
||||||
@ -120,21 +107,23 @@ plugins:
|
|||||||
setup:
|
setup:
|
||||||
Setup of decoder type.
|
Setup of decoder type.
|
||||||
Setup of output type.
|
Setup of output type.
|
||||||
|
Setup of display type.
|
||||||
|
Setup 4:3 zoom type
|
||||||
Some setup parameters are not used until restart.
|
Some setup parameters are not used until restart.
|
||||||
Can a notice be added to the setup menu?
|
Can a notice be added to the setup menu?
|
||||||
|
|
||||||
unsorted:
|
unsorted:
|
||||||
stoping vdr while plugin is suspended opens and closes a window.
|
stoping vdr while plugin is suspended opens and closes a window.
|
||||||
svdrp prim: support plugin names for device numbers.
|
svdrp prim: support plugin names for device numbers.
|
||||||
Workaround exists: hangup PipVideoStream -> Vdpau_get_format -> xcb -> poll
|
|
||||||
+ lock DecoderLockMutex
|
|
||||||
check compiletime and runtime ffmpeg/libav version during init.
|
|
||||||
|
|
||||||
future features (not planed for 1.0 - 1.5)
|
future features (not planed for 1.0 - 1.5)
|
||||||
|
|
||||||
video out with xv
|
video out with xv
|
||||||
video out with opengl
|
video out with opengl
|
||||||
|
video out with xvba
|
||||||
software decoder for xv / opengl
|
software decoder for xv / opengl
|
||||||
|
multistream handling
|
||||||
|
pip support
|
||||||
save and use auto-crop with channel zapping
|
save and use auto-crop with channel zapping
|
||||||
|
|
||||||
upmix stereo to AC-3 (supported by alsa plugin)
|
upmix stereo to AC-3 (supported by alsa plugin)
|
||||||
|
|||||||
9
audio.h
9
audio.h
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file audio.h @brief Audio module headerfile
|
/// @file audio.h @brief Audio module headerfile
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2009 - 2014 by Johns. All Rights Reserved.
|
/// Copyright (c) 2009 - 2012 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
@ -48,11 +48,8 @@ extern void AudioSetCompression(int, int); ///< set compression parameters
|
|||||||
extern void AudioSetStereoDescent(int); ///< set stereo loudness descent
|
extern void AudioSetStereoDescent(int); ///< set stereo loudness descent
|
||||||
|
|
||||||
extern void AudioSetDevice(const char *); ///< set PCM audio device
|
extern void AudioSetDevice(const char *); ///< set PCM audio device
|
||||||
|
extern void AudioSetDeviceAC3(const char *); ///< set pass-through device
|
||||||
/// set pass-through device
|
|
||||||
extern void AudioSetPassthroughDevice(const char *);
|
|
||||||
extern void AudioSetChannel(const char *); ///< set mixer channel
|
extern void AudioSetChannel(const char *); ///< set mixer channel
|
||||||
extern void AudioSetAutoAES(int); ///< set automatic AES flag handling
|
|
||||||
extern void AudioInit(void); ///< setup audio module
|
extern void AudioInit(void); ///< setup audio module
|
||||||
extern void AudioExit(void); ///< cleanup and exit audio module
|
extern void AudioExit(void); ///< cleanup and exit audio module
|
||||||
|
|
||||||
@ -61,7 +58,5 @@ extern void AudioExit(void); ///< cleanup and exit audio module
|
|||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
extern char AudioAlsaDriverBroken; ///< disable broken driver message
|
extern char AudioAlsaDriverBroken; ///< disable broken driver message
|
||||||
extern char AudioAlsaNoCloseOpen; ///< disable alsa close/open fix
|
|
||||||
extern char AudioAlsaCloseOpenDelay; ///< enable alsa close/open delay fix
|
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|||||||
23
codec.h
23
codec.h
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file codec.h @brief Codec module headerfile
|
/// @file codec.h @brief Codec module headerfile
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2009 - 2013, 2015 by Johns. All Rights Reserved.
|
/// Copyright (c) 2009 - 2012 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
@ -23,16 +23,6 @@
|
|||||||
/// @addtogroup Codec
|
/// @addtogroup Codec
|
||||||
/// @{
|
/// @{
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
// Defines
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#define CodecPCM 0x01 ///< PCM bit mask
|
|
||||||
#define CodecMPA 0x02 ///< MPA bit mask (planned)
|
|
||||||
#define CodecAC3 0x04 ///< AC-3 bit mask
|
|
||||||
#define CodecEAC3 0x08 ///< E-AC-3 bit mask
|
|
||||||
#define CodecDTS 0x10 ///< DTS bit mask (planned)
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// Typedefs
|
// Typedefs
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
@ -43,13 +33,6 @@ typedef struct _video_decoder_ VideoDecoder;
|
|||||||
/// Audio decoder typedef.
|
/// Audio decoder typedef.
|
||||||
typedef struct _audio_decoder_ AudioDecoder;
|
typedef struct _audio_decoder_ AudioDecoder;
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
// Variables
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/// Flag prefer fast xhannel switch
|
|
||||||
extern char CodecUsePossibleDefectFrames;
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// Prototypes
|
// Prototypes
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
@ -61,7 +44,7 @@ extern VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder *);
|
|||||||
extern void CodecVideoDelDecoder(VideoDecoder *);
|
extern void CodecVideoDelDecoder(VideoDecoder *);
|
||||||
|
|
||||||
/// Open video codec.
|
/// Open video codec.
|
||||||
extern void CodecVideoOpen(VideoDecoder *, int);
|
extern void CodecVideoOpen(VideoDecoder *, const char *, int);
|
||||||
|
|
||||||
/// Close video codec.
|
/// Close video codec.
|
||||||
extern void CodecVideoClose(VideoDecoder *);
|
extern void CodecVideoClose(VideoDecoder *);
|
||||||
@ -79,7 +62,7 @@ extern AudioDecoder *CodecAudioNewDecoder(void);
|
|||||||
extern void CodecAudioDelDecoder(AudioDecoder *);
|
extern void CodecAudioDelDecoder(AudioDecoder *);
|
||||||
|
|
||||||
/// Open audio codec.
|
/// Open audio codec.
|
||||||
extern void CodecAudioOpen(AudioDecoder *, int);
|
extern void CodecAudioOpen(AudioDecoder *, const char *, int);
|
||||||
|
|
||||||
/// Close audio codec.
|
/// Close audio codec.
|
||||||
extern void CodecAudioClose(AudioDecoder *);
|
extern void CodecAudioClose(AudioDecoder *);
|
||||||
|
|||||||
97
iatomic.h
97
iatomic.h
@ -1,97 +0,0 @@
|
|||||||
///
|
|
||||||
/// @file iatomic.h @brief Misc function header file
|
|
||||||
///
|
|
||||||
/// Copyright (c) 2014 by Johns. All Rights Reserved.
|
|
||||||
///
|
|
||||||
/// Contributor(s):
|
|
||||||
///
|
|
||||||
/// License: AGPLv3
|
|
||||||
///
|
|
||||||
/// This program is free software: you can redistribute it and/or modify
|
|
||||||
/// it under the terms of the GNU Affero General Public License as
|
|
||||||
/// published by the Free Software Foundation, either version 3 of the
|
|
||||||
/// License.
|
|
||||||
///
|
|
||||||
/// This program is distributed in the hope that it will be useful,
|
|
||||||
/// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
/// GNU Affero General Public License for more details.
|
|
||||||
///
|
|
||||||
/// $Id$
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
/// @addtogroup iatomic
|
|
||||||
/// @{
|
|
||||||
|
|
||||||
#define GCC_VERSION (__GNUC__ * 10000 \
|
|
||||||
+ __GNUC_MINOR__ * 100 \
|
|
||||||
+ __GNUC_PATCHLEVEL__)
|
|
||||||
|
|
||||||
// gcc before 4.7 didn't support atomic builtins,
|
|
||||||
// use alsa atomic functions.
|
|
||||||
#if GCC_VERSION < 40700
|
|
||||||
|
|
||||||
#include <alsa/iatomic.h>
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Defines
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Declares
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
///
|
|
||||||
/// atomic type, 24 bit useable,
|
|
||||||
///
|
|
||||||
typedef volatile int atomic_t;
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Prototypes
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Inlines
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Set atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_set(ptr, val) \
|
|
||||||
__atomic_store_n(ptr, val, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Read atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_read(ptr) \
|
|
||||||
__atomic_load_n(ptr, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Increment atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_inc(ptr) \
|
|
||||||
__atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Decrement atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_dec(ptr) \
|
|
||||||
__atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Add to atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_add(val, ptr) \
|
|
||||||
__atomic_add_fetch(ptr, val, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
///
|
|
||||||
/// Subtract from atomic value.
|
|
||||||
///
|
|
||||||
#define atomic_sub(val, ptr) \
|
|
||||||
__atomic_sub_fetch(ptr, val, __ATOMIC_SEQ_CST)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/// @}
|
|
||||||
2
make.sh
Executable file
2
make.sh
Executable file
@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
exec make VDRDIR=/usr/include/vdr LIBDIR=. "$@"
|
||||||
1421
po/de_DE.po
1421
po/de_DE.po
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file ringbuffer.c @brief Ringbuffer module
|
/// @file ringbuffer.c @brief Ringbuffer module
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2009, 2011, 2014 by Johns. All Rights Reserved.
|
/// Copyright (c) 2009, 2011 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
@ -30,7 +30,8 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "iatomic.h"
|
#include <alsa/iatomic.h>
|
||||||
|
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
|
|
||||||
/// ring buffer structure
|
/// ring buffer structure
|
||||||
|
|||||||
1466
softhddev.c
1466
softhddev.c
File diff suppressed because it is too large
Load Diff
25
softhddev.h
25
softhddev.h
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file softhddev.h @brief software HD device plugin header file.
|
/// @file softhddev.h @brief software HD device plugin header file.
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2011 - 2015 by Johns. All Rights Reserved.
|
/// Copyright (c) 2011 - 2012 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
@ -25,8 +25,7 @@ extern "C"
|
|||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
/// C callback feed key press
|
/// C callback feed key press
|
||||||
extern void FeedKeyPress(const char *, const char *, int, int,
|
extern void FeedKeyPress(const char *, const char *, int, int);
|
||||||
const char *);
|
|
||||||
|
|
||||||
/// C plugin get osd size and ascpect
|
/// C plugin get osd size and ascpect
|
||||||
extern void GetOsdSize(int *, int *, double *);
|
extern void GetOsdSize(int *, int *, double *);
|
||||||
@ -34,8 +33,7 @@ extern "C"
|
|||||||
/// C plugin close osd
|
/// C plugin close osd
|
||||||
extern void OsdClose(void);
|
extern void OsdClose(void);
|
||||||
/// C plugin draw osd pixmap
|
/// C plugin draw osd pixmap
|
||||||
extern void OsdDrawARGB(int, int, int, int, int, const uint8_t *, int,
|
extern void OsdDrawARGB(int, int, int, int, const uint8_t *);
|
||||||
int);
|
|
||||||
|
|
||||||
/// C plugin play audio packet
|
/// C plugin play audio packet
|
||||||
extern int PlayAudio(const uint8_t *, int, uint8_t);
|
extern int PlayAudio(const uint8_t *, int, uint8_t);
|
||||||
@ -43,8 +41,6 @@ extern "C"
|
|||||||
extern int PlayTsAudio(const uint8_t *, int);
|
extern int PlayTsAudio(const uint8_t *, int);
|
||||||
/// C plugin set audio volume
|
/// C plugin set audio volume
|
||||||
extern void SetVolumeDevice(int);
|
extern void SetVolumeDevice(int);
|
||||||
/// C plugin reset channel id (restarts audio)
|
|
||||||
extern void ResetChannelId(void);
|
|
||||||
|
|
||||||
/// C plugin play video packet
|
/// C plugin play video packet
|
||||||
extern int PlayVideo(const uint8_t *, int);
|
extern int PlayVideo(const uint8_t *, int);
|
||||||
@ -57,8 +53,6 @@ extern "C"
|
|||||||
extern int SetPlayMode(int);
|
extern int SetPlayMode(int);
|
||||||
/// C plugin get current system time counter
|
/// C plugin get current system time counter
|
||||||
extern int64_t GetSTC(void);
|
extern int64_t GetSTC(void);
|
||||||
/// C plugin get video stream size and aspect
|
|
||||||
extern void GetVideoSize(int *, int *, double *);
|
|
||||||
/// C plugin set trick speed
|
/// C plugin set trick speed
|
||||||
extern void TrickSpeed(int);
|
extern void TrickSpeed(int);
|
||||||
/// C plugin clears all video and audio data from the device
|
/// C plugin clears all video and audio data from the device
|
||||||
@ -99,19 +93,6 @@ extern "C"
|
|||||||
|
|
||||||
/// Get decoder statistics
|
/// Get decoder statistics
|
||||||
extern void GetStats(int *, int *, int *, int *);
|
extern void GetStats(int *, int *, int *, int *);
|
||||||
/// C plugin scale video
|
|
||||||
extern void ScaleVideo(int, int, int, int);
|
|
||||||
|
|
||||||
/// Set Pip position
|
|
||||||
extern void PipSetPosition(int, int, int, int, int, int, int, int);
|
|
||||||
/// Pip start
|
|
||||||
extern void PipStart(int, int, int, int, int, int, int, int);
|
|
||||||
/// Pip stop
|
|
||||||
extern void PipStop(void);
|
|
||||||
/// Pip play video packet
|
|
||||||
extern int PipPlayVideo(const uint8_t *, int);
|
|
||||||
|
|
||||||
extern const char *X11DisplayName; ///< x11 display name
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
1572
softhddevice.cpp
1572
softhddevice.cpp
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file softhddevice.h @brief software HD device plugin header file.
|
/// @file softhddevice.h @brief software HD device plugin header file.
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2011, 2014 by Johns. All Rights Reserved.
|
/// Copyright (c) 2011 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
|
|||||||
@ -23,8 +23,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define ATMO_GRAB_SERVICE "SoftHDDevice-AtmoGrabService-v1.0"
|
#define ATMO_GRAB_SERVICE "SoftHDDevice-AtmoGrabService-v1.0"
|
||||||
#define ATMO1_GRAB_SERVICE "SoftHDDevice-AtmoGrabService-v1.1"
|
|
||||||
#define OSD_3DMODE_SERVICE "SoftHDDevice-Osd3DModeService-v1.0"
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{ GRAB_IMG_RGBA_FORMAT_B8G8R8A8 };
|
{ GRAB_IMG_RGBA_FORMAT_B8G8R8A8 };
|
||||||
@ -44,22 +42,3 @@ typedef struct
|
|||||||
int height;
|
int height;
|
||||||
void *img;
|
void *img;
|
||||||
} SoftHDDevice_AtmoGrabService_v1_0_t;
|
} SoftHDDevice_AtmoGrabService_v1_0_t;
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int Mode;
|
|
||||||
} SoftHDDevice_Osd3DModeService_v1_0_t;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
// request/reply data
|
|
||||||
|
|
||||||
int width;
|
|
||||||
int height;
|
|
||||||
|
|
||||||
// reply data
|
|
||||||
|
|
||||||
int size;
|
|
||||||
|
|
||||||
void *img;
|
|
||||||
} SoftHDDevice_AtmoGrabService_v1_1_t;
|
|
||||||
|
|||||||
@ -1,73 +1,75 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
# $Header: $
|
# $Header: $
|
||||||
|
|
||||||
EAPI="5"
|
EAPI="3"
|
||||||
|
|
||||||
inherit vdr-plugin-2 git-2
|
inherit eutils vdr-plugin
|
||||||
|
|
||||||
RESTRICT="test"
|
if [[ ${PV} == "9999" ]] ; then
|
||||||
|
inherit git-2
|
||||||
|
EGIT_REPO_URI="git://projects.vdr-developer.org/vdr-plugin-softhddevice.git"
|
||||||
|
else
|
||||||
|
SRC_URI="http://projects.vdr-developer.org/attachments/download/838/${P}.tgz"
|
||||||
|
fi
|
||||||
|
|
||||||
EGIT_REPO_URI="git://projects.vdr-developer.org/vdr-plugin-softhddevice.git"
|
|
||||||
KEYWORDS=""
|
|
||||||
|
|
||||||
DESCRIPTION="VDR Plugin: Software and GPU emulated HD output device"
|
DESCRIPTION="A software and GPU emulated HD output device plugin for VDR."
|
||||||
HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-softhddevice"
|
HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-softhddevice"
|
||||||
|
SRC_URI=""
|
||||||
|
|
||||||
LICENSE="AGPL-3"
|
LICENSE="AGPL-3"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
IUSE="alsa +debug opengl oss vaapi vdpau xscreensaver"
|
KEYWORDS="~x86 ~amd64"
|
||||||
|
IUSE="vaapi vdpau alsa oss yaepg opengl jpeg"
|
||||||
|
|
||||||
RDEPEND=">=media-video/vdr-2
|
DEPEND=">=x11-libs/libxcb-1.8
|
||||||
x11-libs/libX11
|
x11-libs/xcb-util
|
||||||
>=x11-libs/libxcb-1.8
|
x11-libs/xcb-util-wm
|
||||||
x11-libs/xcb-util-wm
|
x11-libs/xcb-util-keysyms
|
||||||
x11-libs/xcb-util-keysyms
|
x11-libs/xcb-util-renderutil
|
||||||
x11-libs/xcb-util-renderutil
|
x11-libs/libX11
|
||||||
alsa? ( media-libs/alsa-lib )
|
opengl? ( virtual/opengl )
|
||||||
opengl? ( virtual/opengl )
|
>=virtual/ffmpeg-0.7
|
||||||
vaapi? ( x11-libs/libva
|
sys-devel/gettext
|
||||||
virtual/ffmpeg[vaapi] )
|
sys-devel/make
|
||||||
vdpau? ( x11-libs/libvdpau
|
dev-util/pkgconfig
|
||||||
virtual/ffmpeg[vdpau] )"
|
yaepg? ( >=media-video/vdr-1.7.23[yaepg] )
|
||||||
DEPEND="${RDEPEND}
|
!yaepg? ( >=media-video/vdr-1.7.23 )
|
||||||
virtual/pkgconfig
|
vdpau? ( x11-libs/libvdpau )
|
||||||
x11-libs/xcb-util"
|
vaapi? ( x11-libs/libva )
|
||||||
|
alsa? ( media-libs/alsa-lib )
|
||||||
|
oss? ( sys-kernel/linux-headers )
|
||||||
|
jpeg? ( virtual/jpeg )
|
||||||
|
"
|
||||||
|
|
||||||
REQUIRED_USE="opengl? ( vaapi )
|
|
||||||
|| ( vaapi vdpau )
|
|
||||||
|| ( alsa oss )"
|
|
||||||
|
|
||||||
#VDR_CONFD_FILE="${FILESDIR}/confd-0.6.0"
|
|
||||||
#VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.6.0.sh"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
vdr-plugin-2_pkg_setup
|
|
||||||
|
|
||||||
append-cppflags -DHAVE_PTHREAD_NAME
|
|
||||||
|
|
||||||
use debug && append-cppflags -DDEBUG -DOSD_DEBUG
|
|
||||||
}
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
vdr-plugin-2_src_prepare
|
vdr-plugin_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
BUILD_PARAMS+=" ALSA=$(usex alsa 1 0)"
|
src_compile() {
|
||||||
BUILD_PARAMS+=" OPENGL=$(usex opengl 1 0)"
|
local myconf
|
||||||
BUILD_PARAMS+=" OSS=$(usex oss 1 0)"
|
|
||||||
BUILD_PARAMS+=" VAAPI=$(usex vaapi 1 0)"
|
|
||||||
BUILD_PARAMS+=" VDPAU=$(usex vdpau 1 0)"
|
|
||||||
BUILD_PARAMS+=" SCREENSAVER=$(usex xscreensaver 1 0)"
|
|
||||||
|
|
||||||
if has_version ">=media-video/ffmpeg-0.8"; then
|
myconf="-DHAVE_PTHREAD_NAME"
|
||||||
BUILD_PARAMS+=" SWRESAMPLE=1"
|
use vdpau && myconf="${myconf} -DUSE_VDPAU"
|
||||||
fi
|
use vaapi && myconf="${myconf} -DUSE_VAAPI"
|
||||||
if has_version ">=media-video/libav-0.8"; then
|
use alsa && myconf="${myconf} -DUSE_ALSA"
|
||||||
BUILD_PARAMS+=" AVRESAMPLE=1"
|
use oss && myconf="${myconf} -DUSE_OSS"
|
||||||
fi
|
use jpeg && myconf="${myconf} -DUSE_JPEG"
|
||||||
|
|
||||||
|
emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
|
||||||
|
LDFLAGS="${LDFLAGS}" CONFIG="${myconf}" LIBDIR="." || die
|
||||||
}
|
}
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
vdr-plugin-2_src_install
|
vdr-plugin_src_install
|
||||||
|
|
||||||
nonfatal dodoc ChangeLog Todo
|
dodoc README.txt
|
||||||
|
|
||||||
|
#dodir /etc/vdr/plugins || die
|
||||||
|
#insinto /etc/vdr/plugins
|
||||||
|
#fowners -R vdr:vdr /etc/vdr || die
|
||||||
|
|
||||||
|
#insinto /etc/conf.d
|
||||||
|
#doins vdr.softhddevice
|
||||||
}
|
}
|
||||||
|
|||||||
68
video.h
68
video.h
@ -1,7 +1,7 @@
|
|||||||
///
|
///
|
||||||
/// @file video.h @brief Video module header file
|
/// @file video.h @brief Video module header file
|
||||||
///
|
///
|
||||||
/// Copyright (c) 2009 - 2015 by Johns. All Rights Reserved.
|
/// Copyright (c) 2009 - 2012 by Johns. All Rights Reserved.
|
||||||
///
|
///
|
||||||
/// Contributor(s):
|
/// Contributor(s):
|
||||||
///
|
///
|
||||||
@ -30,35 +30,31 @@
|
|||||||
/// Video hardware decoder typedef
|
/// Video hardware decoder typedef
|
||||||
typedef struct _video_hw_decoder_ VideoHwDecoder;
|
typedef struct _video_hw_decoder_ VideoHwDecoder;
|
||||||
|
|
||||||
/// Video output stream typedef
|
|
||||||
typedef struct __video_stream__ VideoStream;
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// Variables
|
// Variables
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
extern signed char VideoHardwareDecoder; ///< flag use hardware decoder
|
extern char VideoHardwareDecoder; ///< flag use hardware decoder
|
||||||
extern char VideoIgnoreRepeatPict; ///< disable repeat pict warning
|
extern char VideoIgnoreRepeatPict; ///< disable repeat pict warning
|
||||||
extern int VideoAudioDelay; ///< audio/video delay
|
extern int VideoAudioDelay; ///< audio/video delay
|
||||||
extern char ConfigStartX11Server; ///< flag start the x11 server
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// Prototypes
|
// Prototypes
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
/// Allocate new video hardware decoder.
|
/// Allocate new video hardware decoder.
|
||||||
extern VideoHwDecoder *VideoNewHwDecoder(VideoStream *);
|
extern VideoHwDecoder *VideoNewHwDecoder(void);
|
||||||
|
|
||||||
/// Deallocate video hardware decoder.
|
/// Deallocate video hardware decoder.
|
||||||
extern void VideoDelHwDecoder(VideoHwDecoder *);
|
extern void VideoDelHwDecoder(VideoHwDecoder *);
|
||||||
|
|
||||||
#ifdef LIBAVCODEC_VERSION
|
|
||||||
/// Get and allocate a video hardware surface.
|
/// Get and allocate a video hardware surface.
|
||||||
extern unsigned VideoGetSurface(VideoHwDecoder *, const AVCodecContext *);
|
extern unsigned VideoGetSurface(VideoHwDecoder *);
|
||||||
|
|
||||||
/// Release a video hardware surface
|
/// Release a video hardware surface
|
||||||
extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);
|
extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);
|
||||||
|
|
||||||
|
#ifdef LIBAVCODEC_VERSION
|
||||||
/// Callback to negotiate the PixelFormat.
|
/// Callback to negotiate the PixelFormat.
|
||||||
extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
|
extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
|
||||||
const enum PixelFormat *);
|
const enum PixelFormat *);
|
||||||
@ -67,8 +63,8 @@ extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
|
|||||||
extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *,
|
extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *,
|
||||||
const AVFrame *);
|
const AVFrame *);
|
||||||
|
|
||||||
/// Get hwaccel context for ffmpeg.
|
/// Get ffmpeg vaapi context.
|
||||||
extern void *VideoGetHwAccelContext(VideoHwDecoder *);
|
extern struct vaapi_context *VideoGetVaapiContext(VideoHwDecoder *);
|
||||||
|
|
||||||
#ifdef AVCODEC_VDPAU_H
|
#ifdef AVCODEC_VDPAU_H
|
||||||
/// Draw vdpau render state.
|
/// Draw vdpau render state.
|
||||||
@ -86,9 +82,6 @@ extern void VideoDisplayWakeup(void);
|
|||||||
/// Set video device.
|
/// Set video device.
|
||||||
extern void VideoSetDevice(const char *);
|
extern void VideoSetDevice(const char *);
|
||||||
|
|
||||||
/// Get video driver name.
|
|
||||||
extern const char *VideoGetDriverName(void);
|
|
||||||
|
|
||||||
/// Set video geometry.
|
/// Set video geometry.
|
||||||
extern int VideoSetGeometry(const char *);
|
extern int VideoSetGeometry(const char *);
|
||||||
|
|
||||||
@ -101,29 +94,14 @@ extern void VideoSetSoftStartSync(int);
|
|||||||
/// Set show black picture during channel switch.
|
/// Set show black picture during channel switch.
|
||||||
extern void VideoSetBlackPicture(int);
|
extern void VideoSetBlackPicture(int);
|
||||||
|
|
||||||
/// Set brightness adjustment.
|
|
||||||
extern void VideoSetBrightness(int);
|
|
||||||
|
|
||||||
/// Set contrast adjustment.
|
|
||||||
extern void VideoSetContrast(int);
|
|
||||||
|
|
||||||
/// Set saturation adjustment.
|
|
||||||
extern void VideoSetSaturation(int);
|
|
||||||
|
|
||||||
/// Set hue adjustment.
|
|
||||||
extern void VideoSetHue(int);
|
|
||||||
|
|
||||||
/// Set video output position.
|
/// Set video output position.
|
||||||
extern void VideoSetOutputPosition(VideoHwDecoder *, int, int, int, int);
|
extern void VideoSetOutputPosition(int, int, int, int);
|
||||||
|
|
||||||
/// Set video mode.
|
/// Set video mode.
|
||||||
extern void VideoSetVideoMode(int, int, int, int);
|
extern void VideoSetVideoMode(int, int, int, int);
|
||||||
|
|
||||||
/// Set 4:3 display format.
|
/// Set display format.
|
||||||
extern void VideoSet4to3DisplayFormat(int);
|
extern void VideoSetDisplayFormat(int);
|
||||||
|
|
||||||
/// Set other display format.
|
|
||||||
extern void VideoSetOtherDisplayFormat(int);
|
|
||||||
|
|
||||||
/// Set video fullscreen mode.
|
/// Set video fullscreen mode.
|
||||||
extern void VideoSetFullscreen(int);
|
extern void VideoSetFullscreen(int);
|
||||||
@ -168,8 +146,7 @@ extern void VideoSetAutoCrop(int, int, int);
|
|||||||
extern void VideoOsdClear(void);
|
extern void VideoOsdClear(void);
|
||||||
|
|
||||||
/// Draw an OSD ARGB image.
|
/// Draw an OSD ARGB image.
|
||||||
extern void VideoOsdDrawARGB(int, int, int, int, int, const uint8_t *, int,
|
extern void VideoOsdDrawARGB(int, int, int, int, const uint8_t *);
|
||||||
int);
|
|
||||||
|
|
||||||
/// Get OSD size.
|
/// Get OSD size.
|
||||||
extern void VideoGetOsdSize(int *, int *);
|
extern void VideoGetOsdSize(int *, int *);
|
||||||
@ -177,9 +154,6 @@ extern void VideoGetOsdSize(int *, int *);
|
|||||||
/// Set OSD size.
|
/// Set OSD size.
|
||||||
extern void VideoSetOsdSize(int, int);
|
extern void VideoSetOsdSize(int, int);
|
||||||
|
|
||||||
/// Set Osd 3D Mode
|
|
||||||
extern void VideoSetOsd3DMode(int);
|
|
||||||
|
|
||||||
/// Set video clock.
|
/// Set video clock.
|
||||||
extern void VideoSetClock(VideoHwDecoder *, int64_t);
|
extern void VideoSetClock(VideoHwDecoder *, int64_t);
|
||||||
|
|
||||||
@ -204,28 +178,14 @@ extern uint8_t *VideoGrabService(int *, int *, int *);
|
|||||||
/// Get decoder statistics.
|
/// Get decoder statistics.
|
||||||
extern void VideoGetStats(VideoHwDecoder *, int *, int *, int *, int *);
|
extern void VideoGetStats(VideoHwDecoder *, int *, int *, int *, int *);
|
||||||
|
|
||||||
/// Get video stream size
|
|
||||||
extern void VideoGetVideoSize(VideoHwDecoder *, int *, int *, int *, int *);
|
|
||||||
|
|
||||||
extern void VideoOsdInit(void); ///< Setup osd.
|
extern void VideoOsdInit(void); ///< Setup osd.
|
||||||
extern void VideoOsdExit(void); ///< Cleanup osd.
|
extern void VideoOsdExit(void); ///< Cleanup osd.
|
||||||
|
|
||||||
extern void VideoInit(const char *); ///< Setup video module.
|
extern void VideoInit(const char *); ///< Setup video module.
|
||||||
extern void VideoExit(void); ///< Cleanup and exit video module.
|
extern void VideoExit(void); ///< Cleanup and exit video module.
|
||||||
|
|
||||||
/// Poll video input buffers.
|
extern int VideoPollInput(void); ///< Poll video input buffers.
|
||||||
extern int VideoPollInput(VideoStream *);
|
extern int VideoDecodeInput(void); ///< Decode video input buffers.
|
||||||
|
extern int VideoGetBuffers(void); ///< Get number of input buffers.
|
||||||
/// Decode video input buffers.
|
|
||||||
extern int VideoDecodeInput(VideoStream *);
|
|
||||||
|
|
||||||
/// Get number of input buffers.
|
|
||||||
extern int VideoGetBuffers(const VideoStream *);
|
|
||||||
|
|
||||||
/// Set DPMS at Blackscreen switch
|
|
||||||
extern void SetDPMSatBlackScreen(int);
|
|
||||||
|
|
||||||
/// Raise the frontend window
|
|
||||||
extern int VideoRaiseWindow(void);
|
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user