Release Version 0.5.0.

Use config value to change audio/video delay.
Change audio/video delay with hot-key.
2023-10-10 17:16:51 +00:00 · 2012-04-07 20:21:55 +02:00 · 2012-04-07 13:43:51 +02:00 · 2012-04-07 00:15:57 +02:00 · 2012-04-06 14:38:51 +02:00 · 2012-04-05 22:51:20 +02:00
15 changed files with 12373 additions and 2886 deletions
--- a/301
+++ b/301
@@ -1,4 +1,305 @@
 User johns
+Date: Sat Apr  7 20:21:16 CEST 2012
+
+    Release Version 0.5.0
+    Change audio/video delay with hot-key.
+    Enable/disable/toggle fullscreen with hot-key (Feature #930).
+
+User: CafeDelMar
+Date: Thu Apr  5 22:44:06 CEST 2012
+
+    Cutting pixels are now configured for each resolution.
+
+User johns
+Date: Thu Apr 5 15:47:59 CEST 2012
+
+    Buffer less video and audio.
+    Fix 100% cpu use, with mp3 plugin.
+    Audio/Video sync rewrite, trick-speed support moved to video.
+    Faster VdpauBlackSurface version.
+    Fix bug: VideoSetPts wrong position for multi frame packets.
+
+User: CafeDelMar
+Date: Mon Mar 26 20:45:54 CEST 2012
+
+    Add VideoSkipPixels support.
+
+User johns
+Date: Fri Mar 23 18:43:20 CET 2012
+
+    Add optional argument (display) to ATTA svdrp commmand.
+    Wakeup display to show OSD for remote learning mode.
+    Support switching the primary device with svdrp.
+    Disable and reenable screen saver and DPMS.
+    Video source code cleanup.
+    Fix fast backward with some h264 streams.
+    Make soft start sync setup menu configurable.
+    Fix bug: StillPicture NAL end of sequence is 10 and not 0x10.
+    Fix bug: AudioEnqueue crash without sound card.
+
+User johns
+Date: Sun Mar  4 22:35:36 CET 2012
+
+    Release Version 0.4.9
+    Experimental ac3 audio drift correction support.
+    Removes LPCM detection from TS parser.
+    Rewrote video/audio start code.
+    Add support for attach/detach plugin.
+    OSS needs bigger audio buffers.
+    Improved audio drift correction support.
+    Experimental audio drift correction support.
+    Add SVDRP HOTK command support.
+    Increased audio buffer time for PES packets.
+    Support configuration and set of video background.
+    Survive lost X11 display.
+    Fix bug: 100% cpu use with plugins like mp3.
+    Wakeup display thread on channel switch, osd can now be shown without
+    video.
+    Makes 60Hz display mode configurable with setup.conf.
+    Support downmix of AC-3 to stero.
+    New audio PES packet parser.
+    Fix bug: Grabbing a JPG image fails while suspended.
+    Add support for hot keys.
+    Add support to use characters input in edit mode.
+    Adds trick speed support.
+
+User johns
+Date: Thu Feb 16 09:59:14 CET 2012
+
+    Release Version 0.4.8
+    Fix bug: wrong start of video packet.
+    VDPAU: Enables inverse telecine configuration.
+    Find AC3 (Dolby Digital) inside PES packet.
+    Fix bug: audio increments invalid audio PTS.
+    Fix bug: dvd plugin not working.
+    Fix bug: used frame-> instead of video_ctx-> for old libav/ffmpeg.
+
+User johns
+Date: Mon Feb 13 23:20:26 CET 2012
+
+    Release Version 0.4.7
+
+User FireFly
+Date: Mon Feb 13 20:14:11 CET 2012
+
+    Fix bug: unscaled jpeg includes PNG header.
+
+User johns
+Date: Mon Feb 13 14:58:26 CET 2012
+
+    VDPAU: Studio levels could be configured in the setup menu.
+    Window size defaults to fullscreen, if no geometry is given.
+
+User m.Rcu
+Date: Sun Feb 12 20:28:22 CET 2012
+
+    Jpeg screengrab use VDR RgbToJpeg function.
+
+User johns
+Date: Sun Feb 12 20:14:43 CET 2012
+
+    Add play/pause audio support.
+    Fix bug: audible glitch when switching AC-3 pass-through <-> none.
+    Fix bug: mpeg stills not displayed.
+    Detect audio stream type only after stream switch.
+    Detect more h264 streams with leading zeros.
+    VDPAU: support for studio levels added.
+    Add support for skip chroma deinterlace to software deinterlacer.
+    Type of software deinterlacer now configurable from setup menu.
+    Mixer channel could be set through command line option.
+    Fix bug: LFE moved to wrong position.
+    Guard suspend/resume against multiple calls.
+    Add support for AAC LATM audio streams.
+    Fix bug: alsa and ffmpeg use different channel layout.
+    Support more LPCM sample rates and number of channels.
+    Quick&dirty support for mpeg LPCM streams.
+    Workaround for text2skin undrawn OSD areas.
+    Detect dvb LPCM stream and ignore it.
+
+User johns
+Date: Thu Feb  2 23:29:35 CET 2012
+
+    Release Version 0.4.6
+    Warn only on the first duplicated frame in sequence.
+    Increase audio buffer, if bigger audio delay is used.
+    Makes SkipLines configure in setup menu.
+    Auto-crop only enabled with normal 4:3 display mode.
+    Vaapi updates OSD when cropping changes.
+    Add A-V info output and compile time option.
+    Fix bug: VA-API intel software decoder broken by aspect commit.
+    Add support for 4:3 output modes.
+    Quicker auto-crop after channel switch.
+    Add auto-crop support for Intel VA-API backend.
+    Fix bug: Auto-Crop logo skip didn't use displayed width.
+    Workaround for mpeg2 FFMpeg + VA-API + Intel GPU hung.
+    Fix bug: Missing vaSyncSurface and vaDestroyImage.
+    Fix bug: Only black picture with VA-API hw decoder.
+
+User HelAu
+Date: Mon Jan 30 16:54:47 CET 2012
+
+    Add support to start the plugin in suspended mode.
+
+User johns
+Date: Mon Jan 30 15:58:21 CET 2012
+
+    Finished rewrite of video code, to support output modules.
+    Add aspect change support to software decoder path.
+    Repair software decoder with vaapi vdpau backend.
+    Add workaround for Intel VA-API MPEG GPU hung.
+
+User johns
+Date: Sat Jan 28 13:32:12 CET 2012
+
+    Release Version 0.4.5
+    Add configurable skip lines at video top and bottom.
+    Add auto-crop tolerance configuration.
+    Reduces audio latency, increases audio buffer time.
+    Made video_test working again.
+    Disabled VA-API Intel vaAssociateSubpicture workaround.
+    Fix bug: Must release lock for VideoPollEvent.
+    Allow faster video and audio sync.
+    Fix bug: Software decoder use vaPutImage with intel backend.
+    Fix bug: Artefacts are shown after mpeg2 channel switch.
+    Fix bug: VideoReleaseSurface called after VideoExit.
+    Support external players.
+    Add VDPAU display preemption support.
+
+User m.Rcu
+Date: Tue Jan 24 22:38:30 CET 2012
+
+    Add support for grab jpeg image.
+
+User johns
+Date: Tue Jan 24 22:25:33 CET 2012
+
+    Fix bug: VaapiOsdExit doesn't deassociate osd surface.
+    Fix bug: First OSD can show random pixels.
+    Wait for X11 exit and kill it, if not.
+    Fix still picture handling.
+    Fix for dead-lock in VdpauExit.
+    Workaround for dead-lock in VdpauExit.
+    VDPAU: Add very primitive software scaler for grab image.
+    VA-API: Add auto-crop support.
+    Suspend can close/open X11 window, connection and audio device.
+
+User Morone
+Date: Sun Jan 22 16:43:23 CET 2012
+
+    Use different alsa devices for AC3/pass-through and pcm.
+
+User johns
+Date: Sun Jan 22 11:12:57 CET 2012
+
+    Add dummy player and control for suspend mode.
+    Buffertime compile time configurable in ms.
+
+Date: Sat Jan 21 15:49:16 CET 2012
+
+    Release Version 0.4.0
+    VDPAU: Add grab image support.
+    VDPAU: Add auto-crop support.
+    VDPAU: Changed OSD alpha calculation.
+    Fix bug: Used VideoSharpen for denoise settings.
+    Instant update deinterlace/... configuration changes.
+    Fix bug: AudioExit called without AudioInit crash.
+
+Date: Thu Jan 19 15:58:40 CET 2012
+
+    Release Version 0.3.5
+    OSD improvements:
+    Use OSD size equal to video window.
+    Update only dirty area(s) of OSD.
+    Show/mix only used area of OSD.
+    Fix bug: vpdau use previous resolution for deint, ...
+    Fix software deinterlace with VA-API.
+    Fix bug: transposed digits 567 should be 576.
+    Audio module cleanup:
+    Alsa + OSS can be included/build at the same time.
+    Alsa or OSS can be runtime selected with -a.
+    Add audio thread support to OSS module.
+    Add polled audio support to alsa module.
+    Removed some debug source code.
+
+Date: Sun Jan 15 16:56:04 CET 2012
+
+    Release Version 0.3.1
+    Fix bug: AudioFreeBytes didn't check if audio running/compiled.
+    Fix bug: snd_pcm_state: Assertion `pcm' failed.
+    Add support for fullscreen and fullscreen toogle.
+    Instant update deinterlace configuration changes.
+    Fix subtitle position.
+    Add SVDRP support.
+    Suspend when user is inactive.
+
+User Christian Rupper
+Date: Tue Jan 10 22:33:14 CET 2012
+
+    Move objects before $LIBS to avoid link failures with --as-needed.
+    Do not override CFLAGS for video test.
+    Rearrange *FLAGS incl. some minor fixes.
+    Don't override VDRDIR, LIBDIR and TMPDIR in makefile.
+    Don't abuse LDFLAGS in makefile.
+    Define CC in makefile.
+    Include GL/gl.h for the GL_COLOR_BUFFER_BIT definition.
+    VideoInit() needs an argument.
+
+User johns
+Date: Tue Jan 10 22:32:50 CET 2012
+
+    Add main menu entry, which suspends the plugin.
+    Add support for resize window.
+    Close window sends "close" as remote key press.
+
+Date: Mon Jan  9 22:09:38 CET 2012
+
+    Release Version 0.3.0
+    Add support of resolution dependend video parameters (deint, scale, ...).
+    Add support for recording play back.
+    Add workaround for alsa crash in snd_pcm_prepare.
+    Fix bug: audio crash on exit.
+    Fix build with vdr without yaepg support.
+    Support yaepghd video picture output position change.
+
+Date: Sat Jan  7 13:20:07 CET 2012
+
+    Release Version 0.2.0
+    Add support for ac3 audio pass through.
+    Add workaround for alsa not playing hdmi sound.
+    Fix bug: broken device plugin stop and exit.
+    Show transparent cursor to hide cursor.
+    VDPAU: Add color standard support.
+    VDPAU: Add denoise and sharpness support.
+    VDPAU: Add skip chroma deinterlace support.
+    VDPAU: Show OSD only if something is to display, improves performance.
+    VDPAU: Add deinterlace with only 4 surfaces.
+
+Date: Thu Jan 4 17:00:00 CET 2012
+
+    Release Version 0.1.5
+    Adds OSS mixer support.
+    Fix bug: audio new stream is not thread safe.
+    New audio driver OSS.
+    Fix bug: needed down sampling of 3/5/6 to 2 channels not reported.
+    Search audio sync inside PES packets, for insane dvb streams.
+    Use only the needed number of surfaces.
+
+Date: Thu Dec 29 19:44:43 CET 2011
+
+    Release Version 0.1.4
+    Prepared vdpau noise reduction support.
+    Vdpau also displays a black surface, when no video is available.
+    Fix bug: CodecVideoDecode destroys avpkt.
+
+Date: Thu Dec 29 00:55:57 CET 2011
+
+    Release Version 0.1.3
+    Add missing VdpauDecoderDestroy.
+    Cleanup video packet ringbuffer.
+    Allow build without VDPAU.
+    Fix bug: swapped end and start.
+    Support other than "PCM" alsa mixer channels.
+
 Date: Sat Dec 24 15:26:27 CET 2011

    Release Version 0.1.2
--- a/77
+++ b/77
@@ -14,36 +14,36 @@ PLUGIN = softhddevice
 ### 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')
+GIT_REV = $(shell git describe --always 2>/dev/null)

 ### Configuration (edit this for your needs)

 CONFIG := #-DDEBUG
-CONFIG += $(shell pkg-config --exists libva && echo "-DUSE_VAAPI")
+#CONFIG += -DUSE_AUDIO_DRIFT_CORRECTION	# build new audio drift code
+#CONFIG += -DUSE_AC3_DRIFT_CORRECTION	# build new ac-3 drift code
+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++
-CXXFLAGS ?= -g -O2 -W -Wall -Wextra -Woverloaded-virtual -fPIC
-override CXXFLAGS += $(DEFINES) $(INCLUDES)
 CFLAGS	 ?=	-g -O2 -W -Wall -Wextra -Winit-self \
-		-Wdeclaration-after-statement -fPIC
-#CFLAGS	+=	-Werror
-override CFLAGS   +=	$(DEFINES) $(INCLUDES) \
-		$(shell pkg-config --cflags alsa libavcodec libavformat)
-override LDFLAGS  += -lrt \
-	$(shell pkg-config --libs alsa libavcodec libavformat) \
-	`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` \
-	`pkg-config --libs vdpau` \
-	`pkg-config --libs libva-x11 libva-glx libva`
+		-Wdeclaration-after-statement \
+		-ftree-vectorize -msse3 -flax-vector-conversions
+CXXFLAGS ?= -g -O2 -W -Wall -Wextra -Werror=overloaded-virtual

 ### The directory environment:

-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp

 ### Make sure that necessary options are included:

@@ -62,11 +62,40 @@ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDI
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)

-### Includes and Defines (add further entries here):
+### Includes, Defines and dependencies (add further entries here):

 INCLUDES += -I$(VDRDIR)/include

-DEFINES += $(CONFIG) -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += $(CONFIG) -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' \
+	$(if $(GIT_REV), -DGIT_REV='"$(GIT_REV)"')
+
+_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 _CFLAGS  += -Werror
+override CXXFLAGS += $(_CFLAGS)
+override CFLAGS	  += $(_CFLAGS)
+
+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):

@@ -89,6 +118,8 @@ DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(SRCS) >$@

+$(OBJS): Makefile
+
 -include $(DEPFILE)

 ### Internationalization (I18N):
@@ -121,7 +152,7 @@ i18n: $(I18Nmsgs) $(I18Npot)
 ### Targets:

 libvdr-$(PLUGIN).so: $(OBJS) Makefile
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -fPIC $(OBJS) -o $@ $(LIBS)
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)

 dist: $(I18Npo) clean
@@ -146,6 +177,6 @@ indent:
 		indent $$i; unexpand -a $$i > $$i.up; mv $$i.up $$i; \
 	done

-video_test: video.c
-	$(CC) -DVIDEO_TEST -DVERSION='"$(VERSION)"' $(CFLAGS) $(LDFLAGS) $(LIBS) \
-	-O0 -g -o $@ $<
+video_test: video.c Makefile
+	$(CC) -DVIDEO_TEST -DVERSION='"$(VERSION)"' $(CFLAGS) $(LDFLAGS) $< $(LIBS) \
+	-o $@
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
@file README.txt		@brief A software HD output device for VDR

-Copyright (c) 2011 by Johns.  All Rights Reserved.
+Copyright (c) 2011, 2012 by Johns.  All Rights Reserved.

 Contributor(s):

@@ -20,14 +20,25 @@ $Id$

 A software and GPU emulated HD output device plugin for VDR.

-    o Video VA-API/VA-API
-    o planned: Video VA-API/Opengl
-    o planned: Video CPU/Xv
-    o planned: Video CPU/Opengl
-    o planned: Software Deinterlacer
-    o Audio FFMpeg/Analog
-    o Audio FFMpeg/Digital
-    o planned: HDMI/SPDIF Passthrough
+    o Video decoder CPU / VA-API / VDPAU
+    o Video output VA-API / VDPAU
+    o Audio FFMpeg / Alsa / Analog
+    o Audio FFMpeg / Alsa / Digital
+    o Audio FFMpeg / OSS / Analog
+    o HDMI/SPDIF pass-through
+    o YaepgHD support
+    o Software deinterlacer Bob (VA-API only)
+    o Autocrop
+    o Grab image (VDPAU only)
+    o Suspend
+    o Letterbox, Stretch and Center cut-out video display modes
+
+    o planned: Video decoder VA-API Branch: vaapi-ext/staging
+    o planned: Video output XvBA / Opengl / Xv
+    o planned: VA-API grab image
+    o planned: Improved Software Deinterlacer (yadif or/and ffmpeg filters)
+    o planned: software volume, software channel resample
+    o planned: atmo light support

 To compile you must have the 'requires' installed.

@@ -54,46 +65,212 @@ Install:
 	    http://projects.vdr-developer.org/projects/plg-softhddevice/files

 	tar vxf vdr-softhddevice-*.tar.bz2
-	cd vdr-softhddevice
+	cd softhddevice-*
 	make VDRDIR=<path-to-your-vdr-files> LIBDIR=.

+	You can edit Makefile to enable/disable VDPAU / VA-API / Alsa / OSS
+	support.
+
 Setup:	environment
+------
 	Following is supported:

 	DISPLAY=:0.0
 		x11 display name
+	NO_HW=1
+		if set don't use the hardware decoders
+	NO_MPEG_HW=1
+		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
 	ALSA_DEVICE=default
 		alsa PCM device name
+	ALSA_AC3_DEVICE=
+		alsa AC3/pass-though device name
 	ALSA_MIXER=default
 		alsa control device name
 	ALSA_MIXER_CHANNEL=PCM
 		alsa control channel name

-Setup: /etc/vdr/setup.conf
-	Following is supported:
+    only if oss is configured
+	OSS_AUDIODEV=/dev/dsp
+		oss dsp device name
+	OSS_AC3_AUDIODEV=
+		oss AC3/pass-though device name
+	OSS_MIXERDEV=/dev/mixer
+		oss mixer device name
+	OSS_MIXER_CHANNEL=pcm
+		oss mixer channel name

-	softhddevice.Deinterlace = 0
-	0 = bob, 1 = weave, 2 = temporal, 3 = temporal_spatial, 4 = software
-	(only 0, 1 supported)
+Setup: /etc/vdr/setup.conf
+------
+	Following is supported:

 	softhddevice.MakePrimary = 1
 	0 = no change, 1 make softhddevice primary at start

-	softhddevice.Scaling = 0
+	softhddevice.HideMainMenuEntry = 0
+	0 = show softhddevice main menu entry, 1 = hide entry
+
+	<res> of the next parameters is 576i, 720p, 1080i_fake or 1080i.
+	1080i_fake is 1280x1080 or 1440x1080
+	1080i is "real" 1920x1080
+
+	softhddevice.<res>.Scaling = 0
 	0 = normal, 1 = fast, 2 = HQ, 3 = anamorphic

+	softhddevice.<res>.Deinterlace = 0
+	0 = bob, 1 = weave, 2 = temporal, 3 = temporal_spatial, 4 = software
+	(only 0, 1 supported with vaapi)
+
+	softhddevice.<res>.SkipChromaDeinterlace = 0
+	0 = disabled, 1 = enabled (for slower cards, poor qualit<69>t)
+
+	softhddevice.<res>.InverseTelecine = 0
+	0 = disabled, 1 = enabled
+
+	softhddevice.<res>.Denoise = 0
+	0 .. 1000 noise reduction level (0 off, 1000 max)
+
+	softhddevice.<res>.Sharpness = 0
+	-1000 .. 1000 noise reduction level (0 off, -1000 max blur,
+	    1000 max sharp)
+
+	softhddevice.<res>.CutTopBottom = 0
+	Cut 'n' pixels at at top and bottom of the video picture.
+
+	softhddevice.<res>.CutLeftRight = 0
+	Cut 'n' pixels at at left and right of the video picture.
+
 	softhddevice.AudioDelay = 0
 	+n or -n ms
+	delay audio or delay video
+
+	softhddevice.AudioPassthrough = 0
+	0 = none, 1 = AC-3
+
+	for AC-3 the pass-through device is used.
+
+	softhddevice.AudioDownmix = 0
+	0 = none, 1 = downmix
+	downmix AC-3 to stero.
+
+	softhddevice.AutoCrop.Interval = 0
+	0 disables auto-crop
+	n each 'n' frames auto-crop is checked.
+
+	softhddevice.AutoCrop.Delay = 0
+	if auto-crop is over 'n' intervals the same, the cropping is
+	used.
+
+	softhddevice.AutoCrop.Tolerance = 0
+	if detected crop area is too small, cut max 'n' pixels at top and
+	bottom.
+
+	softhddevice.Background = 0
+	32bit RGBA background color
+	(Red * 16777216 +  Green * 65536 + Blue * 256 + Alpha)
+	or hex RRGGBBAA
+	grey 127 * 16777216 + 127 * 65536 + 127 * 256 => 2139062016
+	in the setup menu this is entered as (24bit RGB and 8bit Alpha)
+	(Red * 65536 +  Green * 256 + Blue)
+
+	softhddevice.StudioLevels = 0
+		0 use PC levels (0-255) with vdpau.
+		1 use studio levels (16-235) with vdpau.
+
+	softhddevice.Suspend.Close = 0
+	1 suspend closes x11 window, connection and audio device.
+	(use svdrpsend plug softhddevice RESU to resume, if you have no lirc)
+
+	softhddevice.Suspend.X11 = 0
+	1 suspend stops X11 server (not working yet)
+
+	softhddevice.60HzMode = 0
+	0 disable 60Hz display mode
+	1 enable 60Hz display mode
+
+	softhddevice.SoftStartSync = 0
+	0 disable soft start of audio/video sync
+	1 enable soft start of audio/video sync
+
+	VideoDisplayFormat = ?
+	0 pan and scan
+	1 letter box
+	2 center cut-out
+
+Setup: /etc/vdr/remote.conf
+------
+
+	Add "XKeySym." definitions to /etc/vdr/remote.conf to control
+	the vdr and plugin with the connected input device.
+
+	fe.
+	XKeySym.Up	Up
+	XKeySym.Down	Down
+	...
+
+	Additional to the x11 input sends the window close button "Close".
+
+	fe.
+	XKeySym.Power	Close
+
+Commandline:
+------------
+
+	Use vdr -h to see the command line arguments supported by the plugin.
+
+    -a audio_device
+
+	Selects audio output module and device.
+	""		to disable audio output
+	/...		to use oss audio module (if compiled with oss
+			support)
+	other		to use alsa audio module (if compiled with alsa
+			support)
+
+SVDRP:
+------
+
+	Use 'svdrpsend.pl plug softhddevice HELP'
+	or 'svdrpsend plug softhddevice HELP' to see the SVDRP commands help
+	and which are supported by the plugin.
+
+Keymacros:
+----------
+
+	See keymacros.conf how to setup the macros.
+
+	This are the supported key sequences:
+
+	@softhddevice Blue 1 0		disable pass-through
+	@softhddevice Blue 1 1		enable pass-through
+	@softhddevice Blue 1 2		toggle pass-through
+
+Running:
+--------
+
+	Click into video window to toggle fullscreen/window mode, only if you
+	have a window manager running.
+
+Warning:
+--------
+	libav is not supported, expect many bugs with it.

 Requires:
 ---------
-	media-video/ffmpeg
+	media-video/ffmpeg (version >=0.7)
 		Complete solution to record, convert and stream audio and
 		video. Includes libavcodec.
 		http://ffmpeg.org
 	media-libs/alsa-lib
 		Advanced Linux Sound Architecture Library
 		http://www.alsa-project.org
+    or
+	kernel support for oss/oss4 or alsa oss emulation
+
 	x11-libs/libva
 		Video Acceleration (VA) API for Linux
 		http://www.freedesktop.org/wiki/Software/vaapi
@@ -104,10 +281,15 @@ Requires:
 	x11-libs/vdpau-video
 		VDPAU Backend for Video Acceleration (VA) API
 		http://www.freedesktop.org/wiki/Software/vaapi
-    or untested
+    or
 	x11-libs/xvba-video
 		XVBA Backend for Video Acceleration (VA) API
 		http://www.freedesktop.org/wiki/Software/vaapi
+
+	x11-libs/libvdpau
+		VDPAU wrapper and trace libraries
+		http://www.freedesktop.org/wiki/Software/VDPAU
+
 	x11-libs/libxcb,
 		X C-language Bindings library
 		http://xcb.freedesktop.org
@@ -116,7 +298,7 @@ Requires:
 	x11-libs/xcb-util-keysyms
 		X C-language Bindings library
 		http://xcb.freedesktop.org
-		Only versions >= 0.3.8 are supported
+		Only versions >= 0.3.8 are good supported

 	x11-libs/libX11
 		X.Org X11 library
--- a/141
+++ b/141
@@ -1,53 +1,132 @@
+@file Todo		@brief A software HD output device for VDR
+
+Copyright (c) 2011, 2012 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: $
+
 missing:
-    video out with xv
-    video out with opengl
-    software decoder for xv / opengl
-    software deinterlace
-    auto crop
-    atmolight
-    zoom/fit-zoom 4:3
-    multistream handling
+    more software deinterlace (yadif, ...)
+    more software decoder with software deinterlace
+    suspend output / energie saver: stop and restart X11
+    suspend plugin didn't restore full-screen (is this wanted?)
+    Option deinterlace off / deinterlace force!
+    ColorSpace aren't configurable with the gui.
+    works for me: restart vdr not working, when started x11 was killed.
+
+video:
+    subtitle not cleared
+    subtitle could be asyncron
+    grab image with hardware and better scaling support
+    yaepghd changed position is lost on channel switch
+    pause (live tv) has sometime problems with SAT1 HD Pro7 HD
+    radio show black background
+    radio no need to wait on video buffers
+    starting with radio and own X11 server, shows no video
+    some low-bandwidth tv channels have hiccups.

 vdpau:
-    1080i with temporal spatial too slow GT 520
-    VdpPreemptionCallback handling
-    Loose a surface
+    software decoder path not working
+
+libva:
+    yaepghd (VaapiSetOutputPosition) support
+    can associate only displayed part of osd
+    grab image for va-api
+    remove stderr output of libva init
+    still many: (workaround export NO_MPEG_HW=1)
+    [drm:i915_hangcheck_elapsed] *ERROR* Hangcheck timer elapsed... GPU hung
+    [drm:i915_wait_request] *ERROR* i915_wait_request returns -11 ...
+
+libva: branch vaapi-ext / staging
+    add support for vaapi-ext / staging

 libva-intel-driver:
-    intel still has hangups most with 1080i
-    1080i does no v-sync (workaround written)
-    osd has sometimes wrong size (workaround written)
+    deinterlace only supported with vaapi-ext
+    1080i does no v-sync (sometimes correct working with vaapi-ext)
+    OSD has sometimes wrong size (workaround written)
+    sometimes software decoder deinterlace isn't working and 1080i channels
+    show artefacts

 libva-vdpau-driver:
-    G210 osd update too slow (needs hardware problem workaround)
-    OSD update is too slow
+    G210/GT520 OSD update too slow (needs hardware problem workaround)
    hangup on exit (VaapiDelDecoder -> VaapiCleanup
 	-> vaDestroyContext -> pthread_rwlock_wrlock)
+    OSD still has some problems with auto-crop and 4:3 zoom.

 libva-xvba-driver:
-    mpeg1/2 needs software decoder fixed

 x11:
-    support resize of x11 window
-    support fullscreen window
-    support fullscreen / window toggle
-    close window should send power button
-    disable cursor
+    skip multiple configure-notify, handle only the last one.
+    support embedded mode
+
+audio:
+    Combine alsa+oss ringbuffer code.
+    Make alsa thread/polled and oss thread/polled output module runtime
+    selectable.
+    software volume support (could be done with asound.conf)
+    Mute should do a real mute and not only set volume to zero.
+    Starting suspended and muted, didn't register the mute.
+    Relaxed audio sync checks at end of packet and already in sync
+    samplerate problem resume/suspend.
+    only wait for video start, if video is running.
+    Not primary device, don't use and block audio/video.
+    multiple open of audio device, reduce them.

 audio/alsa:
-    video/audio asyncron
-    random crash in av_parser_parse2, when switching channels
+    better downmix of >2 channels on 2 channel hardware
+    remix support of unsupported sample rates
+    libav supports only resample of mono to 2 channels
+    ffmpeg didn't support resample of 5 to 2 channels

-    playback of >2 channels on 2 channel hardware
-	    done?
+audio/oss:
+    alsa oss emulation mixer "pcm" not working
+    oss4 mixer channel not working
+    ring buffer overflow with alsa oss emulation

-    on some channels it takes long time until sound can be heared.
-    this channels has packet start not at the beginning of the start packet
+HDMI/SPDIF Passthrough:
+    only AC-3 written

 playback of recording
-    play back is too fast
+    pause is not reset, when replay exit (fixed?)
+    replay/pause need 100% cpu (fixed?)
+
+plugins:
+    mp3 plugin needs 100% cpu (bad ::Poll)

 setup:
-    Setup menu parameters aren't automatic loaded?
-    Setup parameters are not used until restart.
+    Setup of decoder type.
+    Setup of output type.
+    Setup of display type.
+    Setup 4:3 zoom type
+    Some setup parameters are not used until restart.
 	Can a notice be added to the setup menu?
+
+unsorted:
+    stoping vdr while plugin is suspended opens and closes a window.
+    svdrp prim: support plugin names for device numbers.
+
+future features (not planed for 1.0 - 1.5)
+
+    video out with xv
+    video out with opengl
+    video out with xvba
+    software decoder for xv / opengl
+    atmolight support
+    multistream handling
+    pip support
+    save and use auto-crop with channel zapping
+
+    upmix stereo to AC-3 (supported by alsa plugin)
--- a/audio.c
+++ b/audio.c
--- a/audio.h
+++ b/audio.h
@@ -1,7 +1,7 @@
 ///
 ///	@file audio.h		@brief Audio module headerfile
 ///
-///	Copyright (c) 2009 - 2011 by Johns.  All Rights Reserved.
+///	Copyright (c) 2009 - 2012 by Johns.  All Rights Reserved.
 ///
 ///	Contributor(s):
 ///
@@ -28,22 +28,31 @@
 //----------------------------------------------------------------------------

 extern void AudioEnqueue(const void *, int);	///< buffer audio samples
-
-//extern int AudioFreeBytes(void);	///< free bytes in audio output
-//extern int AudioUsedBytes(void);	///< used bytes in audio output
+extern void AudioFlushBuffers(void);	///< flush audio buffers
+extern void AudioPoller(void);		///< poll audio events/handling
+extern int AudioFreeBytes(void);	///< free bytes in audio output
+extern int AudioUsedBytes(void);	///< used bytes in audio output
+extern int64_t AudioGetDelay(void);	///< get current audio delay
 extern void AudioSetClock(int64_t);	///< set audio clock base
 extern int64_t AudioGetClock();		///< get current audio clock
-
-extern uint64_t AudioGetDelay(void);	///< get current audio delay
-
-extern int AudioSetup(int *, int *);	///< setup audio output
-
-//extern void AudioPlay(void);		///< play audio
-//extern void AudioPause(void);		///< pause audio
 extern void AudioSetVolume(int);	///< set volume
+extern int AudioSetup(int *, int *, int);	///< setup audio output

-extern void AudioSetDevice(const char *);	///< set alsa PCM audio device
+extern void AudioPlay(void);		///< play audio
+extern void AudioPause(void);		///< pause audio
+
+extern void AudioSetBufferTime(int);	///< set audio buffer time
+
+extern void AudioSetDevice(const char *);	///< set PCM audio device
+extern void AudioSetDeviceAC3(const char *);	///< set pass-through device
+extern void AudioSetChannel(const char *);	///< set mixer channel
 extern void AudioInit(void);		///< setup audio module
 extern void AudioExit(void);		///< cleanup and exit audio module

+//----------------------------------------------------------------------------
+//	Variables
+//----------------------------------------------------------------------------
+
+extern char AudioAlsaDriverBroken;	///< disable broken driver message
+
 /// @}
--- a/codec.c
+++ b/codec.c
--- a/codec.h
+++ b/codec.h
@@ -1,7 +1,7 @@
 ///
 ///	@file codec.h	@brief Codec module headerfile
 ///
-///	Copyright (c) 2009 - 2011 by Johns.  All Rights Reserved.
+///	Copyright (c) 2009 - 2012 by Johns.  All Rights Reserved.
 ///
 ///	Contributor(s):
 ///
@@ -40,26 +40,41 @@ typedef struct _audio_decoder_ AudioDecoder;
    /// Allocate a new video decoder context.
 extern VideoDecoder *CodecVideoNewDecoder(VideoHwDecoder *);

-    /// Open video codec
+    /// Deallocate a video decoder context.
+extern void CodecVideoDelDecoder(VideoDecoder *);
+
+    /// Open video codec.
 extern void CodecVideoOpen(VideoDecoder *, const char *, int);

-    /// Close video codec
+    /// Close video codec.
 extern void CodecVideoClose(VideoDecoder *);

-    /// Decode a video packet
-extern void CodecVideoDecode(VideoDecoder *, AVPacket * pkt);
+    /// Decode a video packet.
+extern void CodecVideoDecode(VideoDecoder *, const AVPacket *);
+
+    /// Flush video buffers.
+extern void CodecVideoFlushBuffers(VideoDecoder *);

    /// Allocate a new audio decoder context.
 extern AudioDecoder *CodecAudioNewDecoder(void);

-    /// Open audio codec
+    /// Deallocate an audio decoder context.
+extern void CodecAudioDelDecoder(AudioDecoder *);
+
+    /// Open audio codec.
 extern void CodecAudioOpen(AudioDecoder *, const char *, int);

-    /// Close audio codec
+    /// Close audio codec.
 extern void CodecAudioClose(AudioDecoder *);

-    /// Decode an audio packet
-extern void CodecAudioDecode(AudioDecoder *, AVPacket * pkt);
+    /// Decode an audio packet.
+extern void CodecAudioDecodeOld(AudioDecoder *, const AVPacket *);
+
+    /// Decode an audio packet.
+extern void CodecAudioDecode(AudioDecoder *, const AVPacket *);
+
+    /// Flush audio buffers.
+extern void CodecAudioFlushBuffers(AudioDecoder *);

    /// Setup and initialize codec module.
 extern void CodecInit(void);
--- a/misc.h
+++ b/misc.h
@@ -1,7 +1,7 @@
 ///
 ///	@file misc.h	@brief Misc function header file
 ///
-///	Copyright (c) 2009 - 2011 by Lutz Sammer.  All Rights Reserved.
+///	Copyright (c) 2009 - 2012 by Lutz Sammer.  All Rights Reserved.
 ///
 ///	Contributor(s):
 ///		Copied from uwm.
@@ -46,24 +46,28 @@ extern int SysLogLevel;			///< how much information wanted
 //	Prototypes
 //////////////////////////////////////////////////////////////////////////////

-static inline void Debug(const int, const char *format, ...)
+static inline void Syslog(const int, const char *format, ...)
    __attribute__ ((format(printf, 2, 3)));

 //////////////////////////////////////////////////////////////////////////////
 //	Inlines
 //////////////////////////////////////////////////////////////////////////////

+#ifdef DEBUG
 #define DebugLevel 4			/// private debug level
+#else
+#define DebugLevel 0			/// private debug level
+#endif

 /**
-**	Debug output function.
+**	Syslog output function.
 **
 **	- 0	fatal errors and errors
 **	- 1	warnings
 **	- 2	info
 **	- 3	important debug and fixme's
 */
-static inline void Debug(const int level, const char *format, ...)
+static inline void Syslog(const int level, const char *format, ...)
 {
    if (SysLogLevel > level || DebugLevel > level) {
 	va_list ap;
@@ -77,22 +81,56 @@ static inline void Debug(const int level, const char *format, ...)
 /**
 **	Show error.
 */
-#define Error(fmt...)	Debug(0, fmt)
+#define Error(fmt...)	Syslog(0, fmt)

 /**
 **	Show fatal error.
 */
-#define Fatal(fmt...)	do { Error(fmt); exit(-1); } while (0)
+#define Fatal(fmt...)	do { Error(fmt); abort(); } while (0)

 /**
 **	Show warning.
 */
-#define Warning(fmt...)	Debug(1, fmt)
+#define Warning(fmt...)	Syslog(1, fmt)

 /**
 **	Show info.
 */
-#define Info(fmt...)	Debug(2, fmt)
+#define Info(fmt...)	Syslog(2, fmt)
+
+/**
+**	Show debug.
+*/
+#ifdef DEBUG
+#define Debug(level, fmt...)	Syslog(level, fmt)
+#else
+#define Debug(level, fmt...)		/* disabled */
+#endif
+
+#ifndef AV_NOPTS_VALUE
+#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
+#endif
+
+/**
+**	Nice time-stamp string.
+**
+**	@param ts	dvb time stamp
+*/
+static inline const char *Timestamp2String(int64_t ts)
+{
+    static char buf[4][16];
+    static int idx;
+
+    if (ts == (int64_t) AV_NOPTS_VALUE) {
+	return "--:--:--.---";
+    }
+    idx = (idx + 1) % 3;
+    snprintf(buf[idx], sizeof(buf[idx]), "%2d:%02d:%02d.%03d",
+	(int)(ts / (90 * 3600000)), (int)((ts / (90 * 60000)) % 60),
+	(int)((ts / (90 * 1000)) % 60), (int)((ts / 90) % 1000));
+
+    return buf[idx];
+}

 /**
 **	Get ticks in ms.
--- a/softhddev.c
+++ b/softhddev.c
--- a/softhddev.h
+++ b/softhddev.h
@@ -1,7 +1,7 @@
 ///
 ///	@file softhddev.h	@brief software HD device plugin header file.
 ///
-///	Copyright (c) 2011 by Johns.  All Rights Reserved.
+///	Copyright (c) 2011 - 2012 by Johns.  All Rights Reserved.
 ///
 ///	Contributor(s):
 ///
@@ -36,9 +36,9 @@ extern "C"
    extern void OsdDrawARGB(int, int, int, int, const uint8_t *);

    /// C plugin play audio packet
-    extern void PlayAudio(const uint8_t *, int, uint8_t);
-    /// C plugin mute audio
-    extern void Mute(void);
+    extern int PlayAudio(const uint8_t *, int, uint8_t);
+    /// C plugin play TS audio packet
+    extern int PlayTsAudio(const uint8_t *, int);
    /// C plugin set audio volume
    extern void SetVolumeDevice(int);

@@ -46,17 +46,29 @@ extern "C"
    extern int PlayVideo(const uint8_t *, int);
    /// C plugin play TS video packet
    extern void PlayTsVideo(const uint8_t *, int);
+    /// C plugin grab an image
+    extern uint8_t *GrabImage(int *, int, int, int, int);

    /// C plugin set play mode
-    extern void SetPlayMode(void);
+    extern int SetPlayMode(int);
+    /// C plugin get current system time counter
+    extern int64_t GetSTC(void);
+    /// C plugin set trick speed
+    extern void TrickSpeed(int);
    /// C plugin clears all video and audio data from the device
    extern void Clear(void);
    /// C plugin sets the device into play mode
    extern void Play(void);
    /// C plugin sets the device into "freeze frame" mode
    extern void Freeze(void);
+    /// C plugin mute audio
+    extern void Mute(void);
+    /// C plugin display I-frame as a still picture.
+    extern void StillPicture(const uint8_t *, int);
    /// C plugin poll if ready
    extern int Poll(int);
+    /// C plugin flush output buffers
+    extern int Flush(int);

    /// C plugin command line help
    extern const char *CommandLineHelp(void);
@@ -66,12 +78,18 @@ extern "C"
    /// C plugin exit + cleanup
    extern void SoftHdDeviceExit(void);
    /// C plugin start code
-    extern void Start(void);
+    extern int Start(void);
    /// C plugin stop code
    extern void Stop(void);
+    /// C plugin house keeping
+    extern void Housekeeping(void);
    /// C plugin main thread hook
    extern void MainThreadHook(void);

+    /// Suspend plugin
+    extern void Suspend(int, int, int);
+    /// Resume plugin
+    extern void Resume(void);
 #ifdef __cplusplus
 }
 #endif
--- a/softhddevice.cpp
+++ b/softhddevice.cpp
--- a/vdr-softhddevice-9999.ebuild
+++ b/vdr-softhddevice-9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit eutils vdr-plugin
+
+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
+
+
+DESCRIPTION="A software and GPU emulated HD output device plugin for VDR."
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-softhddevice"
+SRC_URI=""
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="vaapi vdpau alsa oss yaepg opengl jpeg"
+
+DEPEND=">=x11-libs/libxcb-1.8
+		x11-libs/xcb-util
+		x11-libs/xcb-util-wm
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/libX11
+		opengl? ( virtual/opengl )
+		>=virtual/ffmpeg-0.7
+		sys-devel/gettext
+		sys-devel/make
+		dev-util/pkgconfig
+		yaepg? ( >=media-video/vdr-1.7.23[yaepg] )
+		!yaepg? ( >=media-video/vdr-1.7.23 )
+		vdpau? ( x11-libs/libvdpau )
+		vaapi? ( x11-libs/libva )
+		alsa? ( media-libs/alsa-lib )
+		oss? ( sys-kernel/linux-headers )
+		jpeg? ( virtual/jpeg )
+"
+
+src_prepare() {
+		vdr-plugin_src_prepare
+}
+
+src_compile() {
+		local myconf
+
+		myconf="-DHAVE_PTHREAD_NAME"
+		use vdpau && myconf="${myconf} -DUSE_VDPAU"
+		use vaapi && myconf="${myconf} -DUSE_VAAPI"
+		use alsa && myconf="${myconf} -DUSE_ALSA"
+		use oss && myconf="${myconf} -DUSE_OSS"
+		use jpeg && myconf="${myconf} -DUSE_JPEG"
+
+		emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+			LDFLAGS="${LDFLAGS}" CONFIG="${myconf}" LIBDIR="." || die
+}
+
+src_install() {
+		vdr-plugin_src_install
+
+		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
+}
--- a/video.c
+++ b/video.c
--- a/video.h
+++ b/video.h
@@ -1,7 +1,7 @@
 ///
 ///	@file video.h	@brief Video module header file
 ///
-///	Copyright (c) 2009 - 2011 by Johns.  All Rights Reserved.
+///	Copyright (c) 2009 - 2012 by Johns.  All Rights Reserved.
 ///
 ///	Contributor(s):
 ///
@@ -34,8 +34,8 @@ typedef struct _video_hw_decoder_ VideoHwDecoder;
 //	Variables
 //----------------------------------------------------------------------------

-//extern unsigned VideoWindowWidth;	///< current video output width
-//extern unsigned VideoWindowHeight;	///< current video output height
+extern char VideoIgnoreRepeatPict;	///< disable repeat pict warning
+extern int VideoAudioDelay;		///< audio/video delay

 //----------------------------------------------------------------------------
 //	Prototypes
@@ -44,66 +44,129 @@ typedef struct _video_hw_decoder_ VideoHwDecoder;
    /// Allocate new video hardware decoder.
 extern VideoHwDecoder *VideoNewHwDecoder(void);

+    /// Deallocate video hardware decoder.
+extern void VideoDelHwDecoder(VideoHwDecoder *);
+
    /// Get and allocate a video hardware surface.
 extern unsigned VideoGetSurface(VideoHwDecoder *);

-    /// Release a video hardware surface.
+    /// Release a video hardware surface
 extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);

 #ifdef LIBAVCODEC_VERSION
-    /// Render a ffmpeg frame
-extern void VideoRenderFrame(VideoHwDecoder *, AVCodecContext *, AVFrame *);
-
-    /// Get ffmpeg vaapi context
-extern struct vaapi_context *VideoGetVaapiContext(VideoHwDecoder *);
-
    /// Callback to negotiate the PixelFormat.
 extern enum PixelFormat Video_get_format(VideoHwDecoder *, AVCodecContext *,
    const enum PixelFormat *);

+    /// Render a ffmpeg frame.
+extern void VideoRenderFrame(VideoHwDecoder *, const AVCodecContext *,
+    const AVFrame *);
+
+    /// Get ffmpeg vaapi context.
+extern struct vaapi_context *VideoGetVaapiContext(VideoHwDecoder *);
+
 #ifdef AVCODEC_VDPAU_H
-    /// Draw vdpau render state
+    /// Draw vdpau render state.
 extern void VideoDrawRenderState(VideoHwDecoder *,
    struct vdpau_render_state *);
 #endif
 #endif

-    /// Display video TEST
-extern void VideoDisplayHandler(void);
-
-    /// Poll video events
+    /// Poll video events.
 extern void VideoPollEvent(void);

-    /// set video mode
-//extern void VideoSetVideoMode(int, int, int, int);
+    /// Wakeup display handler.
+extern void VideoDisplayWakeup(void);

-    /// set video geometry
+    /// Set video device.
+extern void VideoSetDevice(const char *);
+
+    /// Set video geometry.
 extern int VideoSetGeometry(const char *);

-    /// set deinterlace
-extern void VideoSetDeinterlace(int);
+    /// Set 60Hz display mode.
+extern void VideoSet60HzMode(int);

-    /// set scaling
-extern void VideoSetScaling(int);
+    /// Set soft start audio/video sync.
+extern void VideoSetSoftStartSync(int);

-    /// set audio delay
+    /// Set video output position.
+extern void VideoSetOutputPosition(int, int, int, int);
+
+    /// Set video mode.
+extern void VideoSetVideoMode(int, int, int, int);
+
+    /// Set display format.
+extern void VideoSetDisplayFormat(int);
+
+    /// Set video fullscreen mode.
+extern void VideoSetFullscreen(int);
+
+    /// Set deinterlace.
+extern void VideoSetDeinterlace(int[]);
+
+    /// Set skip chroma deinterlace.
+extern void VideoSetSkipChromaDeinterlace(int[]);
+
+    /// Set inverse telecine.
+extern void VideoSetInverseTelecine(int[]);
+
+    /// Set scaling.
+extern void VideoSetScaling(int[]);
+
+    /// Set denoise.
+extern void VideoSetDenoise(int[]);
+
+    /// Set sharpen.
+extern void VideoSetSharpen(int[]);
+
+    /// Set cut top and bottom.
+extern void VideoSetCutTopBottom(int[]);
+
+    /// Set cut left and right.
+extern void VideoSetCutLeftRight(int[]);
+
+    /// Set studio levels.
+extern void VideoSetStudioLevels(int);
+
+    /// Set background.
+extern void VideoSetBackground(uint32_t);
+
+    /// Set audio delay.
 extern void VideoSetAudioDelay(int);

-    /// Clear OSD
+    /// Set auto-crop parameters.
+extern void VideoSetAutoCrop(int, int, int);
+
+    /// Clear OSD.
 extern void VideoOsdClear(void);

-    /// Draw an OSD ARGB image
+    /// Draw an OSD ARGB image.
 extern void VideoOsdDrawARGB(int, int, int, int, const uint8_t *);

-extern int64_t VideoGetClock(void);	///< get video clock
+    /// Get OSD size.
+extern void VideoGetOsdSize(int *, int *);

-extern void VideoOsdInit(void);		///< setup osd
-extern void VideoOsdExit(void);		///< cleanup osd
+    /// Set video clock.
+extern void VideoSetClock(VideoHwDecoder *, int64_t);

-extern void VideoInit(const char *);	///< setup video module
-extern void VideoExit(void);		///< cleanup and exit video module
+    /// Get video clock.
+extern int64_t VideoGetClock(const VideoHwDecoder *);

-extern void VideoFlushInput(void);	///< flush codec input buffers
-extern int VideoDecode(void);		///< decode
+    /// Set trick play speed.
+extern void VideoSetTrickSpeed(VideoHwDecoder *, int);
+
+    /// Grab screen.
+extern uint8_t *VideoGrab(int *, int *, int *, int);
+
+extern void VideoOsdInit(void);		///< Setup osd.
+extern void VideoOsdExit(void);		///< Cleanup osd.
+
+extern void VideoInit(const char *);	///< Setup video module.
+extern void VideoExit(void);		///< Cleanup and exit video module.
+
+extern void VideoFlushInput(void);	///< Flush video input buffers.
+extern int VideoDecode(void);		///< Decode video input buffers.
+extern int VideoGetBuffers(void);	///< Get number of input buffers.

 /// @}