frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity
78015d90fb
vdr-plugin-softhddevice/video.c

10830 lines
293 KiB
C
Raw Normal View History

C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// @file video.c @brief Video module
///
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
/// Copyright (c) 2009 - 2012 by Johns. All Rights Reserved.
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// 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$
//////////////////////////////////////////////////////////////////////////////
///
/// @defgroup Video The video module.
///
/// This module contains all video rendering functions.
///
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, ...
2012-01-18 15:15:37 +01:00
/// @todo disable screen saver support
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Uses Xlib where it is needed for VA-API or vdpau. XCB is used for
/// everything else.
///
/// - X11
/// - OpenGL rendering
/// - OpenGL rendering with GLX texture-from-pixmap
/// - Xrender rendering
///
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, ...
2012-01-18 15:15:37 +01:00
#define USE_XLIB_XCB ///< use xlib/xcb backend
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
#define USE_SCREENSAVER ///< support disable screensaver
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#define USE_AUTOCROP ///< compile auto-crop support
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
#define USE_GRAB ///< experimental grab code
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, ...
2012-01-18 15:15:37 +01:00
#define noUSE_GLX ///< outdated GLX code
#define noUSE_DOUBLEBUFFER ///< use GLX double buffers
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//#define USE_VAAPI ///< enable vaapi support
//#define USE_VDPAU ///< enable vdpau support
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
#define noUSE_BITMAP ///< use vdpau bitmap surface
Makes A/V sync info time configurable.
2012-02-22 16:32:40 +01:00
//#define AV_INFO ///< log a/v sync informations
#ifndef AV_INFO_TIME
#define AV_INFO_TIME (50 * 60) ///< a/v info every minute
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
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, ...
2012-01-18 15:15:37 +01:00
#define USE_VIDEO_THREAD ///< run decoder in an own thread
C part of the plugin.
2011-12-07 15:05:38 +01:00
#include <sys/time.h>
#include <sys/shm.h>
#include <sys/ipc.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <libintl.h>
#define _(str) gettext(str) ///< gettext shortcut
#define _N(str) str ///< gettext_noop shortcut
#include <alsa/iatomic.h> // portable atomic_t
#ifdef USE_VIDEO_THREAD
#ifndef __USE_GNU
#define __USE_GNU
#endif
#include <pthread.h>
#include <time.h>
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
#include <signal.h>
Make pthread_setname_np optional for older glibc.
2011-12-31 17:28:58 +01:00
#ifndef HAVE_PTHREAD_NAME
/// only available with newer glibc
#define pthread_setname_np(thread, name)
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
#ifdef USE_XLIB_XCB
#include <X11/Xlib-xcb.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
#include <xcb/xcb.h>
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
//#include <xcb/bigreq.h>
//#include <xcb/glx.h>
//#include <xcb/randr.h>
#ifdef USE_SCREENSAVER
C part of the plugin.
2011-12-07 15:05:38 +01:00
#include <xcb/screensaver.h>
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
#include <xcb/dpms.h>
#endif
//#include <xcb/shm.h>
//#include <xcb/xv.h>
C part of the plugin.
2011-12-07 15:05:38 +01:00
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
//#include <xcb/xcb_image.h>
//#include <xcb/xcb_event.h>
C part of the plugin.
2011-12-07 15:05:38 +01:00
#include <xcb/xcb_atom.h>
#include <xcb/xcb_icccm.h>
Support xcb_ewmh.h for xcb-util <0.3.8.
2012-01-13 17:20:43 +01:00
#ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS
#include <xcb/xcb_ewmh.h>
#else // compatibility hack for old xcb-util
/**
* @brief Action on the _NET_WM_STATE property
*/
typedef enum
{
/* Remove/unset property */
XCB_EWMH_WM_STATE_REMOVE = 0,
/* Add/set property */
XCB_EWMH_WM_STATE_ADD = 1,
/* Toggle property */
XCB_EWMH_WM_STATE_TOGGLE = 2
} xcb_ewmh_wm_state_action_t;
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
#ifdef USE_GLX
Patch collection from Christian Ruppert. 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.
2012-01-10 22:48:42 +01:00
#include <GL/gl.h> // For GL_COLOR_BUFFER_BIT
C part of the plugin.
2011-12-07 15:05:38 +01:00
#include <GL/glx.h>
// only for gluErrorString
#include <GL/glu.h>
#endif
#ifdef USE_VAAPI
#include <va/va_x11.h>
#ifdef USE_GLX
#include <va/va_glx.h>
#endif
VA-API branch staging support.
2012-02-22 16:50:35 +01:00
#ifndef VA_SURFACE_ATTRIB_SETTABLE
/// make source compatible with old libva
#define vaCreateSurfaces(d, f, w, h, s, ns, a, na) \
vaCreateSurfaces(d, w, h, f, ns, s)
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
#ifdef USE_VDPAU
#include <vdpau/vdpau_x11.h>
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
#include <libavcodec/vdpau.h>
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
#include <libavcodec/avcodec.h>
#include <libavcodec/vaapi.h>
#include <libavutil/pixdesc.h>
#include "misc.h"
#include "video.h"
#include "audio.h"
#ifdef USE_XLIB_XCB
//----------------------------------------------------------------------------
// Declarations
//----------------------------------------------------------------------------
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
///
/// Video resolutions selector.
///
typedef enum _video_resolutions_
{
Fix bug: transposed digits 567 should be 576.
2012-01-16 20:20:01 +01:00
VideoResolution576i, ///< ...x576 interlaced
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoResolution720p, ///< ...x720 progressive
VideoResolutionFake1080i, ///< 1280x1080 1440x1080 interlaced
VideoResolution1080i, ///< 1920x1080 interlaced
VideoResolutionMax ///< number of resolution indexs
} VideoResolutions;
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Video deinterlace modes.
///
typedef enum _video_deinterlace_modes_
{
VideoDeinterlaceBob, ///< bob deinterlace
VideoDeinterlaceWeave, ///< weave deinterlace
VideoDeinterlaceTemporal, ///< temporal deinterlace
VideoDeinterlaceTemporalSpatial, ///< temporal spatial deinterlace
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
VideoDeinterlaceSoftBob, ///< software bob deinterlace
VideoDeinterlaceSoftSpatial, ///< software spatial deinterlace
C part of the plugin.
2011-12-07 15:05:38 +01:00
} VideoDeinterlaceModes;
///
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
/// Video scaleing modes.
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
typedef enum _video_scaling_modes_
{
VideoScalingNormal, ///< normal scaling
VideoScalingFast, ///< fastest scaling
VideoScalingHQ, ///< high quality scaling
VideoScalingAnamorphic, ///< anamorphic scaling
} VideoScalingModes;
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
///
/// Video zoom modes.
///
typedef enum _video_zoom_modes_
{
VideoNormal, ///< normal
VideoStretch, ///< stretch to all edges
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VideoCenterCutOut, ///< center and cut out
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
VideoAnamorphic, ///< anamorphic scaled (unsupported)
} VideoZoomModes;
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
///
/// Video color space conversions.
///
typedef enum _video_color_space_
{
VideoColorSpaceNone, ///< no conversion
VideoColorSpaceBt601, ///< ITU.BT-601 Y'CbCr
VideoColorSpaceBt709, ///< ITU.BT-709 HDTV Y'CbCr
VideoColorSpaceSmpte240 ///< SMPTE-240M Y'PbPr
} VideoColorSpace;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
/// Video output module structure and typedef.
///
typedef struct _video_module_
{
const char *Name; ///< video output module name
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
char Enabled; ///< flag output module enabled
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
/// allocate new video hw decoder
VideoHwDecoder *(*const NewHwDecoder)(void);
void (*const DelHwDecoder) (VideoHwDecoder *);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
unsigned (*const GetSurface) (VideoHwDecoder *);
void (*const ReleaseSurface) (VideoHwDecoder *, unsigned);
enum PixelFormat (*const get_format) (VideoHwDecoder *, AVCodecContext *,
const enum PixelFormat *);
void (*const RenderFrame) (VideoHwDecoder *, const AVCodecContext *,
const AVFrame *);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
void (*const SetClock) (VideoHwDecoder *, int64_t);
int64_t(*const GetClock) (const VideoHwDecoder *);
void (*const SetTrickSpeed) (const VideoHwDecoder *, int);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
uint8_t *(*const GrabOutput)(int *, int *, int *);
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
void (*const SetBackground) (uint32_t);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
void (*const SetVideoMode) (void);
void (*const ResetAutoCrop) (void);
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
/// module display handler thread
void (*const DisplayHandlerThread) (void);
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
void (*const OsdClear) (void); ///< clear OSD
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
/// draw OSD ARGB area
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
void (*const OsdDrawARGB) (int, int, int, int, const uint8_t *);
void (*const OsdInit) (int, int); ///< initialize OSD
void (*const OsdExit) (void); ///< cleanup OSD
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
int (*const Init) (const char *); ///< initialize video output module
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
void (*const Exit) (void); ///< cleanup video output module
} VideoModule;
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// Defines
//----------------------------------------------------------------------------
#define CODEC_SURFACES_MAX 31 ///< maximal of surfaces
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Fix bug #1089: vdpau wrong number of mpeg refs.
2012-10-24 15:38:09 +02:00
#define CODEC_SURFACES_DEFAULT 21 ///< default of surfaces
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
// FIXME: video-xvba only supports 14
#define xCODEC_SURFACES_DEFAULT 14 ///< default of surfaces
C part of the plugin.
2011-12-07 15:05:38 +01:00
#define CODEC_SURFACES_MPEG2 3 ///< 1 decode, up to 2 references
#define CODEC_SURFACES_MPEG4 3 ///< 1 decode, up to 2 references
#define CODEC_SURFACES_H264 21 ///< 1 decode, up to 20 references
#define CODEC_SURFACES_VC1 3 ///< 1 decode, up to 2 references
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#define VIDEO_SURFACES_MAX 4 ///< video output surfaces for queue
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
#define OUTPUT_SURFACES_MAX 4 ///< output surfaces for flip page
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// Variables
//----------------------------------------------------------------------------
Add posibility to disable repeat pict warning.
2012-02-16 21:55:14 +01:00
char VideoIgnoreRepeatPict; ///< disable repeat pict warning
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static const char *VideoDevice; ///< video output device
C part of the plugin.
2011-12-07 15:05:38 +01:00
static Display *XlibDisplay; ///< Xlib X11 display
static xcb_connection_t *Connection; ///< xcb connection
static xcb_colormap_t VideoColormap; ///< video colormap
static xcb_window_t VideoWindow; ///< video window
Support display with non-square pixels.
2012-05-10 16:03:56 +02:00
static xcb_screen_t const *VideoScreen; ///< video screen
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
static uint32_t VideoBlankTick; ///< blank cursor timer
Free used X11 resources colormap, pixmap, cursor.
2012-07-25 16:07:36 +02:00
static xcb_pixmap_t VideoCursorPixmap; ///< blank curosr pixmap
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
static xcb_cursor_t VideoBlankCursor; ///< empty invisible cursor
C part of the plugin.
2011-12-07 15:05:38 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static int VideoWindowX; ///< video output window x coordinate
static int VideoWindowY; ///< video outout window y coordinate
static unsigned VideoWindowWidth; ///< video output window width
static unsigned VideoWindowHeight; ///< video output window height
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static const VideoModule NoopModule; ///< forward definition of noop module
/// selected video module
static const VideoModule *VideoUsedModule = &NoopModule;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
Add commandline support to disable hardware decoder.
2012-07-03 15:48:44 +02:00
char VideoHardwareDecoder = -1; ///< flag use hardware decoder
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
static char VideoSurfaceModesChanged; ///< flag surface modes changed
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
/// flag use transparent OSD.
static const char VideoTransparentOsd = 1;
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
static uint32_t VideoBackground; ///< video background color
Studio levels could be configured in setup menu.
2012-02-13 14:13:24 +01:00
static char VideoStudioLevels; ///< flag use studio levels
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
/// Default deinterlace mode.
static VideoDeinterlaceModes VideoDeinterlace[VideoResolutionMax];
C part of the plugin.
2011-12-07 15:05:38 +01:00
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
/// Default number of deinterlace surfaces
static const int VideoDeinterlaceSurfaces = 4;
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
/// Default skip chroma deinterlace flag (VDPAU only).
static char VideoSkipChromaDeinterlace[VideoResolutionMax];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VDPAU: Enable inverse telecine configuration.
2012-02-14 22:29:17 +01:00
/// Default inverse telecine flag (VDPAU only).
static char VideoInverseTelecine[VideoResolutionMax];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
/// Default amount of noise reduction algorithm to apply (0 .. 1000).
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
static int VideoDenoise[VideoResolutionMax];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// Default amount of sharpening, or blurring, to apply (-1000 .. 1000).
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
static int VideoSharpen[VideoResolutionMax];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// Default cut top and bottom in pixels
static int VideoCutTopBottom[VideoResolutionMax];
/// Default cut left and right in pixels
static int VideoCutLeftRight[VideoResolutionMax];
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
/// Color space ITU-R BT.601, ITU-R BT.709, ...
static const VideoColorSpace VideoColorSpaces[VideoResolutionMax] = {
VideoColorSpaceBt601, VideoColorSpaceBt709, VideoColorSpaceBt709,
VideoColorSpaceBt709
};
C part of the plugin.
2011-12-07 15:05:38 +01:00
/// Default scaling mode
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
static VideoScalingModes VideoScaling[VideoResolutionMax];
C part of the plugin.
2011-12-07 15:05:38 +01:00
Audio/video sync improvements. Configurable audio delay. Use monotonic pts. Support old libav or ffmpeg libraries.
2011-12-19 17:03:40 +01:00
/// Default audio/video delay
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
int VideoAudioDelay;
Audio/video sync improvements. Configurable audio delay. Use monotonic pts. Support old libav or ffmpeg libraries.
2011-12-19 17:03:40 +01:00
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
/// Default zoom mode
static VideoZoomModes Video4to3ZoomMode;
New video/audio sync code.
2011-12-15 22:45:55 +01:00
static char Video60HzMode; ///< handle 60hz displays
Make soft start sync setup menu configurable.
2012-03-06 12:16:47 +01:00
static char VideoSoftStartSync; ///< soft start sync audio/video
Improved audio skip, after channel switch.
2012-06-25 17:30:30 +02:00
static const int VideoSoftStartFrames = 100; ///< soft start frames
Made showing black picture configurable.
2012-04-20 15:40:14 +02:00
static char VideoShowBlackPicture; ///< flag show black picture
New video/audio sync code.
2011-12-15 22:45:55 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
static xcb_atom_t WmDeleteWindowAtom; ///< WM delete message atom
Add support for fullscreen mode.
2012-01-13 16:31:29 +01:00
static xcb_atom_t NetWmState; ///< wm-state message atom
static xcb_atom_t NetWmStateFullscreen; ///< fullscreen wm-state message atom
C part of the plugin.
2011-12-07 15:05:38 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#ifdef DEBUG
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
extern uint32_t VideoSwitch; ///< ticks for channel switch
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#endif
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
extern void AudioVideoReady(int64_t); ///< tell audio video is ready
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_VIDEO_THREAD
static pthread_t VideoThread; ///< video decode thread
static pthread_cond_t VideoWakeupCond; ///< wakeup condition variable
static pthread_mutex_t VideoMutex; ///< video condition mutex
static pthread_mutex_t VideoLockMutex; ///< video lock mutex
#endif
Makes OSD size configurable.
2012-05-21 15:34:33 +02:00
static int OsdConfigWidth; ///< osd configured width
static int OsdConfigHeight; ///< osd configured height
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, ...
2012-01-18 15:15:37 +01:00
static char OsdShown; ///< flag show osd
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
static char Osd3DMode; ///< 3D OSD mode
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, ...
2012-01-18 15:15:37 +01:00
static int OsdWidth; ///< osd width
static int OsdHeight; ///< osd height
static int OsdDirtyX; ///< osd dirty area x
static int OsdDirtyY; ///< osd dirty area y
static int OsdDirtyWidth; ///< osd dirty area width
static int OsdDirtyHeight; ///< osd dirty area height
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
static int64_t VideoDeltaPTS; ///< FIXME: fix pts
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// Common Functions
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
static void VideoThreadLock(void); ///< lock video thread
static void VideoThreadUnlock(void); ///< unlock video thread
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
static void VideoThreadExit(void); ///< exit/kill video thread
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
///
/// Update video pts.
///
/// @param pts_p pointer to pts
/// @param interlaced interlaced flag (frame isn't right)
/// @param frame frame to display
///
/// @note frame->interlaced_frame can't be used for interlace detection
///
static void VideoSetPts(int64_t * pts_p, int interlaced, const AVFrame * frame)
{
int64_t pts;
// update video clock
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
if (*pts_p != (int64_t) AV_NOPTS_VALUE) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
*pts_p += interlaced ? 40 * 90 : 20 * 90;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
//Info("video: %s +pts\n", Timestamp2String(*pts_p));
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
}
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
//av_opt_ptr(avcodec_get_frame_class(), frame, "best_effort_timestamp");
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
//pts = frame->best_effort_timestamp;
pts = frame->pkt_pts;
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
if (pts == (int64_t) AV_NOPTS_VALUE || !pts) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// libav: 0.8pre didn't set pts
pts = frame->pkt_dts;
}
// libav: sets only pkt_dts which can be 0
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
if (pts && pts != (int64_t) AV_NOPTS_VALUE) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// build a monotonic pts
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
if (*pts_p != (int64_t) AV_NOPTS_VALUE) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
int64_t delta;
delta = pts - *pts_p;
// ignore negative jumps
if (delta > -600 * 90 && delta <= -40 * 90) {
if (-delta > VideoDeltaPTS) {
VideoDeltaPTS = -delta;
Debug(4,
"video: %#012" PRIx64 "->%#012" PRIx64 " delta+%4"
PRId64 " pts\n", *pts_p, pts, pts - *pts_p);
}
return;
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
} else { // first new clock value
AudioVideoReady(pts);
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
}
if (*pts_p != pts) {
Debug(4,
"video: %#012" PRIx64 "->%#012" PRIx64 " delta=%4" PRId64
" pts\n", *pts_p, pts, pts - *pts_p);
*pts_p = pts;
}
}
}
///
/// Update output for new size or aspect ratio.
///
/// @param input_aspect_ratio video stream aspect
///
static void VideoUpdateOutput(AVRational input_aspect_ratio, int input_width,
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
int input_height, VideoResolutions resolution, int *output_x,
int *output_y, int *output_width, int *output_height, int *crop_x,
int *crop_y, int *crop_width, int *crop_height)
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
{
AVRational display_aspect_ratio;
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
AVRational tmp_ratio;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (!input_aspect_ratio.num || !input_aspect_ratio.den) {
input_aspect_ratio.num = 1;
input_aspect_ratio.den = 1;
Debug(3, "video: aspect defaults to %d:%d\n", input_aspect_ratio.num,
input_aspect_ratio.den);
}
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
av_reduce(&input_aspect_ratio.num, &input_aspect_ratio.den,
input_width * input_aspect_ratio.num,
input_height * input_aspect_ratio.den, 1024 * 1024);
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// InputWidth/Height can be zero = uninitialized
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
if (!input_aspect_ratio.num || !input_aspect_ratio.den) {
input_aspect_ratio.num = 1;
input_aspect_ratio.den = 1;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
}
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
display_aspect_ratio.num =
VideoScreen->width_in_pixels * VideoScreen->height_in_millimeters;
display_aspect_ratio.den =
VideoScreen->height_in_pixels * VideoScreen->width_in_millimeters;
display_aspect_ratio = av_mul_q(input_aspect_ratio, display_aspect_ratio);
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Debug(3, "video: aspect %d:%d\n", display_aspect_ratio.num,
display_aspect_ratio.den);
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
*crop_x = VideoCutLeftRight[resolution];
*crop_y = VideoCutTopBottom[resolution];
*crop_width = input_width - VideoCutLeftRight[resolution] * 2;
*crop_height = input_height - VideoCutTopBottom[resolution] * 2;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// FIXME: store different positions for the ratios
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
tmp_ratio.num = 4;
tmp_ratio.den = 3;
if (!av_cmp_q(input_aspect_ratio, tmp_ratio)) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
switch (Video4to3ZoomMode) {
case VideoNormal:
goto normal;
case VideoStretch:
goto stretch;
case VideoCenterCutOut:
goto center_cut_out;
case VideoAnamorphic:
// FIXME: rest should be done by hardware
goto stretch;
}
}
// FIXME: this overwrites user choosen output position
normal:
*output_x = 0;
*output_y = 0;
*output_width = (VideoWindowHeight * display_aspect_ratio.num)
/ display_aspect_ratio.den;
*output_height = (VideoWindowWidth * display_aspect_ratio.den)
/ display_aspect_ratio.num;
if ((unsigned)*output_width > VideoWindowWidth) {
*output_width = VideoWindowWidth;
*output_y = (VideoWindowHeight - *output_height) / 2;
} else if ((unsigned)*output_height > VideoWindowHeight) {
*output_height = VideoWindowHeight;
*output_x = (VideoWindowWidth - *output_width) / 2;
}
Debug(3, "video: aspect output %dx%d+%d+%d\n", *output_width,
*output_height, *output_x, *output_y);
return;
stretch:
*output_x = 0;
*output_y = 0;
*output_width = VideoWindowWidth;
*output_height = VideoWindowHeight;
return;
center_cut_out:
*output_x = 0;
*output_y = 0;
*output_height = VideoWindowHeight;
*output_width = VideoWindowWidth;
*crop_width = (VideoWindowHeight * display_aspect_ratio.num)
/ display_aspect_ratio.den;
*crop_height = (VideoWindowWidth * display_aspect_ratio.den)
/ display_aspect_ratio.num;
// look which side must be cut
if ((unsigned)*crop_width > VideoWindowWidth) {
*crop_height = input_height;
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
// adjust scaling
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
*crop_x = ((*crop_width - (signed)VideoWindowWidth) * input_width)
/ (2 * VideoWindowWidth);
*crop_width = input_width - *crop_x * 2;
} else if ((unsigned)*crop_height > VideoWindowHeight) {
*crop_width = input_width;
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
// adjust scaling
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
*crop_y = ((*crop_height - (signed)VideoWindowHeight) * input_height)
/ (2 * VideoWindowHeight);
*crop_height = input_height - *crop_y * 2;
} else {
*crop_width = input_width;
*crop_height = input_height;
}
Debug(3, "video: aspect crop %dx%d+%d+%d\n", *crop_width, *crop_height,
*crop_x, *crop_y);
return;
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// GLX
//----------------------------------------------------------------------------
#ifdef USE_GLX
static int GlxEnabled = 1; ///< use GLX
static int GlxVSyncEnabled = 0; ///< enable/disable v-sync
static GLXContext GlxSharedContext; ///< shared gl context
static GLXContext GlxContext; ///< our gl context
static XVisualInfo *GlxVisualInfo; ///< our gl visual
static GLuint OsdGlTextures[2]; ///< gl texture for OSD
static int OsdIndex; ///< index into OsdGlTextures
///
/// GLX extension functions
///@{
#ifdef GLX_MESA_swap_control
static PFNGLXSWAPINTERVALMESAPROC GlxSwapIntervalMESA;
#endif
#ifdef GLX_SGI_video_sync
static PFNGLXGETVIDEOSYNCSGIPROC GlxGetVideoSyncSGI;
#endif
#ifdef GLX_SGI_swap_control
static PFNGLXSWAPINTERVALSGIPROC GlxSwapIntervalSGI;
#endif
///@}
///
/// GLX check error.
///
static void GlxCheck(void)
{
GLenum err;
if ((err = glGetError()) != GL_NO_ERROR) {
Debug(3, "video/glx: error %d '%s'\n", err, gluErrorString(err));
}
}
///
/// GLX check if a GLX extension is supported.
///
/// @param ext extension to query
/// @returns true if supported, false otherwise
///
static int GlxIsExtensionSupported(const char *ext)
{
const char *extensions;
if ((extensions =
glXQueryExtensionsString(XlibDisplay,
DefaultScreen(XlibDisplay)))) {
const char *s;
int l;
s = strstr(extensions, ext);
l = strlen(ext);
return s && (s[l] == ' ' || s[l] == '\0');
}
return 0;
}
#if 0
///
/// Setup GLX decoder
///
/// @param decoder VA-API decoder
///
void GlxSetupDecoder(VaapiDecoder * decoder)
{
int width;
int height;
int i;
width = decoder->InputWidth;
height = decoder->InputHeight;
glEnable(GL_TEXTURE_2D); // create 2d texture
glGenTextures(2, decoder->GlTexture);
GlxCheck();
for (i = 0; i < 2; ++i) {
glBindTexture(GL_TEXTURE_2D, decoder->GlTexture[i]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA,
GL_UNSIGNED_BYTE, NULL);
glBindTexture(GL_TEXTURE_2D, 0);
}
glDisable(GL_TEXTURE_2D);
GlxCheck();
}
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Render texture.
///
/// @param texture 2d texture
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static inline void GlxRenderTexture(GLuint texture, int x, int y, int width,
int height)
{
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texture);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // no color
glBegin(GL_QUADS); {
glTexCoord2f(1.0f, 1.0f);
glVertex2i(x + width, y + height);
glTexCoord2f(0.0f, 1.0f);
glVertex2i(x, y + height);
glTexCoord2f(0.0f, 0.0f);
glVertex2i(x, y);
glTexCoord2f(1.0f, 0.0f);
glVertex2i(x + width, y);
#if 0
glTexCoord2f(0.0f, 0.0f);
glVertex2i(x, y);
glTexCoord2f(0.0f, 1.0f);
glVertex2i(x, y + height);
glTexCoord2f(1.0f, 1.0f);
glVertex2i(x + width, y + height);
glTexCoord2f(1.0f, 0.0f);
glVertex2i(x + width, y);
#endif
}
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Upload texture.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void GlxUploadTexture(int x, int y, int width, int height,
const uint8_t * argb)
{
// FIXME: use other / faster uploads
// ARB_pixelbuffer_object GL_PIXEL_UNPACK_BUFFER glBindBufferARB()
// glMapBuffer() glUnmapBuffer()
// glTexSubImage2D
glEnable(GL_TEXTURE_2D); // upload 2d texture
glBindTexture(GL_TEXTURE_2D, OsdGlTextures[OsdIndex]);
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, GL_BGRA,
GL_UNSIGNED_BYTE, argb);
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Render to glx texture.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void GlxRender(int osd_width, int osd_height)
{
static uint8_t *image;
static uint8_t cycle;
int x;
int y;
if (!OsdGlTextures[0] || !OsdGlTextures[1]) {
return;
}
// render each frame kills performance
// osd 1920 * 1080 * 4 (RGBA) * 50 (HZ) = 396 Mb/s
// too big for alloca
if (!image) {
image = malloc(4 * osd_width * osd_height);
memset(image, 0x00, 4 * osd_width * osd_height);
}
for (y = 0; y < osd_height; ++y) {
for (x = 0; x < osd_width; ++x) {
((uint32_t *) image)[x + y * osd_width] =
0x00FFFFFF | (cycle++) << 24;
}
}
cycle++;
// FIXME: convert is for GLX texture unneeded
// convert internal osd to image
//GfxConvert(image, 0, 4 * osd_width);
//
GlxUploadTexture(0, 0, osd_width, osd_height, image);
}
///
/// Setup GLX window.
///
static void GlxSetupWindow(xcb_window_t window, int width, int height)
{
uint32_t start;
uint32_t end;
int i;
unsigned count;
Debug(3, "video/glx: %s\n %x %dx%d", __FUNCTION__, window, width, height);
// set glx context
if (!glXMakeCurrent(XlibDisplay, window, GlxContext)) {
Fatal(_("video/glx: can't make glx context current\n"));
// FIXME: disable glx
return;
}
Debug(3, "video/glx: ok\n");
#ifdef DEBUG
// check if v-sync is working correct
end = GetMsTicks();
for (i = 0; i < 10; ++i) {
start = end;
glClear(GL_COLOR_BUFFER_BIT);
glXSwapBuffers(XlibDisplay, window);
end = GetMsTicks();
GlxGetVideoSyncSGI(&count);
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/glx: %5d frame rate %dms\n", count, end - start);
C part of the plugin.
2011-12-07 15:05:38 +01:00
// nvidia can queue 5 swaps
if (i > 5 && (end - start) < 15) {
Warning(_("video/glx: no v-sync\n"));
}
}
#endif
// viewpoint
GlxCheck();
glViewport(0, 0, width, height);
glDepthRange(-1.0, 1.0);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glColor3f(1.0f, 1.0f, 1.0f);
glClearDepth(1.0);
GlxCheck();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0.0, width, height, 0.0, -1.0, 1.0);
GlxCheck();
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glDisable(GL_DEPTH_TEST); // setup 2d drawing
glDepthMask(GL_FALSE);
glDisable(GL_CULL_FACE);
#ifdef USE_DOUBLEBUFFER
glDrawBuffer(GL_BACK);
#else
glDrawBuffer(GL_FRONT);
#endif
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
#ifdef DEBUG
#ifdef USE_DOUBLEBUFFER
glDrawBuffer(GL_FRONT);
glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
glDrawBuffer(GL_BACK);
#endif
#endif
// clear
glClearColor(0.0f, 0.0f, 0.0f, 1.0f); // intial background color
glClear(GL_COLOR_BUFFER_BIT);
#ifdef DEBUG
glClearColor(1.0f, 1.0f, 0.0f, 1.0f); // background color
#endif
GlxCheck();
}
///
/// Initialize GLX.
///
static void GlxInit(void)
{
static GLint visual_attr[] = {
GLX_RGBA,
GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8,
#ifdef USE_DOUBLEBUFFER
GLX_DOUBLEBUFFER,
#endif
None
};
XVisualInfo *vi;
GLXContext context;
int major;
int minor;
int glx_GLX_EXT_swap_control;
int glx_GLX_MESA_swap_control;
int glx_GLX_SGI_swap_control;
int glx_GLX_SGI_video_sync;
if (!glXQueryVersion(XlibDisplay, &major, &minor)) {
Error(_("video/glx: no GLX support\n"));
GlxEnabled = 0;
return;
}
Info(_("video/glx: glx version %d.%d\n"), major, minor);
//
// check which extension are supported
//
glx_GLX_EXT_swap_control = GlxIsExtensionSupported("GLX_EXT_swap_control");
glx_GLX_MESA_swap_control =
GlxIsExtensionSupported("GLX_MESA_swap_control");
glx_GLX_SGI_swap_control = GlxIsExtensionSupported("GLX_SGI_swap_control");
glx_GLX_SGI_video_sync = GlxIsExtensionSupported("GLX_SGI_video_sync");
#ifdef GLX_MESA_swap_control
if (glx_GLX_MESA_swap_control) {
GlxSwapIntervalMESA = (PFNGLXSWAPINTERVALMESAPROC)
glXGetProcAddress((const GLubyte *)"glXSwapIntervalMESA");
}
Debug(3, "video/glx: GlxSwapIntervalMESA=%p\n", GlxSwapIntervalMESA);
#endif
#ifdef GLX_SGI_swap_control
if (glx_GLX_SGI_swap_control) {
GlxSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)
glXGetProcAddress((const GLubyte *)"glXSwapIntervalSGI");
}
Debug(3, "video/glx: GlxSwapIntervalSGI=%p\n", GlxSwapIntervalSGI);
#endif
#ifdef GLX_SGI_video_sync
if (glx_GLX_SGI_video_sync) {
GlxGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)
glXGetProcAddress((const GLubyte *)"glXGetVideoSyncSGI");
}
Debug(3, "video/glx: GlxGetVideoSyncSGI=%p\n", GlxGetVideoSyncSGI);
#endif
// glXGetVideoSyncSGI glXWaitVideoSyncSGI
#if 0
// FIXME: use xcb: xcb_glx_create_context
#endif
// create glx context
glXMakeCurrent(XlibDisplay, None, NULL);
vi = glXChooseVisual(XlibDisplay, DefaultScreen(XlibDisplay), visual_attr);
if (!vi) {
Error(_("video/glx: can't get a RGB visual\n"));
GlxEnabled = 0;
return;
}
if (!vi->visual) {
Error(_("video/glx: no valid visual found\n"));
GlxEnabled = 0;
return;
}
if (vi->bits_per_rgb < 8) {
Error(_("video/glx: need atleast 8-bits per RGB\n"));
GlxEnabled = 0;
return;
}
context = glXCreateContext(XlibDisplay, vi, NULL, GL_TRUE);
if (!context) {
Error(_("video/glx: can't create glx context\n"));
GlxEnabled = 0;
return;
}
GlxSharedContext = context;
context = glXCreateContext(XlibDisplay, vi, GlxSharedContext, GL_TRUE);
if (!context) {
Error(_("video/glx: can't create glx context\n"));
GlxEnabled = 0;
// FIXME: destroy GlxSharedContext
return;
}
GlxContext = context;
GlxVisualInfo = vi;
Debug(3, "video/glx: visual %#02x depth %u\n", (unsigned)vi->visualid,
vi->depth);
//
// query default v-sync state
//
if (glx_GLX_EXT_swap_control) {
unsigned tmp;
tmp = -1;
glXQueryDrawable(XlibDisplay, DefaultRootWindow(XlibDisplay),
GLX_SWAP_INTERVAL_EXT, &tmp);
GlxCheck();
Debug(3, "video/glx: default v-sync is %d\n", tmp);
} else {
Debug(3, "video/glx: default v-sync is unknown\n");
}
//
// disable wait on v-sync
//
// FIXME: sleep before swap / busy waiting hardware
// FIXME: 60hz lcd panel
// FIXME: config: default, on, off
#ifdef GLX_SGI_swap_control
if (GlxVSyncEnabled < 0 && GlxSwapIntervalSGI) {
if (GlxSwapIntervalSGI(0)) {
GlxCheck();
Warning(_("video/glx: can't disable v-sync\n"));
} else {
Info(_("video/glx: v-sync disabled\n"));
}
} else
#endif
#ifdef GLX_MESA_swap_control
if (GlxVSyncEnabled < 0 && GlxSwapIntervalMESA) {
if (GlxSwapIntervalMESA(0)) {
GlxCheck();
Warning(_("video/glx: can't disable v-sync\n"));
} else {
Info(_("video/glx: v-sync disabled\n"));
}
}
#endif
//
// enable wait on v-sync
//
#ifdef GLX_SGI_swap_control
if (GlxVSyncEnabled > 0 && GlxSwapIntervalMESA) {
if (GlxSwapIntervalMESA(1)) {
GlxCheck();
Warning(_("video/glx: can't enable v-sync\n"));
} else {
Info(_("video/glx: v-sync enabled\n"));
}
} else
#endif
#ifdef GLX_MESA_swap_control
if (GlxVSyncEnabled > 0 && GlxSwapIntervalSGI) {
if (GlxSwapIntervalSGI(1)) {
GlxCheck();
Warning(_("video/glx: can't enable v-sync\n"));
} else {
Info(_("video/glx: v-sync enabled\n"));
}
}
#endif
}
///
/// Cleanup GLX.
///
static void GlxExit(void)
{
Debug(3, "video/glx: %s\n", __FUNCTION__);
glFinish();
// must destroy glx
if (glXGetCurrentContext() == GlxContext) {
// if currently used, set to none
glXMakeCurrent(XlibDisplay, None, NULL);
}
if (GlxSharedContext) {
glXDestroyContext(XlibDisplay, GlxSharedContext);
}
if (GlxContext) {
glXDestroyContext(XlibDisplay, GlxContext);
}
#if 0
if (GlxThreadContext) {
glXDestroyContext(XlibDisplay, GlxThreadContext);
}
// FIXME: must free GlxVisualInfo
#endif
}
#endif
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
//----------------------------------------------------------------------------
// common functions
//----------------------------------------------------------------------------
///
/// Calculate resolution group.
///
/// @param width video picture raw width
/// @param height video picture raw height
/// @param interlace flag interlaced video picture
///
/// @note interlace isn't used yet and probably wrong set by caller.
///
static VideoResolutions VideoResolutionGroup(int width, int height,
__attribute__ ((unused))
int interlace)
{
Fix bug: transposed digits 567 should be 576.
2012-01-16 20:20:01 +01:00
if (height <= 576) {
return VideoResolution576i;
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
}
if (height <= 720) {
return VideoResolution720p;
}
if (height < 1080) {
return VideoResolutionFake1080i;
}
if (width < 1920) {
return VideoResolutionFake1080i;
}
return VideoResolution1080i;
}
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//----------------------------------------------------------------------------
// auto-crop
//----------------------------------------------------------------------------
///
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
/// auto-crop context structure and typedef.
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
///
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
typedef struct _auto_crop_ctx_
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
{
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
int X1; ///< detected left border
int X2; ///< detected right border
int Y1; ///< detected top border
int Y2; ///< detected bottom border
int Count; ///< counter to delay switch
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
int State; ///< auto-crop state (0, 14, 16)
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
} AutoCropCtx;
#ifdef USE_AUTOCROP
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
#define YBLACK 0x20 ///< below is black
#define UVBLACK 0x80 ///< around is black
#define M64 UINT64_C(0x0101010101010101) ///< 64bit multiplicator
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
/// auto-crop percent of video width to ignore logos
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
static const int AutoCropLogoIgnore = 24;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
static int AutoCropInterval; ///< auto-crop check interval
static int AutoCropDelay; ///< auto-crop switch delay
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
static int AutoCropTolerance; ///< auto-crop tolerance
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
///
/// Detect black line Y.
///
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
/// @param data Y plane pixel data
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
/// @param length number of pixel to check
/// @param stride offset of pixels
///
/// @note 8 pixel are checked at once, all values must be 8 aligned
///
static int AutoCropIsBlackLineY(const uint8_t * data, int length, int stride)
{
int n;
int o;
uint64_t r;
const uint64_t *p;
#ifdef DEBUG
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
if ((size_t) data & 0x7 || stride & 0x7) {
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
abort();
}
#endif
p = (const uint64_t *)data;
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
n = length; // FIXME: can remove n
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
o = stride / 8;
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
r = 0UL;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
while (--n >= 0) {
r |= *p;
p += o;
}
// below YBLACK(0x20) is black
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
return !(r & ~((YBLACK - 1) * M64));
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Auto detect black borders and crop them.
///
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
/// @param autocrop auto-crop variables
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
/// @param width frame width in pixel
/// @param height frame height in pixel
/// @param data frame planes data (Y, U, V)
/// @param pitches frame planes pitches (Y, U, V)
///
/// @note FIXME: can reduce the checked range, left, right crop isn't
/// used yet.
///
/// @note FIXME: only Y is checked, for black.
///
static void AutoCropDetect(AutoCropCtx * autocrop, int width, int height,
void *data[3], uint32_t pitches[3])
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
{
const void *data_y;
unsigned length_y;
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
int x;
int y;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
int x1;
int x2;
int y1;
int y2;
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
int logo_skip;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
// ignore top+bottom 6 lines and left+right 8 pixels
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
#define SKIP_X 8
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#define SKIP_Y 6
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
x1 = width - 1;
x2 = 0;
y1 = height - 1;
y2 = 0;
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
logo_skip = SKIP_X + (((width * AutoCropLogoIgnore) / 100 + 8) / 8) * 8;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
data_y = data[0];
length_y = pitches[0];
//
// search top
//
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
for (y = SKIP_Y; y < y1; ++y) {
if (!AutoCropIsBlackLineY(data_y + logo_skip + y * length_y,
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
(width - 2 * logo_skip) / 8, 8)) {
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
if (y == SKIP_Y) {
y = 0;
}
y1 = y;
break;
}
}
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//
// search bottom
//
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
for (y = height - SKIP_Y - 1; y > y2; --y) {
if (!AutoCropIsBlackLineY(data_y + logo_skip + y * length_y,
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
(width - 2 * logo_skip) / 8, 8)) {
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
if (y == height - SKIP_Y - 1) {
y = height - 1;
}
y2 = y;
break;
}
}
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//
// search left
//
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
for (x = SKIP_X; x < x1; x += 8) {
if (!AutoCropIsBlackLineY(data_y + x + SKIP_Y * length_y,
height - 2 * SKIP_Y, length_y)) {
if (x == SKIP_X) {
x = 0;
}
x1 = x;
break;
}
}
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
//
// search right
//
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
for (x = width - SKIP_X - 8; x > x2; x -= 8) {
if (!AutoCropIsBlackLineY(data_y + x + SKIP_Y * length_y,
height - 2 * SKIP_Y * 8, length_y)) {
if (x == width - SKIP_X - 8) {
x = width - 1;
}
x2 = x;
break;
}
}
Release Version 0.4.0.
2012-01-21 15:56:45 +01:00
if (0 && (y1 > SKIP_Y || x1 > SKIP_X)) {
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
Debug(3, "video/autocrop: top=%d bottom=%d left=%d right=%d\n", y1, y2,
x1, x2);
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
autocrop->X1 = x1;
autocrop->X2 = x2;
autocrop->Y1 = y1;
autocrop->Y2 = y2;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
//----------------------------------------------------------------------------
// software - deinterlace
//----------------------------------------------------------------------------
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
// FIXME: move general software deinterlace functions to here.
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// VA-API
//----------------------------------------------------------------------------
#ifdef USE_VAAPI
VA-API/XvBA backend improvements.
2012-07-27 19:15:48 +02:00
static char VaapiBuggyXvBA; ///< fix xvba-video bugs
static char VaapiBuggyVdpau; ///< fix libva-driver-vdpau bugs
static char VaapiBuggyIntel; ///< fix libva-driver-intel bugs
static char VaapiNewIntel; ///< new libva-driver-intel driver
C part of the plugin.
2011-12-07 15:05:38 +01:00
static VADisplay *VaDisplay; ///< VA-API display
static VAImage VaOsdImage = {
.image_id = VA_INVALID_ID
}; ///< osd VA-API image
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
static VASubpictureID VaOsdSubpicture = VA_INVALID_ID; ///< osd VA-API subpicture
C part of the plugin.
2011-12-07 15:05:38 +01:00
static char VaapiUnscaledOsd; ///< unscaled osd supported
/// VA-API decoder typedef
typedef struct _vaapi_decoder_ VaapiDecoder;
///
/// VA-API decoder
///
struct _vaapi_decoder_
{
VADisplay *VaDisplay; ///< VA-API display
xcb_window_t Window; ///< output window
int OutputX; ///< output window x
int OutputY; ///< output window y
int OutputWidth; ///< output window width
int OutputHeight; ///< output window height
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
/// flags for put surface for different resolutions groups
unsigned SurfaceFlagsTable[VideoResolutionMax];
C part of the plugin.
2011-12-07 15:05:38 +01:00
enum PixelFormat PixFmt; ///< ffmpeg frame pixfmt
int WrongInterlacedWarned; ///< warning about interlace flag issued
int Interlaced; ///< ffmpeg interlaced flag
int TopFieldFirst; ///< ffmpeg top field displayed first
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VAImage DeintImages[5]; ///< deinterlace image buffers
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
int GetPutImage; ///< flag get/put image can be used
C part of the plugin.
2011-12-07 15:05:38 +01:00
VAImage Image[1]; ///< image buffer to update surface
struct vaapi_context VaapiContext[1]; ///< ffmpeg VA-API context
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
int SurfacesNeeded; ///< number of surface to request
C part of the plugin.
2011-12-07 15:05:38 +01:00
int SurfaceUsedN; ///< number of used surfaces
/// used surface ids
VASurfaceID SurfacesUsed[CODEC_SURFACES_MAX];
int SurfaceFreeN; ///< number of free surfaces
/// free surface ids
VASurfaceID SurfacesFree[CODEC_SURFACES_MAX];
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
int InputWidth; ///< video input width
int InputHeight; ///< video input height
AVRational InputAspect; ///< video input aspect ratio
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoResolutions Resolution; ///< resolution group
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
int CropX; ///< video crop x
int CropY; ///< video crop y
int CropWidth; ///< video crop width
int CropHeight; ///< video crop height
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#ifdef USE_AUTOCROP
AutoCropCtx AutoCrop[1]; ///< auto-crop variables
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
#ifdef USE_GLX
GLuint GlTexture[2]; ///< gl texture for VA-API
void *GlxSurface[2]; ///< VA-API/GLX surface
#endif
VASurfaceID BlackSurface; ///< empty black surface
/// video surface ring buffer
VASurfaceID SurfacesRb[VIDEO_SURFACES_MAX];
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
VASurfaceID LastSurface; ///< last surface
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
int SurfaceWrite; ///< write pointer
int SurfaceRead; ///< read pointer
atomic_t SurfacesFilled; ///< how many of the buffer is used
int SurfaceField; ///< current displayed field
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
int TrickSpeed; ///< current trick speed
int TrickCounter; ///< current trick speed counter
C part of the plugin.
2011-12-07 15:05:38 +01:00
struct timespec FrameTime; ///< time of last display
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
int Closing; ///< flag about closing current stream
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
int64_t PTS; ///< video PTS clock
C part of the plugin.
2011-12-07 15:05:38 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
int SyncCounter; ///< counter to sync frames
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
int StartCounter; ///< counter for video start
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int FramesDuped; ///< number of frames duplicated
int FramesMissed; ///< number of frames missed
int FramesDropped; ///< number of frames dropped
C part of the plugin.
2011-12-07 15:05:38 +01:00
int FrameCounter; ///< number of frames decoded
New video/audio sync code.
2011-12-15 22:45:55 +01:00
int FramesDisplayed; ///< number of frames displayed
C part of the plugin.
2011-12-07 15:05:38 +01:00
};
static VaapiDecoder *VaapiDecoders[1]; ///< open decoder streams
static int VaapiDecoderN; ///< number of decoder streams
/// forward display back surface
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
static void VaapiBlackSurface(VaapiDecoder *);
/// forward destroy deinterlace images
static void VaapiDestroyDeinterlaceImages(VaapiDecoder *);
C part of the plugin.
2011-12-07 15:05:38 +01:00
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
/// forward definition release surface
static void VaapiReleaseSurface(VaapiDecoder *, VASurfaceID);
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// VA-API Functions
//----------------------------------------------------------------------------
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
//----------------------------------------------------------------------------
///
/// Output video messages.
///
/// Reduce output.
///
/// @param level message level (Error, Warning, Info, Debug, ...)
/// @param format printf format string (NULL to flush messages)
/// @param ... printf arguments
///
/// @returns true, if message shown
///
Video_get_format AudioVideoReady feeds old PTS.
2012-06-27 21:47:30 +02:00
/// @todo FIXME: combine VdpauMessage and VaapiMessage
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
static int VaapiMessage(int level, const char *format, ...)
{
if (SysLogLevel > level || DebugLevel > level) {
static const char *last_format;
static char buf[256];
va_list ap;
va_start(ap, format);
if (format != last_format) { // don't repeat same message
if (buf[0]) { // print last repeated message
syslog(LOG_ERR, "%s", buf);
buf[0] = '\0';
}
if (format) {
Video_get_format AudioVideoReady feeds old PTS.
2012-06-27 21:47:30 +02:00
last_format = format;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
vsyslog(LOG_ERR, format, ap);
}
va_end(ap);
return 1;
}
vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
}
return 0;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
// Surfaces -------------------------------------------------------------
///
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, ...
2012-01-18 15:15:37 +01:00
/// Associate OSD with surface.
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// @param decoder VA-API decoder
///
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
static void VaapiAssociate(VaapiDecoder * decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
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, ...
2012-01-18 15:15:37 +01:00
int x;
int y;
int w;
int h;
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (VaOsdSubpicture == VA_INVALID_ID) {
Warning(_("video/vaapi: no osd subpicture yet\n"));
return;
}
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, ...
2012-01-18 15:15:37 +01:00
x = 0;
y = 0;
w = VaOsdImage.width;
h = VaOsdImage.height;
Debug, if vaapi putsurface is too slow.
2012-01-16 23:54:48 +01:00
// FIXME: associate only if osd is displayed
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (VaapiUnscaledOsd) {
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, ...
2012-01-18 15:15:37 +01:00
if (decoder->SurfaceFreeN
&& vaAssociateSubpicture(VaDisplay, VaOsdSubpicture,
decoder->SurfacesFree, decoder->SurfaceFreeN, x, y, w, h, 0, 0,
VideoWindowWidth, VideoWindowHeight,
VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
if (decoder->SurfaceUsedN
&& vaAssociateSubpicture(VaDisplay, VaOsdSubpicture,
decoder->SurfacesUsed, decoder->SurfaceUsedN, x, y, w, h, 0, 0,
VideoWindowWidth, VideoWindowHeight,
VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD)
C part of the plugin.
2011-12-07 15:05:38 +01:00
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
} else {
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, ...
2012-01-18 15:15:37 +01:00
if (decoder->SurfaceFreeN
&& vaAssociateSubpicture(VaDisplay, VaOsdSubpicture,
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
decoder->SurfacesFree, decoder->SurfaceFreeN, x, y, w, h,
decoder->CropX, decoder->CropY / 2, decoder->CropWidth,
decoder->CropHeight, 0)
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, ...
2012-01-18 15:15:37 +01:00
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
if (decoder->SurfaceUsedN
&& vaAssociateSubpicture(VaDisplay, VaOsdSubpicture,
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
decoder->SurfacesUsed, decoder->SurfaceUsedN, x, y, w, h,
decoder->CropX, decoder->CropY / 2, decoder->CropWidth,
decoder->CropHeight, 0)
C part of the plugin.
2011-12-07 15:05:38 +01:00
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
}
}
///
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, ...
2012-01-18 15:15:37 +01:00
/// Deassociate OSD with surface.
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// @param decoder VA-API decoder
///
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, ...
2012-01-18 15:15:37 +01:00
static void VaapiDeassociate(VaapiDecoder * decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
if (VaOsdSubpicture != VA_INVALID_ID) {
Add guards against cleanup errors.
2011-12-11 19:45:21 +01:00
if (decoder->SurfaceFreeN
&& vaDeassociateSubpicture(VaDisplay, VaOsdSubpicture,
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->SurfacesFree, decoder->SurfaceFreeN)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't deassociate %d surfaces\n"),
decoder->SurfaceFreeN);
}
Add guards against cleanup errors.
2011-12-11 19:45:21 +01:00
if (decoder->SurfaceUsedN
&& vaDeassociateSubpicture(VaDisplay, VaOsdSubpicture,
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->SurfacesUsed, decoder->SurfaceUsedN)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't deassociate %d surfaces\n"),
decoder->SurfaceUsedN);
}
}
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, ...
2012-01-18 15:15:37 +01:00
}
///
/// Create surfaces for VA-API decoder.
///
/// @param decoder VA-API decoder
/// @param width surface source/video width
/// @param height surface source/video height
///
static void VaapiCreateSurfaces(VaapiDecoder * decoder, int width, int height)
{
#ifdef DEBUG
if (!decoder->SurfacesNeeded) {
Error(_("video/vaapi: surface needed not set\n"));
decoder->SurfacesNeeded = 3 + VIDEO_SURFACES_MAX;
}
#endif
Debug(3, "video/vaapi: %s: %dx%d * %d\n", __FUNCTION__, width, height,
decoder->SurfacesNeeded);
decoder->SurfaceFreeN = decoder->SurfacesNeeded;
// VA_RT_FORMAT_YUV420 VA_RT_FORMAT_YUV422 VA_RT_FORMAT_YUV444
VA-API branch staging support.
2012-02-22 16:50:35 +01:00
if (vaCreateSurfaces(decoder->VaDisplay, VA_RT_FORMAT_YUV420, width,
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
height, decoder->SurfacesFree, decoder->SurfaceFreeN, NULL,
0) != VA_STATUS_SUCCESS) {
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, ...
2012-01-18 15:15:37 +01:00
Fatal(_("video/vaapi: can't create %d surfaces\n"),
decoder->SurfaceFreeN);
// FIXME: write error handler / fallback
}
}
///
/// Destroy surfaces of VA-API decoder.
///
/// @param decoder VA-API decoder
///
static void VaapiDestroySurfaces(VaapiDecoder * decoder)
{
Debug(3, "video/vaapi: %s:\n", __FUNCTION__);
//
// update OSD associate
//
VaapiDeassociate(decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaDestroySurfaces(decoder->VaDisplay, decoder->SurfacesFree,
decoder->SurfaceFreeN)
!= VA_STATUS_SUCCESS) {
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
Error(_("video/vaapi: can't destroy %d surfaces\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->SurfaceFreeN);
}
decoder->SurfaceFreeN = 0;
if (vaDestroySurfaces(decoder->VaDisplay, decoder->SurfacesUsed,
decoder->SurfaceUsedN)
!= VA_STATUS_SUCCESS) {
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
Error(_("video/vaapi: can't destroy %d surfaces\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->SurfaceUsedN);
}
decoder->SurfaceUsedN = 0;
// FIXME surfaces used for output
}
///
/// Get a free surface.
///
/// @param decoder VA-API decoder
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// @returns the oldest free surface
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static VASurfaceID VaapiGetSurface(VaapiDecoder * decoder)
{
VASurfaceID surface;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VASurfaceStatus status;
C part of the plugin.
2011-12-07 15:05:38 +01:00
int i;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// try to use oldest surface
C part of the plugin.
2011-12-07 15:05:38 +01:00
for (i = 0; i < decoder->SurfaceFreeN; ++i) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
surface = decoder->SurfacesFree[i];
if (vaQuerySurfaceStatus(decoder->VaDisplay, surface, &status)
!= VA_STATUS_SUCCESS) {
VA-API/XvBA backend improvements.
2012-07-27 19:15:48 +02:00
// this fails with XvBA und mpeg softdecoder
if (!VaapiBuggyXvBA) {
Error(_("video/vaapi: vaQuerySurface failed\n"));
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
status = VASurfaceReady;
}
// surface still in use, try next
if (status != VASurfaceReady) {
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
Debug(4, "video/vaapi: surface %#010x not ready: %d\n", surface,
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
status);
if (!VaapiBuggyVdpau || i < 1) {
continue;
}
usleep(1 * 1000);
}
// copy remaining surfaces down
decoder->SurfaceFreeN--;
for (; i < decoder->SurfaceFreeN; ++i) {
decoder->SurfacesFree[i] = decoder->SurfacesFree[i + 1];
}
decoder->SurfacesFree[i] = VA_INVALID_ID;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// save as used
decoder->SurfacesUsed[decoder->SurfaceUsedN++] = surface;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
return surface;
}
Error(_("video/vaapi: out of surfaces\n"));
return VA_INVALID_ID;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Release a surface.
///
/// @param decoder VA-API decoder
/// @param surface surface no longer used
///
static void VaapiReleaseSurface(VaapiDecoder * decoder, VASurfaceID surface)
{
int i;
for (i = 0; i < decoder->SurfaceUsedN; ++i) {
if (decoder->SurfacesUsed[i] == surface) {
// no problem, with last used
decoder->SurfacesUsed[i] =
decoder->SurfacesUsed[--decoder->SurfaceUsedN];
decoder->SurfacesFree[decoder->SurfaceFreeN++] = surface;
return;
}
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Error(_("video/vaapi: release surface %#010x, which is not in use\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
surface);
}
// Init/Exit ------------------------------------------------------------
///
/// Debug VA-API decoder frames drop...
///
/// @param decoder video hardware decoder
///
static void VaapiPrintFrames(const VaapiDecoder * decoder)
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video/vaapi: %d missed, %d duped, %d dropped frames of %d,%d\n",
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->FramesMissed, decoder->FramesDuped, decoder->FramesDropped,
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->FrameCounter, decoder->FramesDisplayed);
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
#ifndef DEBUG
(void)decoder;
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
///
/// Initialize surface flags.
///
/// @param decoder video hardware decoder
///
static void VaapiInitSurfaceFlags(VaapiDecoder * decoder)
{
int i;
for (i = 0; i < VideoResolutionMax; ++i) {
decoder->SurfaceFlagsTable[i] = VA_CLEAR_DRAWABLE;
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
// color space conversion none, ITU-R BT.601, ITU-R BT.709, ...
switch (VideoColorSpaces[i]) {
case VideoColorSpaceNone:
break;
case VideoColorSpaceBt601:
decoder->SurfaceFlagsTable[i] |= VA_SRC_BT601;
break;
case VideoColorSpaceBt709:
decoder->SurfaceFlagsTable[i] |= VA_SRC_BT709;
break;
case VideoColorSpaceSmpte240:
decoder->SurfaceFlagsTable[i] |= VA_SRC_SMPTE_240;
break;
Add vaapi color space conversion.
2012-01-13 12:28:56 +01:00
}
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
// scaling flags FAST, HQ, NL_ANAMORPHIC
switch (VideoScaling[i]) {
case VideoScalingNormal:
decoder->SurfaceFlagsTable[i] |= VA_FILTER_SCALING_DEFAULT;
break;
case VideoScalingFast:
decoder->SurfaceFlagsTable[i] |= VA_FILTER_SCALING_FAST;
break;
case VideoScalingHQ:
// vdpau backend supports only VA_FILTER_SCALING_HQ
// vdpau backend with advanced deinterlacer and my GT-210
// is too slow
decoder->SurfaceFlagsTable[i] |= VA_FILTER_SCALING_HQ;
break;
case VideoScalingAnamorphic:
// intel backend supports only VA_FILTER_SCALING_NL_ANAMORPHIC;
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
// FIXME: Highlevel should display 4:3 as 16:9 to support this
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
decoder->SurfaceFlagsTable[i] |=
VA_FILTER_SCALING_NL_ANAMORPHIC;
break;
}
// deinterlace flags (not yet supported by libva)
switch (VideoDeinterlace[i]) {
case VideoDeinterlaceBob:
break;
case VideoDeinterlaceWeave:
break;
case VideoDeinterlaceTemporal:
//FIXME: private hack
//decoder->SurfaceFlagsTable[i] |= 0x00002000;
break;
case VideoDeinterlaceTemporalSpatial:
//FIXME: private hack
//decoder->SurfaceFlagsTable[i] |= 0x00006000;
break;
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
default:
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
break;
}
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Allocate new VA-API decoder.
///
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
/// @returns a new prepared VA-API hardware decoder.
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static VaapiDecoder *VaapiNewHwDecoder(void)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
VaapiDecoder *decoder;
int i;
if (VaapiDecoderN == 1) {
Fatal(_("video/vaapi: out of decoders\n"));
}
if (!(decoder = calloc(1, sizeof(*decoder)))) {
Fatal(_("video/vaapi: out of memory\n"));
}
decoder->VaDisplay = VaDisplay;
decoder->Window = VideoWindow;
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VaapiInitSurfaceFlags(decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->DeintImages[0].image_id = VA_INVALID_ID;
decoder->DeintImages[1].image_id = VA_INVALID_ID;
decoder->DeintImages[2].image_id = VA_INVALID_ID;
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
decoder->DeintImages[3].image_id = VA_INVALID_ID;
decoder->DeintImages[4].image_id = VA_INVALID_ID;
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->Image->image_id = VA_INVALID_ID;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
for (i = 0; i < CODEC_SURFACES_MAX; ++i) {
decoder->SurfacesUsed[i] = VA_INVALID_ID;
decoder->SurfacesFree[i] = VA_INVALID_ID;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
// setup video surface ring buffer
atomic_set(&decoder->SurfacesFilled, 0);
for (i = 0; i < VIDEO_SURFACES_MAX; ++i) {
decoder->SurfacesRb[i] = VA_INVALID_ID;
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
decoder->LastSurface = VA_INVALID_ID;
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->BlackSurface = VA_INVALID_ID;
//
// Setup ffmpeg vaapi context
//
decoder->VaapiContext->display = VaDisplay;
decoder->VaapiContext->config_id = VA_INVALID_ID;
decoder->VaapiContext->context_id = VA_INVALID_ID;
#ifdef USE_GLX
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
decoder->GlxSurface[0] = VA_INVALID_ID;
decoder->GlxSurface[1] = VA_INVALID_ID;
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (GlxEnabled) {
// FIXME: create GLX context here
}
#endif
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight;
Force black picture after start or suspend.
2012-04-22 21:01:34 +02:00
decoder->Closing = -300 - 1;
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
decoder->PTS = AV_NOPTS_VALUE;
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
// get/put still not working
//decoder->GetPutImage = !VaapiBuggyIntel || VaapiNewIntel;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->GetPutImage = !VaapiBuggyIntel;
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiDecoders[VaapiDecoderN++] = decoder;
return decoder;
}
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
///
/// Cleanup VA-API.
///
/// @param decoder va-api hw decoder
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiCleanup(VaapiDecoder * decoder)
{
int filled;
VASurfaceID surface;
Fix bug: old surface stay in video ringbuffer.
2012-01-05 22:55:57 +01:00
int i;
C part of the plugin.
2011-12-07 15:05:38 +01:00
// flush output queue, only 1-2 frames buffered, no big loss
while ((filled = atomic_read(&decoder->SurfacesFilled))) {
decoder->SurfaceRead = (decoder->SurfaceRead + 1) % VIDEO_SURFACES_MAX;
atomic_dec(&decoder->SurfacesFilled);
surface = decoder->SurfacesRb[decoder->SurfaceRead];
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (surface == VA_INVALID_ID) {
Error(_("video/vaapi: invalid surface in ringbuffer\n"));
continue;
}
// can crash and hang
if (0 && vaSyncSurface(decoder->VaDisplay, surface)
C part of the plugin.
2011-12-07 15:05:38 +01:00
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (decoder->SurfaceRead != decoder->SurfaceWrite) {
abort();
}
Fix bug: old surface stay in video ringbuffer.
2012-01-05 22:55:57 +01:00
// clear ring buffer
for (i = 0; i < VIDEO_SURFACES_MAX; ++i) {
decoder->SurfacesRb[i] = VA_INVALID_ID;
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
decoder->LastSurface = VA_INVALID_ID;
#endif
Fix bug: old surface stay in video ringbuffer.
2012-01-05 22:55:57 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->WrongInterlacedWarned = 0;
// cleanup image
if (decoder->Image->image_id != VA_INVALID_ID) {
if (vaDestroyImage(VaDisplay,
decoder->Image->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
decoder->Image->image_id = VA_INVALID_ID;
}
// cleanup context and config
if (decoder->VaapiContext) {
if (decoder->VaapiContext->context_id != VA_INVALID_ID) {
if (vaDestroyContext(VaDisplay,
decoder->VaapiContext->context_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy context!\n"));
}
decoder->VaapiContext->context_id = VA_INVALID_ID;
}
if (decoder->VaapiContext->config_id != VA_INVALID_ID) {
if (vaDestroyConfig(VaDisplay,
decoder->VaapiContext->config_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy config!\n"));
}
decoder->VaapiContext->config_id = VA_INVALID_ID;
}
}
// cleanup surfaces
if (decoder->SurfaceFreeN || decoder->SurfaceUsedN) {
VaapiDestroySurfaces(decoder);
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
// cleanup images
if (decoder->DeintImages[0].image_id != VA_INVALID_ID) {
VaapiDestroyDeinterlaceImages(decoder);
}
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
decoder->SurfaceRead = 0;
decoder->SurfaceWrite = 0;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->SurfaceField = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Adds audio normalize support.
2012-04-19 16:01:20 +02:00
decoder->SyncCounter = 0;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->FrameCounter = 0;
decoder->FramesDisplayed = 0;
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter = 0;
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
decoder->Closing = 0;
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
decoder->PTS = AV_NOPTS_VALUE;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
VideoDeltaPTS = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Destroy a VA-API decoder.
///
/// @param decoder VA-API decoder
///
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static void VaapiDelHwDecoder(VaapiDecoder * decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
int i;
for (i = 0; i < VaapiDecoderN; ++i) {
if (VaapiDecoders[i] == decoder) {
VaapiDecoders[i] = NULL;
VaapiDecoderN--;
// FIXME: must copy last slot into empty slot and --
break;
}
}
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiCleanup(decoder);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (decoder->BlackSurface != VA_INVALID_ID) {
Add guards against cleanup errors.
2011-12-11 19:45:21 +01:00
//
// update OSD associate
//
if (VaOsdSubpicture != VA_INVALID_ID) {
if (vaDeassociateSubpicture(VaDisplay, VaOsdSubpicture,
&decoder->BlackSurface, 1) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't deassociate black surfaces\n"));
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaDestroySurfaces(decoder->VaDisplay, &decoder->BlackSurface, 1)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy a surface\n"));
}
}
#ifdef USE_GLX
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (decoder->GlxSurface[0] != VA_INVALID_ID) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaDestroySurfaceGLX(VaDisplay, decoder->GlxSurface[0])
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy glx surface!\n"));
}
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (decoder->GlxSurface[1] != VA_INVALID_ID) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaDestroySurfaceGLX(VaDisplay, decoder->GlxSurface[1])
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy glx surface!\n"));
}
}
if (decoder->GlTexture[0]) {
glDeleteTextures(2, decoder->GlTexture);
}
#endif
VaapiPrintFrames(decoder);
free(decoder);
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#ifdef DEBUG // currently unused, keep it for later
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
static VAProfile VaapiFindProfile(const VAProfile * profiles, unsigned n,
VAProfile profile);
static VAEntrypoint VaapiFindEntrypoint(const VAEntrypoint * entrypoints,
unsigned n, VAEntrypoint entrypoint);
///
/// 1080i
///
static void Vaapi1080i(void)
{
VAProfile profiles[vaMaxNumProfiles(VaDisplay)];
int profile_n;
VAEntrypoint entrypoints[vaMaxNumEntrypoints(VaDisplay)];
int entrypoint_n;
int p;
int e;
VAConfigAttrib attrib;
VAConfigID config_id;
VAContextID context_id;
VASurfaceID surfaces[32];
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
VAImage image[1];
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
int n;
uint32_t start_tick;
uint32_t tick;
p = -1;
e = -1;
// prepare va-api profiles
if (vaQueryConfigProfiles(VaDisplay, profiles, &profile_n)) {
Error(_("codec: vaQueryConfigProfiles failed"));
return;
}
// check profile
p = VaapiFindProfile(profiles, profile_n, VAProfileH264High);
if (p == -1) {
Debug(3, "\tno profile found\n");
return;
}
// prepare va-api entry points
if (vaQueryConfigEntrypoints(VaDisplay, p, entrypoints, &entrypoint_n)) {
Error(_("codec: vaQueryConfigEntrypoints failed"));
return;
}
e = VaapiFindEntrypoint(entrypoints, entrypoint_n, VAEntrypointVLD);
if (e == -1) {
Warning(_("codec: unsupported: slow path\n"));
return;
}
memset(&attrib, 0, sizeof(attrib));
attrib.type = VAConfigAttribRTFormat;
attrib.value = VA_RT_FORMAT_YUV420;
// create a configuration for the decode pipeline
if (vaCreateConfig(VaDisplay, p, e, &attrib, 1, &config_id)) {
Error(_("codec: can't create config"));
return;
}
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
if (vaCreateSurfaces(VaDisplay, VA_RT_FORMAT_YUV420, 1920, 1080, surfaces,
32, NULL, 0) != VA_STATUS_SUCCESS) {
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
Error(_("video/vaapi: can't create surfaces\n"));
return;
}
// bind surfaces to context
if (vaCreateContext(VaDisplay, config_id, 1920, 1080, VA_PROGRESSIVE,
surfaces, 32, &context_id)) {
Error(_("codec: can't create context"));
return;
}
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
#if 1
// without this 1080i will crash
image->image_id = VA_INVALID_ID;
if (vaDeriveImage(VaDisplay, surfaces[0], image)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaDeriveImage failed\n"));
}
if (image->image_id != VA_INVALID_ID) {
if (vaDestroyImage(VaDisplay, image->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
}
#else
vaBeginPicture(VaDisplay, context_id, surfaces[0]);
vaRenderPicture(VaDisplay, context_id, NULL, 0);
// aborts without valid buffers upload
vaEndPicture(VaDisplay, context_id);
#endif
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
start_tick = GetMsTicks();
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
for (n = 1; n < 2; ++n) {
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
if (vaPutSurface(VaDisplay, surfaces[0], VideoWindow,
// decoder src
0, 0, 1920, 1080,
// video dst
0, 0, 1920, 1080, NULL, 0, VA_TOP_FIELD | VA_CLEAR_DRAWABLE)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaPutSurface failed\n"));
}
if (vaPutSurface(VaDisplay, surfaces[0], VideoWindow,
// decoder src
0, 0, 1920, 1080,
// video dst
0, 0, 1920, 1080, NULL, 0, VA_BOTTOM_FIELD | VA_CLEAR_DRAWABLE)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaPutSurface failed\n"));
}
tick = GetMsTicks();
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (!(n % 10)) {
Cleanups.
2012-03-12 17:58:19 +01:00
fprintf(stderr, "%dms / frame\n", (tick - start_tick) / n);
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
}
}
// destory the stuff.
if (vaDestroyContext(VaDisplay, context_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy context!\n"));
}
if (vaDestroySurfaces(VaDisplay, surfaces, 32) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy surfaces\n"));
}
if (vaDestroyConfig(VaDisplay, config_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy config!\n"));
}
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
fprintf(stderr, "done\n");
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// VA-API setup.
///
/// @param display_name x11/xcb display name
///
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
/// @returns true if VA-API could be initialized, false otherwise.
///
static int VaapiInit(const char *display_name)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
int major;
int minor;
VADisplayAttribute attr;
const char *s;
VaOsdImage.image_id = VA_INVALID_ID;
VaOsdSubpicture = VA_INVALID_ID;
#ifdef USE_GLX
if (GlxEnabled) { // support glx
VaDisplay = vaGetDisplayGLX(XlibDisplay);
} else
#endif
{
VaDisplay = vaGetDisplay(XlibDisplay);
}
if (!VaDisplay) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Error(_("video/vaapi: Can't connect VA-API to X11 server on '%s'\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
display_name);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
VA-API/XvBA backend improvements.
2012-07-27 19:15:48 +02:00
// XvBA needs this:
setenv("DISPLAY", display_name, 1);
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaInitialize(VaDisplay, &major, &minor) != VA_STATUS_SUCCESS) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Error(_("video/vaapi: Can't inititialize VA-API on '%s'\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
display_name);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
vaTerminate(VaDisplay);
VaDisplay = NULL;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
s = vaQueryVendorString(VaDisplay);
Info(_("video/vaapi: libva %d.%d (%s) initialized\n"), major, minor, s);
//
// Setup fixes for driver bugs.
//
if (strstr(s, "VDPAU")) {
Info(_("video/vaapi: use vdpau bug workaround\n"));
setenv("VDPAU_VIDEO_PUTSURFACE_FAST", "0", 0);
VaapiBuggyVdpau = 1;
}
VA-API/XvBA backend improvements.
2012-07-27 19:15:48 +02:00
if (strstr(s, "XvBA")) {
VaapiBuggyXvBA = 1;
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (strstr(s, "Intel i965")) {
VaapiBuggyIntel = 1;
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
if (strstr(s, "Intel i965 driver - 1.0.16.")) {
VaapiNewIntel = 1;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
//
VADisplayAttribDirectSurface removed.
2012-03-06 16:56:26 +01:00
// check which attributes are supported
C part of the plugin.
2011-12-07 15:05:38 +01:00
//
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
attr.type = VADisplayAttribBackgroundColor;
attr.flags = VA_DISPLAY_ATTRIB_SETTABLE;
if (vaGetDisplayAttributes(VaDisplay, &attr, 1) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: Can't get background-color attribute\n"));
attr.value = 1;
}
Info(_("video/vaapi: background-color is %s\n"),
attr.value ? _("supported") : _("unsupported"));
// FIXME: VaapiSetBackground(VideoBackground);
C part of the plugin.
2011-12-07 15:05:38 +01:00
#if 0
//
// check the chroma format
//
attr.type = VAConfigAttribRTFormat attr.flags = VA_DISPLAY_ATTRIB_GETTABLE;
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
Vaapi1080i();
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 1;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// VA-API cleanup
///
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
static void VaapiExit(void)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
int i;
// FIXME: more VA-API cleanups...
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
// FIXME: can hang with vdpau in pthread_rwlock_wrlock
for (i = 0; i < VaapiDecoderN; ++i) {
if (VaapiDecoders[i]) {
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VaapiDelHwDecoder(VaapiDecoders[i]);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
VaapiDecoders[i] = NULL;
}
}
VaapiDecoderN = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (!VaDisplay) {
vaTerminate(VaDisplay);
VaDisplay = NULL;
}
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
//----------------------------------------------------------------------------
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
/// Update output for new size or aspect ratio.
///
/// @param decoder VA-API decoder
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiUpdateOutput(VaapiDecoder * decoder)
{
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VideoUpdateOutput(decoder->InputAspect, decoder->InputWidth,
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->InputHeight, decoder->Resolution, &decoder->OutputX,
&decoder->OutputY, &decoder->OutputWidth, &decoder->OutputHeight,
&decoder->CropX, &decoder->CropY, &decoder->CropWidth,
&decoder->CropHeight);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#ifdef USE_AUTOCROP
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->AutoCrop->State = 0;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->AutoCrop->Count = AutoCropDelay;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Find VA-API profile.
///
/// Check if the requested profile is supported by VA-API.
///
/// @param profiles a table of all supported profiles
/// @param n number of supported profiles
/// @param profile requested profile
///
/// @returns the profile if supported, -1 if unsupported.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static VAProfile VaapiFindProfile(const VAProfile * profiles, unsigned n,
VAProfile profile)
{
unsigned u;
for (u = 0; u < n; ++u) {
if (profiles[u] == profile) {
return profile;
}
}
return -1;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Find VA-API entry point.
///
/// Check if the requested entry point is supported by VA-API.
///
/// @param entrypoints a table of all supported entrypoints
/// @param n number of supported entrypoints
/// @param entrypoint requested entrypoint
///
/// @returns the entry point if supported, -1 if unsupported.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static VAEntrypoint VaapiFindEntrypoint(const VAEntrypoint * entrypoints,
unsigned n, VAEntrypoint entrypoint)
{
unsigned u;
for (u = 0; u < n; ++u) {
if (entrypoints[u] == entrypoint) {
return entrypoint;
}
}
return -1;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Callback to negotiate the PixelFormat.
///
/// @param fmt is the list of formats which are supported by the codec,
/// it is terminated by -1 as 0 is a valid format, the
/// formats are ordered by quality.
///
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
/// @note + 2 surface for software deinterlace
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static enum PixelFormat Vaapi_get_format(VaapiDecoder * decoder,
AVCodecContext * video_ctx, const enum PixelFormat *fmt)
{
const enum PixelFormat *fmt_idx;
VAProfile profiles[vaMaxNumProfiles(VaDisplay)];
int profile_n;
VAEntrypoint entrypoints[vaMaxNumEntrypoints(VaDisplay)];
int entrypoint_n;
int p;
int e;
VAConfigAttrib attrib;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video: new stream format %dms\n", GetMsTicks() - VideoSwitch);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
// create initial black surface and display
VaapiBlackSurface(decoder);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
// cleanup last context
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiCleanup(decoder);
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO
&& VideoHardwareDecoder == 1)
) { // hardware disabled by config
Reorder pts.
2011-12-20 15:05:35 +01:00
Debug(3, "codec: hardware acceleration disabled\n");
C part of the plugin.
2011-12-07 15:05:38 +01:00
goto slow_path;
}
p = -1;
e = -1;
// prepare va-api profiles
if (vaQueryConfigProfiles(VaDisplay, profiles, &profile_n)) {
Error(_("codec: vaQueryConfigProfiles failed"));
goto slow_path;
}
Debug(3, "codec: %d profiles\n", profile_n);
// check profile
switch (video_ctx->codec_id) {
case CODEC_ID_MPEG2VIDEO:
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
decoder->SurfacesNeeded =
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
CODEC_SURFACES_MPEG2 + VIDEO_SURFACES_MAX + 2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
p = VaapiFindProfile(profiles, profile_n, VAProfileMPEG2Main);
break;
case CODEC_ID_MPEG4:
case CODEC_ID_H263:
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
decoder->SurfacesNeeded =
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
CODEC_SURFACES_MPEG4 + VIDEO_SURFACES_MAX + 2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
p = VaapiFindProfile(profiles, profile_n,
VAProfileMPEG4AdvancedSimple);
break;
case CODEC_ID_H264:
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
decoder->SurfacesNeeded =
CODEC_SURFACES_H264 + VIDEO_SURFACES_MAX + 2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
// try more simple formats, fallback to better
if (video_ctx->profile == FF_PROFILE_H264_BASELINE) {
p = VaapiFindProfile(profiles, profile_n,
VAProfileH264Baseline);
if (p == -1) {
p = VaapiFindProfile(profiles, profile_n,
VAProfileH264Main);
}
} else if (video_ctx->profile == FF_PROFILE_H264_MAIN) {
p = VaapiFindProfile(profiles, profile_n, VAProfileH264Main);
}
if (p == -1) {
p = VaapiFindProfile(profiles, profile_n, VAProfileH264High);
}
break;
case CODEC_ID_WMV3:
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
decoder->SurfacesNeeded =
CODEC_SURFACES_VC1 + VIDEO_SURFACES_MAX + 2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
p = VaapiFindProfile(profiles, profile_n, VAProfileVC1Main);
break;
case CODEC_ID_VC1:
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
decoder->SurfacesNeeded =
CODEC_SURFACES_VC1 + VIDEO_SURFACES_MAX + 2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
p = VaapiFindProfile(profiles, profile_n, VAProfileVC1Advanced);
break;
default:
goto slow_path;
}
if (p == -1) {
Debug(3, "\tno profile found\n");
goto slow_path;
}
Debug(3, "\tprofile %d\n", p);
// prepare va-api entry points
if (vaQueryConfigEntrypoints(VaDisplay, p, entrypoints, &entrypoint_n)) {
Error(_("codec: vaQueryConfigEntrypoints failed"));
goto slow_path;
}
Debug(3, "codec: %d entrypoints\n", entrypoint_n);
// look through formats
for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
// check supported pixel format with entry point
switch (*fmt_idx) {
case PIX_FMT_VAAPI_VLD:
e = VaapiFindEntrypoint(entrypoints, entrypoint_n,
VAEntrypointVLD);
break;
case PIX_FMT_VAAPI_MOCO:
case PIX_FMT_VAAPI_IDCT:
Debug(3, "codec: this VA-API pixel format is not supported\n");
default:
continue;
}
if (e != -1) {
Debug(3, "\tentry point %d\n", e);
break;
}
}
if (e == -1) {
Warning(_("codec: unsupported: slow path\n"));
goto slow_path;
}
//
// prepare decoder
//
memset(&attrib, 0, sizeof(attrib));
attrib.type = VAConfigAttribRTFormat;
if (vaGetConfigAttributes(decoder->VaDisplay, p, e, &attrib, 1)) {
Error(_("codec: can't get attributes"));
goto slow_path;
}
if (attrib.value & VA_RT_FORMAT_YUV420) {
Info(_("codec: YUV 420 supported\n"));
}
if (attrib.value & VA_RT_FORMAT_YUV422) {
Info(_("codec: YUV 422 supported\n"));
}
if (attrib.value & VA_RT_FORMAT_YUV444) {
Info(_("codec: YUV 444 supported\n"));
}
if (!(attrib.value & VA_RT_FORMAT_YUV420)) {
Warning(_("codec: YUV 420 not supported\n"));
goto slow_path;
}
// create a configuration for the decode pipeline
if (vaCreateConfig(decoder->VaDisplay, p, e, &attrib, 1,
&decoder->VaapiContext->config_id)) {
Error(_("codec: can't create config"));
goto slow_path;
}
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
// FIXME: interlaced not valid here?
decoder->Resolution =
VideoResolutionGroup(video_ctx->width, video_ctx->height,
decoder->Interlaced);
// FIXME: need only to create and destroy surfaces for size changes
// or when number of needed surfaces changed!
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiCreateSurfaces(decoder, video_ctx->width, video_ctx->height);
// bind surfaces to context
if (vaCreateContext(decoder->VaDisplay, decoder->VaapiContext->config_id,
video_ctx->width, video_ctx->height, VA_PROGRESSIVE,
decoder->SurfacesFree, decoder->SurfaceFreeN,
&decoder->VaapiContext->context_id)) {
Error(_("codec: can't create context"));
goto slow_path;
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->PixFmt = *fmt_idx;
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->InputWidth = video_ctx->width;
decoder->InputHeight = video_ctx->height;
decoder->InputAspect = video_ctx->sample_aspect_ratio;
VaapiUpdateOutput(decoder);
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
//
// update OSD associate
//
VaapiAssociate(decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
#ifdef USE_GLX
if (GlxEnabled) {
GlxSetupDecoder(decoder);
// FIXME: try two textures, but vdpau-backend supports only 1 surface
if (vaCreateSurfaceGLX(decoder->VaDisplay, GL_TEXTURE_2D,
decoder->GlTexture[0], &decoder->GlxSurface[0])
!= VA_STATUS_SUCCESS) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Fatal(_("video/glx: can't create glx surfaces\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
// FIXME: this isn't usable with vdpau-backend
/*
if (vaCreateSurfaceGLX(decoder->VaDisplay, GL_TEXTURE_2D,
decoder->GlTexture[1], &decoder->GlxSurface[1])
!= VA_STATUS_SUCCESS) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Fatal(_("video/glx: can't create glx surfaces\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
*/
}
#endif
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
C part of the plugin.
2011-12-07 15:05:38 +01:00
return *fmt_idx;
slow_path:
// no accelerated format found
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
Fix bug: VA-API intel software decoder broken.
2012-02-01 18:36:24 +01:00
decoder->InputWidth = 0;
decoder->InputHeight = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
video_ctx->hwaccel_context = NULL;
return avcodec_default_get_format(video_ctx, fmt);
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Draw surface of the VA-API decoder with x11.
///
/// vaPutSurface with intel backend does sync on v-sync.
///
/// @param decoder VA-API decoder
/// @param surface VA-API surface id
/// @param interlaced flag interlaced source
/// @param top_field_first flag top_field_first for interlaced source
/// @param field interlaced draw: 0 first field, 1 second field
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiPutSurfaceX11(VaapiDecoder * decoder, VASurfaceID surface,
int interlaced, int top_field_first, int field)
{
unsigned type;
VAStatus status;
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
uint32_t s;
uint32_t e;
C part of the plugin.
2011-12-07 15:05:38 +01:00
// deinterlace
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
if (interlaced
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
&& VideoDeinterlace[decoder->Resolution] < VideoDeinterlaceSoftBob
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
&& VideoDeinterlace[decoder->Resolution] != VideoDeinterlaceWeave) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (top_field_first) {
if (field) {
type = VA_BOTTOM_FIELD;
} else {
type = VA_TOP_FIELD;
}
} else {
if (field) {
type = VA_TOP_FIELD;
} else {
type = VA_BOTTOM_FIELD;
}
}
} else {
type = VA_FRAME_PICTURE;
}
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
s = GetMsTicks();
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
xcb_flush(Connection);
C part of the plugin.
2011-12-07 15:05:38 +01:00
if ((status = vaPutSurface(decoder->VaDisplay, surface, decoder->Window,
// decoder src
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
decoder->CropX, decoder->CropY, decoder->CropWidth,
decoder->CropHeight,
C part of the plugin.
2011-12-07 15:05:38 +01:00
// video dst
decoder->OutputX, decoder->OutputY, decoder->OutputWidth,
decoder->OutputHeight, NULL, 0,
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
type | decoder->SurfaceFlagsTable[decoder->Resolution]))
!= VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
// switching video kills VdpPresentationQueueBlockUntilSurfaceIdle
Error(_("video/vaapi: vaPutSurface failed %d\n"), status);
}
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
if (0 && vaSyncSurface(decoder->VaDisplay, surface) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
e = GetMsTicks();
if (e - s > 2000) {
Cleanups.
2012-03-12 17:58:19 +01:00
Error(_("video/vaapi: gpu hung %dms %d\n"), e - s,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->FrameCounter);
Cleanups.
2012-03-12 17:58:19 +01:00
fprintf(stderr, _("video/vaapi: gpu hung %dms %d\n"), e - s,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->FrameCounter);
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (0) {
// check if surface is really ready
// VDPAU backend, says always ready
VASurfaceStatus status;
if (vaQuerySurfaceStatus(decoder->VaDisplay, surface, &status)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaQuerySurface failed\n"));
status = VASurfaceReady;
}
if (status != VASurfaceReady) {
Warning(_
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
("video/vaapi: surface %#010x not ready: still displayed %d\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
surface, status);
return;
}
}
if (0) {
int i;
// look how the status changes the next 40ms
for (i = 0; i < 40; ++i) {
VASurfaceStatus status;
if (vaQuerySurfaceStatus(VaDisplay, surface,
&status) != VA_STATUS_SUCCESS) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Error(_("video/vaapi: vaQuerySurface failed\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Debug(3, "video/vaapi: %2d %d\n", i, status);
usleep(1 * 1000);
}
}
Workaround for mpeg2 FFMpeg+VA-API+Intel GPU hung.
2012-01-31 20:45:09 +01:00
usleep(1 * 1000);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
#ifdef USE_GLX
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Render texture.
///
/// @param texture 2d texture
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static inline void VideoRenderTexture(GLuint texture, int x, int y, int width,
int height)
{
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, texture);
glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // no color
glBegin(GL_QUADS); {
glTexCoord2f(1.0f, 1.0f);
glVertex2i(x + width, y + height);
glTexCoord2f(0.0f, 1.0f);
glVertex2i(x, y + height);
glTexCoord2f(0.0f, 0.0f);
glVertex2i(x, y);
glTexCoord2f(1.0f, 0.0f);
glVertex2i(x + width, y);
#if 0
glTexCoord2f(0.0f, 0.0f);
glVertex2i(x, y);
glTexCoord2f(0.0f, 1.0f);
glVertex2i(x, y + height);
glTexCoord2f(1.0f, 1.0f);
glVertex2i(x + width, y + height);
glTexCoord2f(1.0f, 0.0f);
glVertex2i(x + width, y);
#endif
}
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Draw surface of the VA-API decoder with glx.
///
/// @param decoder VA-API decoder
/// @param surface VA-API surface id
/// @param interlaced flag interlaced source
/// @param top_field_first flag top_field_first for interlaced source
/// @param field interlaced draw: 0 first field, 1 second field
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiPutSurfaceGLX(VaapiDecoder * decoder, VASurfaceID surface,
int interlaced, int top_field_first, int field)
{
unsigned type;
uint32_t start;
uint32_t copy;
uint32_t end;
// deinterlace
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
if (interlaced
&& VideoDeinterlace[decoder->Resolution] != VideoDeinterlaceWeave) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (top_field_first) {
if (field) {
type = VA_BOTTOM_FIELD;
} else {
type = VA_TOP_FIELD;
}
} else {
if (field) {
type = VA_TOP_FIELD;
} else {
type = VA_BOTTOM_FIELD;
}
}
} else {
type = VA_FRAME_PICTURE;
}
start = GetMsTicks();
if (vaCopySurfaceGLX(decoder->VaDisplay, decoder->GlxSurface[0], surface,
Add vaapi color space conversion.
2012-01-13 12:28:56 +01:00
type | decoder->SurfaceFlagsTable[decoder->Resolution]) !=
VA_STATUS_SUCCESS) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Error(_("video/glx: vaCopySurfaceGLX failed\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
return;
}
copy = GetMsTicks();
// hardware surfaces are always busy
VideoRenderTexture(decoder->GlTexture[0], decoder->OutputX,
decoder->OutputY, decoder->OutputWidth, decoder->OutputHeight);
end = GetMsTicks();
//Debug(3, "video/vaapi/glx: %d copy %d render\n", copy - start, end - copy);
}
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Find VA-API image format.
///
/// @param decoder VA-API decoder
/// @param pix_fmt ffmpeg pixel format
/// @param[out] format image format
///
/// FIXME: can fallback from I420 to YV12, if not supported
/// FIXME: must check if put/get with this format is supported (see intel)
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static int VaapiFindImageFormat(VaapiDecoder * decoder,
enum PixelFormat pix_fmt, VAImageFormat * format)
{
VAImageFormat *imgfrmts;
int imgfrmt_n;
int i;
unsigned fourcc;
switch (pix_fmt) { // convert ffmpeg to VA-API
// NV12, YV12, I420, BGRA
// intel: I420 is native format for MPEG-2 decoded surfaces
// intel: NV12 is native format for H.264 decoded surfaces
case PIX_FMT_YUV420P:
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
// fourcc = VA_FOURCC_YV12; // YVU
C part of the plugin.
2011-12-07 15:05:38 +01:00
fourcc = VA_FOURCC('I', '4', '2', '0'); // YUV
break;
case PIX_FMT_NV12:
fourcc = VA_FOURCC_NV12;
break;
default:
Fatal(_("video/vaapi: unsupported pixel format %d\n"), pix_fmt);
}
imgfrmt_n = vaMaxNumImageFormats(decoder->VaDisplay);
imgfrmts = alloca(imgfrmt_n * sizeof(*imgfrmts));
if (vaQueryImageFormats(decoder->VaDisplay, imgfrmts, &imgfrmt_n)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaQueryImageFormats failed\n"));
return 0;
}
Debug(3, "video/vaapi: search format %c%c%c%c in %d image formats\n",
fourcc, fourcc >> 8, fourcc >> 16, fourcc >> 24, imgfrmt_n);
Debug(3, "video/vaapi: supported image formats:\n");
for (i = 0; i < imgfrmt_n; ++i) {
Debug(3, "video/vaapi:\t%c%c%c%c\t%d\n", imgfrmts[i].fourcc,
imgfrmts[i].fourcc >> 8, imgfrmts[i].fourcc >> 16,
imgfrmts[i].fourcc >> 24, imgfrmts[i].depth);
}
//
// search image format
//
for (i = 0; i < imgfrmt_n; ++i) {
if (imgfrmts[i].fourcc == fourcc) {
*format = imgfrmts[i];
Debug(3, "video/vaapi: use\t%c%c%c%c\t%d\n", imgfrmts[i].fourcc,
imgfrmts[i].fourcc >> 8, imgfrmts[i].fourcc >> 16,
imgfrmts[i].fourcc >> 24, imgfrmts[i].depth);
return 1;
}
}
Fatal("video/vaapi: pixel format %d unsupported by VA-API\n", pix_fmt);
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// FIXME: no fatal error!
C part of the plugin.
2011-12-07 15:05:38 +01:00
return 0;
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
/// Configure VA-API for new video format.
///
/// @param decoder VA-API decoder
///
/// @note called only for software decoder.
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
/// @note FIXME: combine with hardware decoder setup.
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static void VaapiSetup(VaapiDecoder * decoder,
const AVCodecContext * video_ctx)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
int width;
int height;
VAImageFormat format[1];
// create initial black surface and display
VaapiBlackSurface(decoder);
// cleanup last context
VaapiCleanup(decoder);
width = video_ctx->width;
height = video_ctx->height;
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
// FIXME: remove this if
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (decoder->Image->image_id != VA_INVALID_ID) {
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
abort(); // should be done by VaapiCleanup()
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
VaapiFindImageFormat(decoder, video_ctx->pix_fmt, format);
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// FIXME: this image is only needed for software decoder and auto-crop
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (decoder->GetPutImage
&& vaCreateImage(VaDisplay, format, width, height,
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->Image) != VA_STATUS_SUCCESS) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
Error(_("video/vaapi: can't create image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Debug(3,
"video/vaapi: created image %dx%d with id 0x%08x and buffer id 0x%08x\n",
width, height, decoder->Image->image_id, decoder->Image->buf);
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
// FIXME: interlaced not valid here?
decoder->Resolution =
VideoResolutionGroup(width, height, decoder->Interlaced);
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiCreateSurfaces(decoder, width, height);
#ifdef USE_GLX
if (GlxEnabled) {
// FIXME: destroy old context
GlxSetupDecoder(decoder);
// FIXME: try two textures
if (vaCreateSurfaceGLX(decoder->VaDisplay, GL_TEXTURE_2D,
decoder->GlTexture[0], &decoder->GlxSurface[0])
!= VA_STATUS_SUCCESS) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Fatal(_("video/glx: can't create glx surfaces\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
/*
if (vaCreateSurfaceGLX(decoder->VaDisplay, GL_TEXTURE_2D,
decoder->GlTexture[1], &decoder->GlxSurface[1])
!= VA_STATUS_SUCCESS) {
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Fatal(_("video/glx: can't create glx surfaces\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
*/
}
#endif
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
VaapiUpdateOutput(decoder);
//
// update OSD associate
//
VaapiAssociate(decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#ifdef USE_AUTOCROP
///
/// VA-API auto-crop support.
///
/// @param decoder VA-API hw decoder
///
static void VaapiAutoCrop(VaapiDecoder * decoder)
{
VASurfaceID surface;
uint32_t width;
uint32_t height;
void *va_image_data;
void *data[3];
uint32_t pitches[3];
int crop14;
int crop16;
int next_state;
int i;
width = decoder->InputWidth;
height = decoder->InputHeight;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
again:
if (decoder->GetPutImage && decoder->Image->image_id == VA_INVALID_ID) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
VAImageFormat format[1];
Debug(3, "video/vaapi: download image not available\n");
// FIXME: PixFmt not set!
//VaapiFindImageFormat(decoder, decoder->PixFmt, format);
VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
//VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
if (vaCreateImage(VaDisplay, format, width, height,
decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
return;
}
}
// no problem to go back, we just wrote it
// FIXME: we can pass the surface through.
surface =
decoder->SurfacesRb[(decoder->SurfaceWrite + VIDEO_SURFACES_MAX -
1) % VIDEO_SURFACES_MAX];
// Copy data from frame to image
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (!decoder->GetPutImage
&& vaDeriveImage(decoder->VaDisplay, surface,
decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaDeriveImage failed\n"));
decoder->GetPutImage = 1;
goto again;
}
if (decoder->GetPutImage
&& (i =
vaGetImage(decoder->VaDisplay, surface, 0, 0, decoder->InputWidth,
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->InputHeight,
decoder->Image->image_id)) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't get auto-crop image %d\n"), i);
printf(_("video/vaapi: can't get auto-crop image %d\n"), i);
return;
}
if (vaMapBuffer(VaDisplay, decoder->Image->buf, &va_image_data)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't map auto-crop image!\n"));
return;
}
// convert vaapi to our frame format
for (i = 0; (unsigned)i < decoder->Image->num_planes; ++i) {
data[i] = va_image_data + decoder->Image->offsets[i];
pitches[i] = decoder->Image->pitches[i];
}
AutoCropDetect(decoder->AutoCrop, width, height, data, pitches);
if (vaUnmapBuffer(VaDisplay, decoder->Image->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap auto-crop image!\n"));
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (!decoder->GetPutImage) {
if (vaDestroyImage(VaDisplay, decoder->Image->image_id)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
decoder->Image->image_id = VA_INVALID_ID;
}
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// FIXME: this a copy of vdpau, combine the two same things
// ignore black frames
if (decoder->AutoCrop->Y1 >= decoder->AutoCrop->Y2) {
return;
}
crop14 =
(decoder->InputWidth * decoder->InputAspect.num * 9) /
(decoder->InputAspect.den * 14);
crop14 = (decoder->InputHeight - crop14) / 2;
crop16 =
(decoder->InputWidth * decoder->InputAspect.num * 9) /
(decoder->InputAspect.den * 16);
crop16 = (decoder->InputHeight - crop16) / 2;
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
if (decoder->AutoCrop->Y1 >= crop16 - AutoCropTolerance
&& decoder->InputHeight - decoder->AutoCrop->Y2 >=
crop16 - AutoCropTolerance) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
next_state = 16;
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
} else if (decoder->AutoCrop->Y1 >= crop14 - AutoCropTolerance
&& decoder->InputHeight - decoder->AutoCrop->Y2 >=
crop14 - AutoCropTolerance) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
next_state = 14;
} else {
next_state = 0;
}
if (decoder->AutoCrop->State == next_state) {
return;
}
Debug(3, "video: crop aspect %d:%d %d/%d %d+%d\n",
decoder->InputAspect.num, decoder->InputAspect.den, crop14, crop16,
decoder->AutoCrop->Y1, decoder->InputHeight - decoder->AutoCrop->Y2);
Debug(3, "video: crop aspect %d -> %d\n", decoder->AutoCrop->State,
next_state);
switch (decoder->AutoCrop->State) {
case 16:
case 14:
if (decoder->AutoCrop->Count++ < AutoCropDelay / 2) {
return;
}
break;
case 0:
if (decoder->AutoCrop->Count++ < AutoCropDelay) {
return;
}
break;
}
decoder->AutoCrop->State = next_state;
if (next_state) {
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY =
(next_state ==
16 ? crop16 : crop14) + VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth = decoder->InputWidth - decoder->CropX * 2;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->CropHeight = decoder->InputHeight - decoder->CropY * 2;
// FIXME: this overwrites user choosen output position
// FIXME: resize kills the auto crop values
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// FIXME: support other 4:3 zoom modes
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->OutputX = 0;
decoder->OutputY = 0;
decoder->OutputWidth = (VideoWindowHeight * next_state) / 9;
decoder->OutputHeight = (VideoWindowWidth * 9) / next_state;
if ((unsigned)decoder->OutputWidth > VideoWindowWidth) {
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputY = (VideoWindowHeight - decoder->OutputHeight) / 2;
} else if ((unsigned)decoder->OutputHeight > VideoWindowHeight) {
decoder->OutputHeight = VideoWindowHeight;
decoder->OutputX = (VideoWindowWidth - decoder->OutputWidth) / 2;
}
Debug(3, "video: aspect output %dx%d %dx%d+%d+%d\n",
decoder->InputWidth, decoder->InputHeight, decoder->OutputWidth,
decoder->OutputHeight, decoder->OutputX, decoder->OutputY);
} else {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// sets AutoCrop->Count
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
VaapiUpdateOutput(decoder);
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->AutoCrop->Count = 0;
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
//
// update OSD associate
//
VaapiDeassociate(decoder);
VaapiAssociate(decoder);
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
}
///
/// VA-API check if auto-crop todo.
///
/// @param decoder VA-API hw decoder
///
/// @note a copy of VdpauCheckAutoCrop
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
/// @note auto-crop only supported with normal 4:3 display mode
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
///
static void VaapiCheckAutoCrop(VaapiDecoder * decoder)
{
// reduce load, check only n frames
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
if (Video4to3ZoomMode == VideoNormal && AutoCropInterval
&& !(decoder->FrameCounter % AutoCropInterval)) {
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
AVRational input_aspect_ratio;
AVRational tmp_ratio;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
av_reduce(&input_aspect_ratio.num, &input_aspect_ratio.den,
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->InputWidth * decoder->InputAspect.num,
decoder->InputHeight * decoder->InputAspect.den, 1024 * 1024);
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
tmp_ratio.num = 4;
tmp_ratio.den = 3;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// only 4:3 with 16:9/14:9 inside supported
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
if (!av_cmp_q(input_aspect_ratio, tmp_ratio)) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
VaapiAutoCrop(decoder);
} else {
decoder->AutoCrop->Count = 0;
decoder->AutoCrop->State = 0;
}
}
}
///
/// VA-API reset auto-crop.
///
static void VaapiResetAutoCrop(void)
{
int i;
for (i = 0; i < VaapiDecoderN; ++i) {
VaapiDecoders[i]->AutoCrop->State = 0;
VaapiDecoders[i]->AutoCrop->Count = 0;
}
}
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Queue output surface.
///
/// @param decoder VA-API decoder
/// @param surface output surface
/// @param softdec software decoder
///
/// @note we can't mix software and hardware decoder surfaces
///
static void VaapiQueueSurface(VaapiDecoder * decoder, VASurfaceID surface,
int softdec)
{
VASurfaceID old;
++decoder->FrameCounter;
if (1) { // can't wait for output queue empty
if (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
++decoder->FramesDropped;
Warning(_("video: output buffer full, dropping frame (%d/%d)\n"),
decoder->FramesDropped, decoder->FrameCounter);
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
if (!(decoder->FramesDisplayed % 300)) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiPrintFrames(decoder);
}
if (softdec) { // software surfaces only
VaapiReleaseSurface(decoder, surface);
}
return;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#if 0
C part of the plugin.
2011-12-07 15:05:38 +01:00
} else { // wait for output queue empty
while (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
VideoDisplayHandler();
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
//
// Check and release, old surface
//
if ((old = decoder->SurfacesRb[decoder->SurfaceWrite])
!= VA_INVALID_ID) {
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
#if 0
New video/audio sync code.
2011-12-15 22:45:55 +01:00
if (vaSyncSurface(decoder->VaDisplay, old) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
VASurfaceStatus status;
if (vaQuerySurfaceStatus(decoder->VaDisplay, old, &status)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaQuerySurface failed\n"));
status = VASurfaceReady;
}
if (status != VASurfaceReady) {
Warning(_
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
("video/vaapi: surface %#010x not ready: still displayed %d\n"),
C part of the plugin.
2011-12-07 15:05:38 +01:00
old, status);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (0
&& vaSyncSurface(decoder->VaDisplay,
old) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
}
#endif
// now we can release the surface
if (softdec) { // software surfaces only
VaapiReleaseSurface(decoder, old);
}
}
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#if 0
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
// FIXME: intel seems to forget this, nvidia GT 210 has speed problems here
if (VaapiBuggyIntel && VaOsdSubpicture != VA_INVALID_ID) {
Debug, if vaapi putsurface is too slow.
2012-01-16 23:54:48 +01:00
// FIXME: associate only if osd is displayed
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
//
// associate the OSD with surface
//
if (VaapiUnscaledOsd) {
if (vaAssociateSubpicture(VaDisplay, VaOsdSubpicture, &surface, 1,
0, 0, VaOsdImage.width, VaOsdImage.height, 0, 0,
VideoWindowWidth, VideoWindowHeight,
VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
} else {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// FIXME: auto-crop wrong position
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (vaAssociateSubpicture(VaDisplay, VaOsdSubpicture, &surface, 1,
0, 0, VaOsdImage.width, VaOsdImage.height, 0, 0,
decoder->InputWidth, decoder->InputHeight, 0)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
#endif
decoder->SurfacesRb[decoder->SurfaceWrite] = surface;
decoder->SurfaceWrite = (decoder->SurfaceWrite + 1)
% VIDEO_SURFACES_MAX;
atomic_inc(&decoder->SurfacesFilled);
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Debug(4, "video/vaapi: yy video surface %#010x ready\n", surface);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Create and display a black empty surface.
///
/// @param decoder VA-API decoder
///
static void VaapiBlackSurface(VaapiDecoder * decoder)
{
VAStatus status;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
uint32_t start;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
uint32_t sync;
uint32_t put1;
C part of the plugin.
2011-12-07 15:05:38 +01:00
// wait until we have osd subpicture
if (VaOsdSubpicture == VA_INVALID_ID) {
Warning(_("video/vaapi: no osd subpicture yet\n"));
return;
}
if (decoder->BlackSurface == VA_INVALID_ID) {
VA-API branch staging support.
2012-02-22 16:50:35 +01:00
if (vaCreateSurfaces(decoder->VaDisplay, VA_RT_FORMAT_YUV420,
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
VideoWindowWidth, VideoWindowHeight, &decoder->BlackSurface, 1,
NULL, 0) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: can't create a surface\n"));
return;
}
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
// full sized surface, no difference unscaled/scaled osd
if (vaAssociateSubpicture(decoder->VaDisplay, VaOsdSubpicture,
&decoder->BlackSurface, 1, 0, 0, VaOsdImage.width,
VaOsdImage.height, 0, 0, VideoWindowWidth, VideoWindowHeight,
0) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't associate subpicture\n"));
}
Debug(3, "video/vaapi: associate %08x\n", decoder->BlackSurface);
// FIXME: check if intel forgets this also
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
if (0 && decoder->Image->image_id == VA_INVALID_ID) {
VAImageFormat format[1];
void *va_image_data;
int i;
printf("No image\n");
VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
if ((status =
vaDeriveImage(decoder->VaDisplay, decoder->BlackSurface,
decoder->Image)) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaDeriveImage failed %d\n"), status);
if (vaCreateImage(VaDisplay, format, VideoWindowWidth,
VideoWindowHeight,
decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
}
}
if (vaMapBuffer(VaDisplay, decoder->Image->buf, &va_image_data)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't map the image!\n"));
}
for (i = 0; (unsigned)i < decoder->Image->data_size; i += 2) {
((uint8_t *) va_image_data)[i + 0] = 0xFF;
((uint8_t *) va_image_data)[i + 1] = 0xFF;
}
if (vaUnmapBuffer(VaDisplay,
decoder->Image->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap the image!\n"));
}
Workaround for mpeg2 FFMpeg+VA-API+Intel GPU hung.
2012-01-31 20:45:09 +01:00
if (vaDestroyImage(VaDisplay,
decoder->Image->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
}
// FIXME: intel didn't support put image.
if (0
&& vaPutImage(VaDisplay, decoder->BlackSurface,
decoder->Image->image_id, 0, 0, VideoWindowWidth,
VideoWindowHeight, 0, 0, VideoWindowWidth, VideoWindowHeight)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't put image!\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
New video/audio sync code.
2011-12-15 22:45:55 +01:00
start = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
New video/audio sync code.
2011-12-15 22:45:55 +01:00
if (vaSyncSurface(decoder->VaDisplay,
decoder->BlackSurface) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
} else {
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
New video/audio sync code.
2011-12-15 22:45:55 +01:00
start = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Debug(4, "video/vaapi: yy black video surface %#010x displayed\n",
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->BlackSurface);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
sync = GetMsTicks();
xcb_flush(Connection);
C part of the plugin.
2011-12-07 15:05:38 +01:00
if ((status =
vaPutSurface(decoder->VaDisplay, decoder->BlackSurface,
decoder->Window,
// decoder src
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
decoder->OutputX, decoder->OutputY, decoder->OutputWidth,
decoder->OutputHeight,
C part of the plugin.
2011-12-07 15:05:38 +01:00
// video dst
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
decoder->OutputX, decoder->OutputY, decoder->OutputWidth,
decoder->OutputHeight, NULL, 0,
C part of the plugin.
2011-12-07 15:05:38 +01:00
VA_FRAME_PICTURE)) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaPutSurface failed %d\n"), status);
}
clock_gettime(CLOCK_REALTIME, &decoder->FrameTime);
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
put1 = GetMsTicks();
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
if (put1 - sync > 2000) {
Cleanups.
2012-03-12 17:58:19 +01:00
Error(_("video/vaapi: gpu hung %dms %d\n"), put1 - sync,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->FrameCounter);
Cleanups.
2012-03-12 17:58:19 +01:00
fprintf(stderr, _("video/vaapi: gpu hung %dms %d\n"), put1 - sync,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->FrameCounter);
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
Debug(4, "video/vaapi: sync %2u put1 %2u\n", sync - start, put1 - sync);
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
if (0 && vaSyncSurface(decoder->VaDisplay, decoder->BlackSurface)
!= VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
Workaround for mpeg2 FFMpeg+VA-API+Intel GPU hung.
2012-01-31 20:45:09 +01:00
usleep(1 * 1000);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#define noUSE_VECTOR ///< use gcc vector extension
#ifdef USE_VECTOR
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
typedef char v16qi __attribute__ ((vector_size(16)));
typedef char v8qi __attribute__ ((vector_size(8)));
typedef int16_t v4hi __attribute__ ((vector_size(4)));
typedef int16_t v8hi __attribute__ ((vector_size(8)));
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
///
/// ELA Edge-based Line Averaging
/// Low-Complexity Interpolation Method
///
/// abcdefg abcdefg abcdefg abcdefg abcdefg
/// x x x x x
/// hijklmn hijklmn hijklmn hijklmn hijklmn
///
static void FilterLineSpatial(uint8_t * dst, const uint8_t * cur, int width,
int above, int below, int next)
{
int x;
// 8/16 128bit xmm register
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
for (x = 0; x < width; x += 8) {
v8qi c;
v8qi d;
v8qi e;
v8qi j;
v8qi k;
v8qi l;
v8qi t1;
v8qi t2;
v8qi pred;
v8qi score_l;
v8qi score_h;
v8qi t_l;
v8qi t_h;
v8qi zero;
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
// ignore bound violation
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
d = *(v8qi *) & cur[above + x];
k = *(v8qi *) & cur[below + x];
pred = __builtin_ia32_pavgb(d, k);
// score = ABS(c - j) + ABS(d - k) + ABS(e - l);
c = *(v8qi *) & cur[above + x - 1 * next];
e = *(v8qi *) & cur[above + x + 1 * next];
j = *(v8qi *) & cur[below + x - 1 * next];
l = *(v8qi *) & cur[below + x + 1 * next];
t1 = __builtin_ia32_psubusb(c, j);
t2 = __builtin_ia32_psubusb(j, c);
t1 = __builtin_ia32_pmaxub(t1, t2);
zero ^= zero;
score_l = __builtin_ia32_punpcklbw(t1, zero);
score_h = __builtin_ia32_punpckhbw(t1, zero);
t1 = __builtin_ia32_psubusb(d, k);
t2 = __builtin_ia32_psubusb(k, d);
t1 = __builtin_ia32_pmaxub(t1, t2);
t_l = __builtin_ia32_punpcklbw(t1, zero);
t_h = __builtin_ia32_punpckhbw(t1, zero);
score_l = __builtin_ia32_paddw(score_l, t_l);
score_h = __builtin_ia32_paddw(score_h, t_h);
t1 = __builtin_ia32_psubusb(e, l);
t2 = __builtin_ia32_psubusb(l, e);
t1 = __builtin_ia32_pmaxub(t1, t2);
t_l = __builtin_ia32_punpcklbw(t1, zero);
t_h = __builtin_ia32_punpckhbw(t1, zero);
score_l = __builtin_ia32_paddw(score_l, t_l);
score_h = __builtin_ia32_paddw(score_h, t_h);
*(v8qi *) & dst[x] = pred;
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
}
}
#else
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
/// Return the absolute value of an integer.
#define ABS(i) ((i) >= 0 ? (i) : (-(i)))
///
/// ELA Edge-based Line Averaging
/// Low-Complexity Interpolation Method
///
/// abcdefg abcdefg abcdefg abcdefg abcdefg
/// x x x x x
/// hijklmn hijklmn hijklmn hijklmn hijklmn
///
static void FilterLineSpatial(uint8_t * dst, const uint8_t * cur, int width,
int above, int below, int next)
{
int a, b, c, d, e, f, g, h, i, j, k, l, m, n;
int spatial_pred;
int spatial_score;
int score;
int x;
for (x = 0; x < width; ++x) {
a = cur[above + x - 3 * next]; // ignore bound violation
b = cur[above + x - 2 * next];
c = cur[above + x - 1 * next];
d = cur[above + x + 0 * next];
e = cur[above + x + 1 * next];
f = cur[above + x + 2 * next];
g = cur[above + x + 3 * next];
h = cur[below + x - 3 * next];
i = cur[below + x - 2 * next];
j = cur[below + x - 1 * next];
k = cur[below + x + 0 * next];
l = cur[below + x + 1 * next];
m = cur[below + x + 2 * next];
n = cur[below + x + 3 * next];
spatial_pred = (d + k) / 2; // 0 pixel
spatial_score = ABS(c - j) + ABS(d - k) + ABS(e - l);
score = ABS(b - k) + ABS(c - l) + ABS(d - m);
if (score < spatial_score) {
spatial_pred = (c + l) / 2; // 1 pixel
spatial_score = score;
score = ABS(a - l) + ABS(b - m) + ABS(c - n);
if (score < spatial_score) {
spatial_pred = (b + m) / 2; // 2 pixel
spatial_score = score;
}
}
score = ABS(d - i) + ABS(e - j) + ABS(f - k);
if (score < spatial_score) {
spatial_pred = (e + j) / 2; // -1 pixel
spatial_score = score;
score = ABS(e - h) + ABS(f - i) + ABS(g - j);
if (score < spatial_score) {
spatial_pred = (f + i) / 2; // -2 pixel
spatial_score = score;
}
}
dst[x + 0] = spatial_pred;
}
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
///
/// Vaapi spatial deinterlace.
///
/// @note FIXME: use common software deinterlace functions.
///
static void VaapiSpatial(VaapiDecoder * decoder, VAImage * src, VAImage * dst1,
VAImage * dst2)
{
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
uint32_t tick1;
uint32_t tick2;
uint32_t tick3;
uint32_t tick4;
uint32_t tick5;
uint32_t tick6;
uint32_t tick7;
uint32_t tick8;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
void *src_base;
void *dst1_base;
void *dst2_base;
unsigned y;
unsigned p;
uint8_t *tmp;
int pitch;
int width;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick1 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaMapBuffer(decoder->VaDisplay, src->buf,
&src_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick2 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaMapBuffer(decoder->VaDisplay, dst1->buf,
&dst1_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick3 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaMapBuffer(decoder->VaDisplay, dst2->buf,
&dst2_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick4 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (0) { // test all updated
memset(dst1_base, 0x00, dst1->data_size);
memset(dst2_base, 0xFF, dst2->data_size);
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
// use tmp copy FIXME: only for intel needed
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tmp = malloc(src->data_size);
memcpy(tmp, src_base, src->data_size);
if (src->num_planes == 2) { // NV12
pitch = src->pitches[0];
width = src->width;
for (y = 0; y < (unsigned)src->height; y++) { // Y
const uint8_t *cur;
cur = tmp + src->offsets[0] + y * pitch;
if (y & 1) {
// copy to 2nd
memcpy(dst2_base + src->offsets[0] + y * pitch, cur, width);
// create 1st
FilterLineSpatial(dst1_base + src->offsets[0] + y * pitch, cur,
width, y ? -pitch : pitch,
y + 1 < (unsigned)src->height ? pitch : -pitch, 1);
} else {
// copy to 1st
memcpy(dst1_base + src->offsets[0] + y * pitch, cur, width);
// create 2nd
FilterLineSpatial(dst2_base + src->offsets[0] + y * pitch, cur,
width, y ? -pitch : pitch,
y + 1 < (unsigned)src->height ? pitch : -pitch, 1);
}
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
if (VideoSkipChromaDeinterlace[decoder->Resolution]) {
for (y = 0; y < (unsigned)src->height / 2; y++) { // UV
const uint8_t *cur;
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
cur = tmp + src->offsets[1] + y * pitch;
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
// copy to 1st
memcpy(dst1_base + src->offsets[1] + y * pitch, cur, width);
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
// copy to 2nd
memcpy(dst2_base + src->offsets[1] + y * pitch, cur, width);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
} else {
for (y = 0; y < (unsigned)src->height / 2; y++) { // UV
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
const uint8_t *cur;
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
cur = tmp + src->offsets[1] + y * pitch;
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (y & 1) {
// copy to 2nd
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
memcpy(dst2_base + src->offsets[1] + y * pitch, cur,
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
width);
// create 1st
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
FilterLineSpatial(dst1_base + src->offsets[1] + y * pitch,
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
cur, width, y ? -pitch : pitch,
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
y + 1 < (unsigned)src->height / 2 ? pitch : -pitch, 2);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
} else {
// copy to 1st
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
memcpy(dst1_base + src->offsets[1] + y * pitch, cur,
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
width);
// create 2nd
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
FilterLineSpatial(dst2_base + src->offsets[1] + y * pitch,
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
cur, width, y ? -pitch : pitch,
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
y + 1 < (unsigned)src->height / 2 ? pitch : -pitch, 2);
}
}
}
} else { // YV12 or I420
for (p = 0; p < src->num_planes; ++p) {
pitch = src->pitches[p];
width = src->width >> (p != 0);
if (VideoSkipChromaDeinterlace[decoder->Resolution] && p) {
for (y = 0; y < (unsigned)(src->height >> 1); y++) {
const uint8_t *cur;
cur = tmp + src->offsets[p] + y * pitch;
// copy to 1st
memcpy(dst1_base + src->offsets[p] + y * pitch, cur,
width);
// copy to 2nd
memcpy(dst2_base + src->offsets[p] + y * pitch, cur,
width);
}
} else {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y++) {
const uint8_t *cur;
cur = tmp + src->offsets[p] + y * pitch;
if (y & 1) {
// copy to 2nd
memcpy(dst2_base + src->offsets[p] + y * pitch, cur,
width);
// create 1st
FilterLineSpatial(dst1_base + src->offsets[p] +
y * pitch, cur, width, y ? -pitch : pitch,
y + 1 < (unsigned)(src->height >> (p != 0))
? pitch : -pitch, 1);
} else {
// copy to 1st
memcpy(dst1_base + src->offsets[p] + y * pitch, cur,
width);
// create 2nd
FilterLineSpatial(dst2_base + src->offsets[p] +
y * pitch, cur, width, y ? -pitch : pitch,
y + 1 < (unsigned)(src->height >> (p != 0))
? pitch : -pitch, 1);
}
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
}
}
}
}
free(tmp);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick5 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, dst2->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick6 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, dst1->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick7 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, src->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick8 = GetMsTicks();
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
Debug(3, "video/vaapi: map=%2d/%2d/%2d deint=%2d umap=%2d/%2d/%2d\n",
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
tick2 - tick1, tick3 - tick2, tick4 - tick3, tick5 - tick4,
tick6 - tick5, tick7 - tick6, tick8 - tick7);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Vaapi bob deinterlace.
///
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
/// @note FIXME: use common software deinterlace functions.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiBob(VaapiDecoder * decoder, VAImage * src, VAImage * dst1,
VAImage * dst2)
{
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
uint32_t tick1;
uint32_t tick2;
uint32_t tick3;
uint32_t tick4;
uint32_t tick5;
uint32_t tick6;
uint32_t tick7;
uint32_t tick8;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
void *src_base;
void *dst1_base;
void *dst2_base;
unsigned y;
unsigned p;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick1 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaMapBuffer(decoder->VaDisplay, src->buf,
&src_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick2 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaMapBuffer(decoder->VaDisplay, dst1->buf,
&dst1_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick3 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaMapBuffer(decoder->VaDisplay, dst2->buf,
&dst2_base) != VA_STATUS_SUCCESS) {
Fatal("video/vaapi: can't map the image!\n");
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick4 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if (0) { // test all updated
C part of the plugin.
2011-12-07 15:05:38 +01:00
memset(dst1_base, 0x00, dst1->data_size);
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
memset(dst2_base, 0xFF, dst2->data_size);
return;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
#if 0
// interleave
C part of the plugin.
2011-12-07 15:05:38 +01:00
for (p = 0; p < src->num_planes; ++p) {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y += 2) {
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
memcpy(dst1_base + src->offsets[p] + (y + 0) * src->pitches[p],
src_base + src->offsets[p] + (y + 0) * src->pitches[p],
C part of the plugin.
2011-12-07 15:05:38 +01:00
src->pitches[p]);
memcpy(dst1_base + src->offsets[p] + (y + 1) * src->pitches[p],
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
src_base + src->offsets[p] + (y + 0) * src->pitches[p],
C part of the plugin.
2011-12-07 15:05:38 +01:00
src->pitches[p]);
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
memcpy(dst2_base + src->offsets[p] + (y + 0) * src->pitches[p],
src_base + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
memcpy(dst2_base + src->offsets[p] + (y + 1) * src->pitches[p],
src_base + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
}
}
#endif
#if 1
// use tmp copy
if (1) {
uint8_t *tmp;
tmp = malloc(src->data_size);
memcpy(tmp, src_base, src->data_size);
for (p = 0; p < src->num_planes; ++p) {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y += 2) {
memcpy(dst1_base + src->offsets[p] + (y + 0) * src->pitches[p],
tmp + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
memcpy(dst1_base + src->offsets[p] + (y + 1) * src->pitches[p],
tmp + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
memcpy(dst2_base + src->offsets[p] + (y + 0) * src->pitches[p],
tmp + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
memcpy(dst2_base + src->offsets[p] + (y + 1) * src->pitches[p],
tmp + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
}
}
free(tmp);
}
#endif
#if 0
// use multiple tmp copy
if (1) {
uint8_t *tmp_src;
uint8_t *tmp_dst1;
uint8_t *tmp_dst2;
tmp_src = malloc(src->data_size);
memcpy(tmp_src, src_base, src->data_size);
tmp_dst1 = malloc(src->data_size);
tmp_dst2 = malloc(src->data_size);
for (p = 0; p < src->num_planes; ++p) {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y += 2) {
memcpy(tmp_dst1 + src->offsets[p] + (y + 0) * src->pitches[p],
tmp_src + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
memcpy(tmp_dst1 + src->offsets[p] + (y + 1) * src->pitches[p],
tmp_src + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
memcpy(tmp_dst2 + src->offsets[p] + (y + 0) * src->pitches[p],
tmp_src + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
memcpy(tmp_dst2 + src->offsets[p] + (y + 1) * src->pitches[p],
tmp_src + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
}
}
memcpy(dst1_base, tmp_dst1, src->data_size);
memcpy(dst2_base, tmp_dst2, src->data_size);
free(tmp_src);
free(tmp_dst1);
free(tmp_dst2);
}
#endif
#if 0
// dst1 first
for (p = 0; p < src->num_planes; ++p) {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y += 2) {
memcpy(dst1_base + src->offsets[p] + (y + 0) * src->pitches[p],
src_base + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
memcpy(dst1_base + src->offsets[p] + (y + 1) * src->pitches[p],
src_base + src->offsets[p] + (y + 0) * src->pitches[p],
src->pitches[p]);
}
}
// dst2 next
for (p = 0; p < src->num_planes; ++p) {
for (y = 0; y < (unsigned)(src->height >> (p != 0)); y += 2) {
memcpy(dst2_base + src->offsets[p] + (y + 0) * src->pitches[p],
C part of the plugin.
2011-12-07 15:05:38 +01:00
src_base + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
memcpy(dst2_base + src->offsets[p] + (y + 1) * src->pitches[p],
src_base + src->offsets[p] + (y + 1) * src->pitches[p],
src->pitches[p]);
}
}
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
#endif
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick5 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, dst2->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick6 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, dst1->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick7 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaUnmapBuffer(decoder->VaDisplay, src->buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick8 = GetMsTicks();
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Debug(4, "video/vaapi: map=%2d/%2d/%2d deint=%2d umap=%2d/%2d/%2d\n",
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
tick2 - tick1, tick3 - tick2, tick4 - tick3, tick5 - tick4,
tick6 - tick5, tick7 - tick6, tick8 - tick7);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
///
/// Create software deinterlace images.
///
/// @param decoder VA-API decoder
///
static void VaapiCreateDeinterlaceImages(VaapiDecoder * decoder)
{
VAImageFormat format[1];
int i;
// NV12, YV12, I420, BGRA
// NV12 Y U/V 2x2
// YV12 Y V U 2x2
// I420 Y U V 2x2
// Intel needs NV12
VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
//VaapiFindImageFormat(decoder, PIX_FMT_YUV420P, format);
for (i = 0; i < 5; ++i) {
if (vaCreateImage(decoder->VaDisplay, format, decoder->InputWidth,
decoder->InputHeight,
decoder->DeintImages + i) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
}
}
#ifdef DEBUG
if (1) {
VAImage *img;
img = decoder->DeintImages;
Debug(3, "video/vaapi: %c%c%c%c %dx%d*%d\n", img->format.fourcc,
img->format.fourcc >> 8, img->format.fourcc >> 16,
img->format.fourcc >> 24, img->width, img->height,
img->num_planes);
}
#endif
}
///
/// Destroy software deinterlace images.
///
/// @param decoder VA-API decoder
///
static void VaapiDestroyDeinterlaceImages(VaapiDecoder * decoder)
{
int i;
for (i = 0; i < 5; ++i) {
if (vaDestroyImage(decoder->VaDisplay,
decoder->DeintImages[i].image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
decoder->DeintImages[i].image_id = VA_INVALID_ID;
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Vaapi software deinterlace.
///
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
/// @param decoder VA-API decoder
/// @param surface interlaced hardware surface
///
static void VaapiCpuDerive(VaapiDecoder * decoder, VASurfaceID surface)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
//
// vaPutImage not working, vaDeriveImage
//
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
uint32_t tick1;
uint32_t tick2;
uint32_t tick3;
uint32_t tick4;
uint32_t tick5;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
VAImage image[1];
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VAImage dest1[1];
VAImage dest2[1];
C part of the plugin.
2011-12-07 15:05:38 +01:00
VAStatus status;
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VASurfaceID out1;
VASurfaceID out2;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick1 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#if 0
// get image test
if (decoder->Image->image_id == VA_INVALID_ID) {
VAImageFormat format[1];
VaapiFindImageFormat(decoder, PIX_FMT_NV12, format);
if (vaCreateImage(VaDisplay, format, decoder->InputWidth,
decoder->InputHeight, decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
}
}
if (vaGetImage(decoder->VaDisplay, surface, 0, 0, decoder->InputWidth,
decoder->InputHeight, decoder->Image->image_id)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't get source image\n"));
VaapiQueueSurface(decoder, surface, 0);
VaapiQueueSurface(decoder, surface, 0);
return;
}
*image = *decoder->Image;
#else
C part of the plugin.
2011-12-07 15:05:38 +01:00
if ((status =
vaDeriveImage(decoder->VaDisplay, surface,
image)) != VA_STATUS_SUCCESS) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
Error(_("video/vaapi: vaDeriveImage failed %d\n"), status);
VaapiQueueSurface(decoder, surface, 0);
VaapiQueueSurface(decoder, surface, 0);
return;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#endif
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick2 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
Debug(4, "video/vaapi: %c%c%c%c %dx%d*%d\n", image->format.fourcc,
C part of the plugin.
2011-12-07 15:05:38 +01:00
image->format.fourcc >> 8, image->format.fourcc >> 16,
image->format.fourcc >> 24, image->width, image->height,
image->num_planes);
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
// get a free surfaces
out1 = VaapiGetSurface(decoder);
if (out1 == VA_INVALID_ID) {
abort();
}
if ((status =
vaDeriveImage(decoder->VaDisplay, out1,
dest1)) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaDeriveImage failed %d\n"), status);
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick3 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
out2 = VaapiGetSurface(decoder);
if (out2 == VA_INVALID_ID) {
abort();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if ((status =
vaDeriveImage(decoder->VaDisplay, out2,
dest2)) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaDeriveImage failed %d\n"), status);
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick4 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
switch (VideoDeinterlace[decoder->Resolution]) {
case VideoDeinterlaceSoftBob:
default:
VaapiBob(decoder, image, dest1, dest2);
break;
case VideoDeinterlaceSoftSpatial:
VaapiSpatial(decoder, image, dest1, dest2);
break;
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick5 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#if 1
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if (vaDestroyImage(VaDisplay, image->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if (vaDestroyImage(VaDisplay, dest1->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
if (vaDestroyImage(VaDisplay, dest2->image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VaapiQueueSurface(decoder, out1, 1);
VaapiQueueSurface(decoder, out2, 1);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick5 = GetMsTicks();
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
Debug(4, "video/vaapi: get=%2d get1=%2d get2=%d deint=%2d\n",
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick2 - tick1, tick3 - tick2, tick4 - tick3, tick5 - tick4);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
}
///
/// Vaapi software deinterlace.
///
/// @param decoder VA-API decoder
/// @param surface interlaced hardware surface
///
static void VaapiCpuPut(VaapiDecoder * decoder, VASurfaceID surface)
{
//
// vaPutImage working
//
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
uint32_t tick1;
uint32_t tick2;
uint32_t tick3;
uint32_t tick4;
uint32_t tick5;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
VAImage *img1;
VAImage *img2;
VAImage *img3;
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VASurfaceID out;
VAStatus status;
C part of the plugin.
2011-12-07 15:05:38 +01:00
//
// Create deinterlace images.
//
if (decoder->DeintImages[0].image_id == VA_INVALID_ID) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VaapiCreateDeinterlaceImages(decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (0 && vaSyncSurface(decoder->VaDisplay, surface) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
img1 = decoder->DeintImages;
img2 = decoder->DeintImages + 1;
img3 = decoder->DeintImages + 2;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick1 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaGetImage(decoder->VaDisplay, surface, 0, 0, decoder->InputWidth,
decoder->InputHeight, img1->image_id) != VA_STATUS_SUCCESS) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
Error(_("video/vaapi: can't get source image\n"));
VaapiQueueSurface(decoder, surface, 0);
VaapiQueueSurface(decoder, surface, 0);
return;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick2 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
// FIXME: handle top_field_first
C part of the plugin.
2011-12-07 15:05:38 +01:00
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
switch (VideoDeinterlace[decoder->Resolution]) {
case VideoDeinterlaceSoftBob:
default:
VaapiBob(decoder, img1, img2, img3);
break;
case VideoDeinterlaceSoftSpatial:
VaapiSpatial(decoder, img1, img2, img3);
break;
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick3 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
// get a free surface and upload the image
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
out = VaapiGetSurface(decoder);
if (out == VA_INVALID_ID) {
abort();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if ((status =
vaPutImage(VaDisplay, out, img2->image_id, 0, 0, img2->width,
img2->height, 0, 0, img2->width,
img2->height)) != VA_STATUS_SUCCESS) {
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
Error(_("video/vaapi: can't put image: %d!\n"), status);
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
abort();
}
VaapiQueueSurface(decoder, out, 1);
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
if (0 && vaSyncSurface(decoder->VaDisplay, out) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick4 = GetMsTicks();
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
Debug(4, "video/vaapi: deint %d %#010x -> %#010x\n", decoder->SurfaceField,
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
surface, out);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
// get a free surface and upload the image
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
out = VaapiGetSurface(decoder);
if (out == VA_INVALID_ID) {
abort();
}
if (vaPutImage(VaDisplay, out, img3->image_id, 0, 0, img3->width,
C part of the plugin.
2011-12-07 15:05:38 +01:00
img3->height, 0, 0, img3->width,
img3->height) != VA_STATUS_SUCCESS) {
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
Error(_("video/vaapi: can't put image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VaapiQueueSurface(decoder, out, 1);
Little speed improved Intel VA-API deinterlace.
2012-01-17 18:53:53 +01:00
if (0 && vaSyncSurface(decoder->VaDisplay, out) != VA_STATUS_SUCCESS) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
tick5 = GetMsTicks();
Debug(4, "video/vaapi: get=%2d deint=%2d put1=%2d put2=%2d\n",
tick2 - tick1, tick3 - tick2, tick4 - tick3, tick5 - tick4);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
}
///
/// Vaapi software deinterlace.
///
/// @param decoder VA-API decoder
/// @param surface interlaced hardware surface
///
static void VaapiCpuDeinterlace(VaapiDecoder * decoder, VASurfaceID surface)
{
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (decoder->GetPutImage) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VaapiCpuPut(decoder, surface);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
} else {
VaapiCpuDerive(decoder, surface);
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
// FIXME: must release software input surface
}
///
/// Render a ffmpeg frame
///
/// @param decoder VA-API decoder
/// @param video_ctx ffmpeg video codec context
/// @param frame frame to display
///
static void VaapiRenderFrame(VaapiDecoder * decoder,
Initial vdpau support.
2011-12-21 12:50:14 +01:00
const AVCodecContext * video_ctx, const AVFrame * frame)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
VASurfaceID surface;
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
int interlaced;
// FIXME: some tv-stations toggle interlace on/off
// frame->interlaced_frame isn't always correct set
interlaced = frame->interlaced_frame;
if (video_ctx->height == 720) {
if (interlaced && !decoder->WrongInterlacedWarned) {
Debug(3, "video/vaapi: wrong interlace flag fixed\n");
decoder->WrongInterlacedWarned = 1;
}
interlaced = 0;
} else {
if (!interlaced && !decoder->WrongInterlacedWarned) {
Debug(3, "video/vaapi: wrong interlace flag fixed\n");
decoder->WrongInterlacedWarned = 1;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
interlaced = 1;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
// FIXME: should be done by init video_ctx->field_order
if (decoder->Interlaced != interlaced
|| decoder->TopFieldFirst != frame->top_field_first) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
#if 0
// field_order only in git
Debug(3, "video/vaapi: interlaced %d top-field-first %d - %d\n",
interlaced, frame->top_field_first, video_ctx->field_order);
Use old aspect-ratio, make thread joinable.
2011-12-08 17:38:39 +01:00
#else
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
Debug(3, "video/vaapi: interlaced %d top-field-first %d\n", interlaced,
frame->top_field_first);
Use old aspect-ratio, make thread joinable.
2011-12-08 17:38:39 +01:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->Interlaced = interlaced;
decoder->TopFieldFirst = frame->top_field_first;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->SurfaceField = 0;
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
}
// update aspect ratio changes
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,60,100)
if (decoder->InputWidth && decoder->InputHeight
&& av_cmp_q(decoder->InputAspect, frame->sample_aspect_ratio)) {
Debug(3, "video/vaapi: aspect ratio changed\n");
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->InputAspect = frame->sample_aspect_ratio;
VaapiUpdateOutput(decoder);
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
#else
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
if (decoder->InputWidth && decoder->InputHeight
&& av_cmp_q(decoder->InputAspect, video_ctx->sample_aspect_ratio)) {
Debug(3, "video/vaapi: aspect ratio changed\n");
decoder->InputAspect = video_ctx->sample_aspect_ratio;
VaapiUpdateOutput(decoder);
}
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
//
// Hardware render
//
if (video_ctx->hwaccel_context) {
if (video_ctx->height != decoder->InputHeight
|| video_ctx->width != decoder->InputWidth) {
Error(_("video/vaapi: stream <-> surface size mismatch\n"));
return;
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
surface = (unsigned)(size_t) frame->data[3];
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Debug(4, "video/vaapi: hw render hw surface %#010x\n", surface);
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if (interlaced
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
&& VideoDeinterlace[decoder->Resolution] >=
VideoDeinterlaceSoftBob) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VaapiCpuDeinterlace(decoder, surface);
} else {
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiQueueSurface(decoder, surface, 0);
}
//
// VAImage render
//
} else {
void *va_image_data;
int i;
AVPicture picture[1];
int width;
int height;
Debug(4, "video/vaapi: hw render sw surface\n");
width = video_ctx->width;
height = video_ctx->height;
//
// Check image, format, size
//
Fix bug: VA-API intel software decoder broken.
2012-02-01 18:36:24 +01:00
if ((decoder->GetPutImage && decoder->Image->image_id == VA_INVALID_ID)
C part of the plugin.
2011-12-07 15:05:38 +01:00
|| decoder->PixFmt != video_ctx->pix_fmt
|| width != decoder->InputWidth
|| height != decoder->InputHeight) {
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
Debug(3,
"video/vaapi: stream <-> surface size/interlace mismatch\n");
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->PixFmt = video_ctx->pix_fmt;
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
// FIXME: aspect done above!
C part of the plugin.
2011-12-07 15:05:38 +01:00
decoder->InputWidth = width;
decoder->InputHeight = height;
VaapiSetup(decoder, video_ctx);
}
// FIXME: Need to insert software deinterlace here
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// FIXME: can/must insert auto-crop here (is done after upload)
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
// get a free surface and upload the image
surface = VaapiGetSurface(decoder);
Debug(4, "video/vaapi: video surface %#010x displayed\n", surface);
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (!decoder->GetPutImage
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
&& vaDeriveImage(decoder->VaDisplay, surface,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->Image) != VA_STATUS_SUCCESS) {
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VAImageFormat format[1];
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
Error(_("video/vaapi: vaDeriveImage failed\n"));
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->GetPutImage = 1;
VaapiFindImageFormat(decoder, video_ctx->pix_fmt, format);
if (vaCreateImage(VaDisplay, format, width, height,
decoder->Image) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create image!\n"));
}
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
//
// Copy data from frame to image
//
if (vaMapBuffer(VaDisplay, decoder->Image->buf, &va_image_data)
!= VA_STATUS_SUCCESS) {
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Error(_("video/vaapi: can't map the image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
// crazy: intel mixes YV12 and NV12 with mpeg
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
if (decoder->Image->format.fourcc == VA_FOURCC_NV12) {
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
int x;
// intel NV12 convert YV12 to NV12
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
// copy Y
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
for (i = 0; i < height; ++i) {
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
memcpy(va_image_data + decoder->Image->offsets[0] +
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
decoder->Image->pitches[0] * i,
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
frame->data[0] + frame->linesize[0] * i,
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
frame->linesize[0]);
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
}
// copy UV
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
for (i = 0; i < height / 2; ++i) {
for (x = 0; x < frame->linesize[1]; ++x) {
((uint8_t *) va_image_data)[decoder->Image->offsets[1]
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
+ decoder->Image->pitches[1] * i + x * 2 + 0]
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
= frame->data[1][i * frame->linesize[1] + x];
((uint8_t *) va_image_data)[decoder->Image->offsets[1]
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
+ decoder->Image->pitches[1] * i + x * 2 + 1]
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
= frame->data[2][i * frame->linesize[2] + x];
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
}
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
}
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
// vdpau uses this
} else if (decoder->Image->format.fourcc == VA_FOURCC('I', '4', '2',
'0')) {
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
picture->data[0] = va_image_data + decoder->Image->offsets[0];
picture->linesize[0] = decoder->Image->pitches[0];
picture->data[1] = va_image_data + decoder->Image->offsets[1];
picture->linesize[1] = decoder->Image->pitches[2];
picture->data[2] = va_image_data + decoder->Image->offsets[2];
picture->linesize[2] = decoder->Image->pitches[1];
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
av_picture_copy(picture, (AVPicture *) frame, video_ctx->pix_fmt,
width, height);
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
} else if (decoder->Image->num_planes == 3) {
Repair software decoder with vaapi vdpau backend.
2012-01-29 19:28:46 +01:00
picture->data[0] = va_image_data + decoder->Image->offsets[0];
picture->linesize[0] = decoder->Image->pitches[0];
picture->data[1] = va_image_data + decoder->Image->offsets[2];
picture->linesize[1] = decoder->Image->pitches[2];
picture->data[2] = va_image_data + decoder->Image->offsets[1];
picture->linesize[2] = decoder->Image->pitches[1];
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
av_picture_copy(picture, (AVPicture *) frame, video_ctx->pix_fmt,
width, height);
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
if (vaUnmapBuffer(VaDisplay, decoder->Image->buf)
!= VA_STATUS_SUCCESS) {
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Error(_("video/vaapi: can't unmap the image!\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Debug(4, "video/vaapi: buffer %dx%d <- %dx%d\n", decoder->Image->width,
decoder->Image->height, width, height);
C part of the plugin.
2011-12-07 15:05:38 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (decoder->GetPutImage
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
&& (i =
vaPutImage(VaDisplay, surface, decoder->Image->image_id, 0, 0,
width, height, 0, 0, width,
height)) != VA_STATUS_SUCCESS) {
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Error(_("video/vaapi: can't put image err:%d!\n"), i);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
if (!decoder->GetPutImage) {
if (vaDestroyImage(VaDisplay, decoder->Image->image_id)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
decoder->Image->image_id = VA_INVALID_ID;
Workaround for mpeg2 FFMpeg+VA-API+Intel GPU hung.
2012-01-31 20:45:09 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiQueueSurface(decoder, surface, 1);
}
if (decoder->Interlaced) {
++decoder->FrameCounter;
}
}
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// Advance displayed frame of decoder.
///
/// @param decoder VA-API hw decoder
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
static void VaapiAdvanceDecoderFrame(VaapiDecoder * decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// next surface, if complete frame is displayed (1 -> 0)
if (decoder->SurfaceField) {
New video/audio sync code.
2011-12-15 22:45:55 +01:00
VASurfaceID surface;
C part of the plugin.
2011-12-07 15:05:38 +01:00
int filled;
filled = atomic_read(&decoder->SurfacesFilled);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: this should check the caller
// check decoder, if new surface is available
if (filled <= 1) {
// keep use of last surface
Reduces audio latency, increases audio buffer time.
2012-01-27 23:33:10 +01:00
++decoder->FramesDuped;
Release Version 0.4.6.
2012-02-02 23:32:51 +01:00
// FIXME: don't warn after stream start, don't warn during pause
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Error(_("video: display buffer empty, duping frame (%d/%d) %d\n"),
decoder->FramesDuped, decoder->FrameCounter,
VideoGetBuffers());
return;
}
// wait for rendering finished
surface = decoder->SurfacesRb[decoder->SurfaceRead];
if (vaSyncSurface(decoder->VaDisplay, surface) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaSyncSurface failed\n"));
New video/audio sync code.
2011-12-15 22:45:55 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->SurfaceRead = (decoder->SurfaceRead + 1) % VIDEO_SURFACES_MAX;
atomic_dec(&decoder->SurfacesFilled);
// progressiv oder software deinterlacer
decoder->SurfaceField = !decoder->Interlaced
|| VideoDeinterlace[decoder->Resolution]
>= VideoDeinterlaceSoftBob;
return;
New video/audio sync code.
2011-12-15 22:45:55 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->SurfaceField = 1;
New video/audio sync code.
2011-12-15 22:45:55 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Display a video frame.
///
/// @todo FIXME: add detection of missed frames
///
New video/audio sync code.
2011-12-15 22:45:55 +01:00
static void VaapiDisplayFrame(void)
{
struct timespec nowtime;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
New video/audio sync code.
2011-12-15 22:45:55 +01:00
uint32_t start;
uint32_t put1;
uint32_t put2;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
New video/audio sync code.
2011-12-15 22:45:55 +01:00
int i;
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VaapiDecoder *decoder;
New video/audio sync code.
2011-12-15 22:45:55 +01:00
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
if (VideoSurfaceModesChanged) { // handle changed modes
for (i = 0; i < VaapiDecoderN; ++i) {
VaapiInitSurfaceFlags(VaapiDecoders[i]);
}
VideoSurfaceModesChanged = 0;
}
New video/audio sync code.
2011-12-15 22:45:55 +01:00
// look if any stream have a new surface available
for (i = 0; i < VaapiDecoderN; ++i) {
VASurfaceID surface;
int filled;
decoder = VaapiDecoders[i];
decoder->FramesDisplayed++;
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter++;
New video/audio sync code.
2011-12-15 22:45:55 +01:00
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
// wait for display finished
if (decoder->LastSurface != VA_INVALID_ID) {
if (vaSyncSurface(decoder->VaDisplay, decoder->LastSurface)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: vaSyncSurface failed\n"));
}
}
#endif
New video/audio sync code.
2011-12-15 22:45:55 +01:00
filled = atomic_read(&decoder->SurfacesFilled);
// no surface availble show black with possible osd
if (!filled) {
VaapiBlackSurface(decoder);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
decoder->LastSurface = decoder->BlackSurface;
#endif
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VaapiMessage(3, "video/vaapi: black surface displayed\n");
New video/audio sync code.
2011-12-15 22:45:55 +01:00
continue;
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
surface = decoder->SurfacesRb[decoder->SurfaceRead];
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef VA_EXP
decoder->LastSurface = surface;
#endif
New video/audio sync code.
2011-12-15 22:45:55 +01:00
#ifdef DEBUG
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
if (surface == VA_INVALID_ID) {
printf(_("video/vaapi: invalid surface in ringbuffer\n"));
}
Use only the needed number of surfaces. Fix problem with video-xvba and too many surfaces used. Prepare new audio driver "oss".
2011-12-31 18:55:07 +01:00
Debug(4, "video/vaapi: yy video surface %#010x displayed\n", surface);
C part of the plugin.
2011-12-07 15:05:38 +01:00
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
start = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
Debug, if vaapi putsurface is too slow.
2012-01-16 23:54:48 +01:00
// VDPAU driver + INTEL driver does no v-sync with 1080
Audio/video sync improvements. Configurable audio delay. Use monotonic pts. Support old libav or ffmpeg libraries.
2011-12-19 17:03:40 +01:00
if (0 && decoder->Interlaced
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
// FIXME: buggy libva-driver-vdpau, buggy libva-driver-intel
New video/audio sync code.
2011-12-15 22:45:55 +01:00
&& (VaapiBuggyVdpau || (0 && VaapiBuggyIntel
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
&& decoder->InputHeight == 1080))
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
&& VideoDeinterlace[decoder->Resolution] != VideoDeinterlaceWeave) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
VaapiPutSurfaceX11(decoder, surface, decoder->Interlaced,
decoder->TopFieldFirst, 0);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
C part of the plugin.
2011-12-07 15:05:38 +01:00
put1 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
VaapiPutSurfaceX11(decoder, surface, decoder->Interlaced,
decoder->TopFieldFirst, 1);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
put2 = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
} else {
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
VaapiPutSurfaceX11(decoder, surface, decoder->Interlaced,
decoder->TopFieldFirst, decoder->SurfaceField);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
put1 = GetMsTicks();
put2 = put1;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
clock_gettime(CLOCK_REALTIME, &nowtime);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: 31 only correct for 50Hz
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
if ((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec -
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->FrameTime.tv_nsec) > 31 * 1000 * 1000) {
// FIXME: ignore still-frame, trick-speed
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/vaapi: time/frame too long %ldms\n",
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec -
decoder->FrameTime.tv_nsec)) / (1000 * 1000));
New video/audio sync code.
2011-12-15 22:45:55 +01:00
Debug(4, "video/vaapi: put1 %2u put2 %2u\n", put1 - start,
put2 - put1);
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
}
Debug, if vaapi putsurface is too slow.
2012-01-16 23:54:48 +01:00
#ifdef noDEBUG
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/vaapi: time/frame %ldms\n",
Debug, if vaapi putsurface is too slow.
2012-01-16 23:54:48 +01:00
((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec -
decoder->FrameTime.tv_nsec)) / (1000 * 1000));
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
if (put2 > start + 20) {
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/vaapi: putsurface too long %ums\n", put2 - start);
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
}
New video/audio sync code.
2011-12-15 22:45:55 +01:00
Debug(4, "video/vaapi: put1 %2u put2 %2u\n", put1 - start,
put2 - put1);
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
#endif
New video/audio sync code.
2011-12-15 22:45:55 +01:00
Workaround for 1080i with intel driver 1.0.15.
2011-12-13 17:23:06 +01:00
decoder->FrameTime = nowtime;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// Set VA-API decoder video clock.
///
/// @param decoder VA-API hardware decoder
/// @param pts audio presentation timestamp
///
void VaapiSetClock(VaapiDecoder * decoder, int64_t pts)
{
decoder->PTS = pts;
}
///
/// Get VA-API decoder video clock.
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// @param decoder VA-API decoder
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
static int64_t VaapiGetClock(const VaapiDecoder * decoder)
{
// pts is the timestamp of the latest decoded frame
if (decoder->PTS == (int64_t) AV_NOPTS_VALUE) {
return AV_NOPTS_VALUE;
}
// subtract buffered decoded frames
if (decoder->Interlaced) {
return decoder->PTS -
20 * 90 * (2 * atomic_read(&decoder->SurfacesFilled)
- decoder->SurfaceField);
}
return decoder->PTS - 20 * 90 * (atomic_read(&decoder->SurfacesFilled) +
2);
}
///
/// Set trick play speed.
///
/// @param decoder VA-API decoder
/// @param speed trick speed (0 = normal)
///
static void VaapiSetTrickSpeed(VaapiDecoder * decoder, int speed)
{
decoder->TrickSpeed = speed;
Fix bug: VA-API trickspeed.
2012-08-17 10:33:10 +02:00
decoder->TrickCounter = speed;
Reset closing only, if trickspeed is set.
2012-08-18 15:53:14 +02:00
if (speed) {
decoder->Closing = 0;
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
///
/// Sync decoder output to audio.
///
/// trick-speed show frame <n> times
/// still-picture show frame until new frame arrives
/// 60hz-mode repeat every 5th picture
/// video>audio slow down video by duplicating frames
/// video<audio speed up video by skipping frames
/// soft-start show every second frame
///
/// @param decoder VDPAU hw decoder
///
static void VaapiSyncDecoder(VaapiDecoder * decoder)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
int err;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int filled;
int64_t audio_clock;
int64_t video_clock;
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
err = 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
audio_clock = AudioGetClock();
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
video_clock = VaapiGetClock(decoder);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
filled = atomic_read(&decoder->SurfacesFilled);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// 60Hz: repeat every 5th field
if (Video60HzMode && !(decoder->FramesDisplayed % 6)) {
if (audio_clock == (int64_t) AV_NOPTS_VALUE
|| video_clock == (int64_t) AV_NOPTS_VALUE) {
goto out;
}
// both clocks are known
if (audio_clock + VideoAudioDelay <= video_clock + 15 * 90) {
goto out;
}
// out of sync: audio before video
if (!decoder->TrickSpeed) {
goto skip_sync;
}
}
// TrickSpeed
if (decoder->TrickSpeed) {
if (decoder->TrickCounter--) {
goto out;
}
decoder->TrickCounter = decoder->TrickSpeed;
Skip audio sync while trick play.
2012-04-26 15:33:51 +02:00
goto skip_sync;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
// at start of new video stream, soft or hard sync video to audio
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
// FIXME: video waits for audio, audio for video
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
if (!VideoSoftStartSync && decoder->StartCounter < VideoSoftStartFrames
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
&& video_clock != (int64_t) AV_NOPTS_VALUE
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
&& (audio_clock == (int64_t) AV_NOPTS_VALUE
|| video_clock > audio_clock + VideoAudioDelay + 120 * 90)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
err =
VaapiMessage(3, "video: initial slow down video, frame %d\n",
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
goto out;
}
if (decoder->SyncCounter && decoder->SyncCounter--) {
goto skip_sync;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (audio_clock != (int64_t) AV_NOPTS_VALUE
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
&& video_clock != (int64_t) AV_NOPTS_VALUE) {
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// both clocks are known
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) {
err = VaapiMessage(3, "video: audio/video difference too big\n");
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (video_clock > audio_clock + VideoAudioDelay + 100 * 90) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: this quicker sync step, did not work with new code!
err = VaapiMessage(3, "video: slow down video, duping frame\n");
++decoder->FramesDuped;
decoder->SyncCounter = 1;
goto out;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (video_clock > audio_clock + VideoAudioDelay + 45 * 90) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
err = VaapiMessage(3, "video: slow down video, duping frame\n");
++decoder->FramesDuped;
decoder->SyncCounter = 1;
goto out;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (audio_clock + VideoAudioDelay > video_clock + 15 * 90
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
&& filled > 1 + 2 * decoder->Interlaced) {
err = VaapiMessage(3, "video: speed up video, droping frame\n");
++decoder->FramesDropped;
VaapiAdvanceDecoderFrame(decoder);
decoder->SyncCounter = 1;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
skip_sync:
// check if next field is available
if (decoder->SurfaceField && filled <= 1) {
if (filled == 1) {
++decoder->FramesDuped;
// FIXME: don't warn after stream start, don't warn during pause
err =
VaapiMessage(1,
_("video: decoder buffer empty, "
"duping frame (%d/%d) %d v-buf\n"), decoder->FramesDuped,
decoder->FrameCounter, VideoGetBuffers());
New audio filters next part.
2012-04-19 00:47:34 +02:00
if (decoder->Closing < -300) {
Fix bug: Black screen is sometimes not shown.
2012-05-17 16:52:08 +02:00
atomic_set(&decoder->SurfacesFilled, 0);
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
goto out;
}
VaapiAdvanceDecoderFrame(decoder);
out:
Add A-V info output and compile time option.
2012-02-01 23:12:45 +01:00
#if defined(DEBUG) || defined(AV_INFO)
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
// debug audio/video sync
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
if (err || !(decoder->FramesDisplayed % AV_INFO_TIME)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (!err) {
VaapiMessage(0, NULL);
}
Add number of buffered video output frames to info.
2012-08-28 19:15:11 +02:00
Info("video: %s%+5" PRId64 " %4" PRId64 " %3d/\\ms %3d+%d v-buf\n",
Move time-stamp printing to misc.h.
2012-03-05 17:34:10 +01:00
Timestamp2String(video_clock),
Nicer debug output when clock out of range.
2012-02-19 22:45:29 +01:00
abs((video_clock - audio_clock) / 90) <
Cleanups.
2012-03-12 17:58:19 +01:00
8888 ? ((video_clock - audio_clock) / 90) : 8888,
Add number of buffered video output frames to info.
2012-08-28 19:15:11 +02:00
AudioGetDelay() / 90, (int)VideoDeltaPTS / 90, VideoGetBuffers(),
(1 + decoder->Interlaced) * atomic_read(&decoder->SurfacesFilled)
- decoder->SurfaceField);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (!(decoder->FramesDisplayed % (5 * 60 * 60))) {
VaapiPrintFrames(decoder);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
#endif
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
return; // fix gcc bug!
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
///
/// Sync a video frame.
///
static void VaapiSyncFrame(void)
{
int i;
//
// Sync video decoder to audio
//
for (i = 0; i < VaapiDecoderN; ++i) {
VaapiSyncDecoder(VaapiDecoders[i]);
}
}
///
/// Sync and display surface.
///
static void VaapiSyncDisplayFrame(void)
{
VaapiDisplayFrame();
VaapiSyncFrame();
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Sync and render a ffmpeg frame
///
/// @param decoder VA-API decoder
/// @param video_ctx ffmpeg video codec context
/// @param frame frame to display
///
static void VaapiSyncRenderFrame(VaapiDecoder * decoder,
const AVCodecContext * video_ctx, const AVFrame * frame)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#ifdef DEBUG
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (!atomic_read(&decoder->SurfacesFilled)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video: new stream frame %dms\n", GetMsTicks() - VideoSwitch);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// if video output buffer is full, wait and display surface.
// loop for interlace
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
while (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX - 1) {
Initial vdpau support.
2011-12-21 12:50:14 +01:00
struct timespec abstime;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
pthread_mutex_unlock(&VideoLockMutex);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
abstime = decoder->FrameTime;
abstime.tv_nsec += 14 * 1000 * 1000;
if (abstime.tv_nsec >= 1000 * 1000 * 1000) {
// avoid overflow
abstime.tv_sec++;
abstime.tv_nsec -= 1000 * 1000 * 1000;
}
VideoPollEvent();
Fix dead-lock in VdpauExit.
2012-01-24 10:02:39 +01:00
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
pthread_mutex_lock(&VideoLockMutex);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// give osd some time slot
while (pthread_cond_timedwait(&VideoWakeupCond, &VideoLockMutex,
&abstime) != ETIMEDOUT) {
// SIGUSR1
Debug(3, "video/vaapi: pthread_cond_timedwait error\n");
}
Fix dead-lock in VdpauExit.
2012-01-24 10:02:39 +01:00
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VaapiSyncDisplayFrame();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
if (!decoder->Closing) {
VideoSetPts(&decoder->PTS, decoder->Interlaced, frame);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VaapiRenderFrame(decoder, video_ctx, frame);
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#ifdef USE_AUTOCROP
VaapiCheckAutoCrop(decoder);
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
///
/// Set VA-API background color.
///
/// @param rgba 32 bit RGBA color.
///
static void VaapiSetBackground( __attribute__ ((unused)) uint32_t rgba)
{
Error(_("video/vaapi: FIXME: SetBackground not supported\n"));
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
///
/// Set VA-API video mode.
///
static void VaapiSetVideoMode(void)
{
int i;
for (i = 0; i < VaapiDecoderN; ++i) {
VaapiUpdateOutput(VaapiDecoders[i]);
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_VIDEO_THREAD
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Handle a va-api display.
///
/// @todo FIXME: only a single decoder supported.
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static void VaapiDisplayHandlerThread(void)
{
int err;
int filled;
struct timespec nowtime;
VaapiDecoder *decoder;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
if (!(decoder = VaapiDecoders[0])) { // no stream available
return;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// fill frame output ring buffer
//
filled = atomic_read(&decoder->SurfacesFilled);
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
if (filled < VIDEO_SURFACES_MAX - 1) {
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// FIXME: hot polling
pthread_mutex_lock(&VideoLockMutex);
// fetch+decode or reopen
Poll input buffers, if display buffers are full.
2012-05-13 18:33:24 +02:00
err = VideoDecodeInput();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
pthread_mutex_unlock(&VideoLockMutex);
Poll input buffers, if display buffers are full.
2012-05-13 18:33:24 +02:00
} else {
err = VideoPollInput();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
if (err) {
// FIXME: sleep on wakeup
usleep(5 * 1000); // nothing buffered
New audio filters next part.
2012-04-19 00:47:34 +02:00
if (err == -1 && decoder->Closing) {
decoder->Closing--;
if (!decoder->Closing) {
Debug(3, "video/vaapi: closing eof\n");
decoder->Closing = -1;
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
clock_gettime(CLOCK_REALTIME, &nowtime);
// time for one frame over?
if ((nowtime.tv_sec - decoder->FrameTime.tv_sec)
* 1000 * 1000 * 1000 + (nowtime.tv_nsec - decoder->FrameTime.tv_nsec) <
15 * 1000 * 1000) {
return;
}
pthread_mutex_lock(&VideoLockMutex);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VaapiSyncDisplayFrame();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
pthread_mutex_unlock(&VideoLockMutex);
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#else
#define VaapiDisplayHandlerThread NULL
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#endif
//----------------------------------------------------------------------------
// VA-API OSD
//----------------------------------------------------------------------------
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Clear subpicture image.
///
/// @note looked by caller
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiOsdClear(void)
{
void *image_buffer;
// osd image available?
if (VaOsdImage.image_id == VA_INVALID_ID) {
return;
}
Debug(3, "video/vaapi: clear image\n");
// map osd surface/image into memory.
if (vaMapBuffer(VaDisplay, VaOsdImage.buf, &image_buffer)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't map osd image buffer\n"));
return;
}
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, ...
2012-01-18 15:15:37 +01:00
// have dirty area.
if (OsdDirtyWidth && OsdDirtyHeight) {
int o;
for (o = 0; o < OsdDirtyHeight; ++o) {
memset(image_buffer + (OsdDirtyX + (o +
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
OsdDirtyY) * VaOsdImage.width) * 4, 0x00,
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, ...
2012-01-18 15:15:37 +01:00
OsdDirtyWidth * 4);
}
} else {
// 100% transparent
memset(image_buffer, 0x00, VaOsdImage.data_size);
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaUnmapBuffer(VaDisplay, VaOsdImage.buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap osd image buffer\n"));
}
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Upload ARGB to subpicture image.
///
/// @param x x position of image in osd
/// @param y y position of image in osd
/// @param width width of image
/// @param height height of image
/// @param argb argb image
///
/// @note looked by caller
///
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
static void VaapiOsdDrawARGB(int x, int y, int width, int height,
C part of the plugin.
2011-12-07 15:05:38 +01:00
const uint8_t * argb)
{
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
uint32_t start;
uint32_t end;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
void *image_buffer;
int o;
// osd image available?
if (VaOsdImage.image_id == VA_INVALID_ID) {
return;
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
start = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
// map osd surface/image into memory.
if (vaMapBuffer(VaDisplay, VaOsdImage.buf, &image_buffer)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't map osd image buffer\n"));
return;
}
// FIXME: convert image from ARGB to subpicture format, if not argb
// copy argb to image
for (o = 0; o < height; ++o) {
memcpy(image_buffer + (x + (y + o) * VaOsdImage.width) * 4,
argb + o * width * 4, width * 4);
}
if (vaUnmapBuffer(VaDisplay, VaOsdImage.buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap osd image buffer\n"));
}
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
end = GetMsTicks();
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/vaapi: osd upload %dx%d+%d+%d %dms %d\n", width, height, x,
y, end - start, width * height * 4);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// VA-API initialize OSD.
///
/// @param width osd width
/// @param height osd height
///
/// @note subpicture is unusable, it can be scaled with the video image.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VaapiOsdInit(int width, int height)
{
VAImageFormat *formats;
unsigned *flags;
unsigned format_n;
unsigned u;
unsigned v;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
int i;
C part of the plugin.
2011-12-07 15:05:38 +01:00
static uint32_t wanted_formats[] =
{ VA_FOURCC('B', 'G', 'R', 'A'), VA_FOURCC_RGBA };
if (VaOsdImage.image_id != VA_INVALID_ID) {
Debug(3, "video/vaapi: osd already setup\n");
return;
}
if (!VaDisplay) {
Debug(3, "video/vaapi: va-api not setup\n");
return;
}
//
// look through subpicture formats
//
format_n = vaMaxNumSubpictureFormats(VaDisplay);
formats = alloca(format_n * sizeof(*formats));
flags = alloca(format_n * sizeof(*formats));
if (vaQuerySubpictureFormats(VaDisplay, formats, flags,
&format_n) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't get subpicture formats"));
return;
}
#ifdef DEBUG
Debug(3, "video/vaapi: supported subpicture formats:\n");
for (u = 0; u < format_n; ++u) {
Debug(3, "video/vaapi:\t%c%c%c%c flags %#x %s\n", formats[u].fourcc,
formats[u].fourcc >> 8, formats[u].fourcc >> 16,
formats[u].fourcc >> 24, flags[u],
flags[u] & VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD ?
"screen coord" : "");
}
#endif
for (v = 0; v < sizeof(wanted_formats) / sizeof(*wanted_formats); ++v) {
for (u = 0; u < format_n; ++u) {
if (formats[u].fourcc == wanted_formats[v]) {
goto found;
}
}
}
Error(_("video/vaapi: can't find a supported subpicture format"));
return;
found:
Debug(3, "video/vaapi: use %c%c%c%c subpicture format with flags %#x\n",
formats[u].fourcc, formats[u].fourcc >> 8, formats[u].fourcc >> 16,
formats[u].fourcc >> 24, flags[u]);
VaapiUnscaledOsd = 0;
if (flags[u] & VA_SUBPICTURE_DESTINATION_IS_SCREEN_COORD) {
Info(_("video/vaapi: vaapi supports unscaled osd\n"));
VaapiUnscaledOsd = 1;
}
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
//VaapiUnscaledOsd = 0;
//Info(_("video/vaapi: unscaled osd disabled\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (vaCreateImage(VaDisplay, &formats[u], width, height,
&VaOsdImage) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create osd image\n"));
return;
}
if (vaCreateSubpicture(VaDisplay, VaOsdImage.image_id,
&VaOsdSubpicture) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't create subpicture\n"));
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
if (vaDestroyImage(VaDisplay,
VaOsdImage.image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
VaOsdImage.image_id = VA_INVALID_ID;
C part of the plugin.
2011-12-07 15:05:38 +01:00
return;
}
// FIXME: must store format, to convert ARGB to it.
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
// restore osd association
for (i = 0; i < VaapiDecoderN; ++i) {
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
// only if input already setup
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
if (VaapiDecoders[i]->InputWidth && VaapiDecoders[i]->InputHeight) {
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
VaapiAssociate(VaapiDecoders[i]);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
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, ...
2012-01-18 15:15:37 +01:00
///
/// VA-API cleanup osd.
///
static void VaapiOsdExit(void)
{
if (VaOsdImage.image_id != VA_INVALID_ID) {
if (vaDestroyImage(VaDisplay,
VaOsdImage.image_id) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy image!\n"));
}
VaOsdImage.image_id = VA_INVALID_ID;
}
if (VaOsdSubpicture != VA_INVALID_ID) {
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
int i;
for (i = 0; i < VaapiDecoderN; ++i) {
VaapiDeassociate(VaapiDecoders[i]);
}
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, ...
2012-01-18 15:15:37 +01:00
if (vaDestroySubpicture(VaDisplay, VaOsdSubpicture)
!= VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't destroy subpicture\n"));
}
VaOsdSubpicture = VA_INVALID_ID;
}
}
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
/// VA-API module.
///
static const VideoModule VaapiModule = {
.Name = "va-api",
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.Enabled = 1,
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
.NewHwDecoder = (VideoHwDecoder * (*const)(void))VaapiNewHwDecoder,
.DelHwDecoder = (void (*const) (VideoHwDecoder *))VaapiDelHwDecoder,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.GetSurface = (unsigned (*const) (VideoHwDecoder *))VaapiGetSurface,
.ReleaseSurface =
(void (*const) (VideoHwDecoder *, unsigned))VaapiReleaseSurface,
.get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
AVCodecContext *, const enum PixelFormat *))Vaapi_get_format,
.RenderFrame = (void (*const) (VideoHwDecoder *,
const AVCodecContext *, const AVFrame *))VaapiSyncRenderFrame,
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
.SetClock = (void (*const) (VideoHwDecoder *, int64_t))VaapiSetClock,
.GetClock = (int64_t(*const) (const VideoHwDecoder *))VaapiGetClock,
.SetTrickSpeed =
(void (*const) (const VideoHwDecoder *, int))VaapiSetTrickSpeed,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.GrabOutput = NULL,
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
.SetBackground = VaapiSetBackground,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.SetVideoMode = VaapiSetVideoMode,
.ResetAutoCrop = VaapiResetAutoCrop,
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
.DisplayHandlerThread = VaapiDisplayHandlerThread,
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
.OsdClear = VaapiOsdClear,
.OsdDrawARGB = VaapiOsdDrawARGB,
.OsdInit = VaapiOsdInit,
.OsdExit = VaapiOsdExit,
.Init = VaapiInit,
.Exit = VaapiExit,
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
};
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
//----------------------------------------------------------------------------
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// VDPAU
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_VDPAU
C part of the plugin.
2011-12-07 15:05:38 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// VDPAU decoder
///
typedef struct _vdpau_decoder_
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpDevice Device; ///< VDPAU device
C part of the plugin.
2011-12-07 15:05:38 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
xcb_window_t Window; ///< output window
int OutputX; ///< output window x
int OutputY; ///< output window y
int OutputWidth; ///< output window width
int OutputHeight; ///< output window height
C part of the plugin.
2011-12-07 15:05:38 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
enum PixelFormat PixFmt; ///< ffmpeg frame pixfmt
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
int WrongInterlacedWarned; ///< warning about interlace flag issued
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int Interlaced; ///< ffmpeg interlaced flag
int TopFieldFirst; ///< ffmpeg top field displayed first
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
int InputWidth; ///< video input width
int InputHeight; ///< video input height
AVRational InputAspect; ///< video input aspect ratio
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoResolutions Resolution; ///< resolution group
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
int CropX; ///< video crop x
int CropY; ///< video crop y
int CropWidth; ///< video crop width
int CropHeight; ///< video crop height
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#ifdef USE_AUTOCROP
AutoCropCtx AutoCrop[1]; ///< auto-crop variables
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef noyetUSE_GLX
GLuint GlTexture[2]; ///< gl texture for VDPAU
void *GlxSurface[2]; ///< VDPAU/GLX surface
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpDecoderProfile Profile; ///< vdp decoder profile
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
VdpDecoder VideoDecoder; ///< vdp video decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpVideoMixer VideoMixer; ///< vdp video mixer
VdpChromaType ChromaType; ///< vdp video surface chroma format
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
VdpProcamp Procamp; ///< vdp procamp parameterization data
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
int SurfacesNeeded; ///< number of surface to request
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int SurfaceUsedN; ///< number of used video surfaces
/// used video surface ids
VdpVideoSurface SurfacesUsed[CODEC_SURFACES_MAX];
int SurfaceFreeN; ///< number of free video surfaces
/// free video surface ids
VdpVideoSurface SurfacesFree[CODEC_SURFACES_MAX];
/// video surface ring buffer
VdpVideoSurface SurfacesRb[VIDEO_SURFACES_MAX];
int SurfaceWrite; ///< write pointer
int SurfaceRead; ///< read pointer
atomic_t SurfacesFilled; ///< how many of the buffer is used
int SurfaceField; ///< current displayed field
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
int TrickSpeed; ///< current trick speed
int TrickCounter; ///< current trick speed counter
Initial vdpau support.
2011-12-21 12:50:14 +01:00
struct timespec FrameTime; ///< time of last display
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
int Closing; ///< flag about closing current stream
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int64_t PTS; ///< video PTS clock
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
int SyncCounter; ///< counter to sync frames
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
int StartCounter; ///< counter for video start
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int FramesDuped; ///< number of frames duplicated
int FramesMissed; ///< number of frames missed
int FramesDropped; ///< number of frames dropped
int FrameCounter; ///< number of frames decoded
int FramesDisplayed; ///< number of frames displayed
} VdpauDecoder;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
static volatile char VdpauPreemption; ///< flag preemption happened.
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpauDecoder *VdpauDecoders[1]; ///< open decoder streams
static int VdpauDecoderN; ///< number of decoder streams
static VdpDevice VdpauDevice; ///< VDPAU device
static VdpGetProcAddress *VdpauGetProcAddress; ///< entry point to use
/// presentation queue target
static VdpPresentationQueueTarget VdpauQueueTarget;
static VdpPresentationQueue VdpauQueue; ///< presentation queue
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
static VdpColor VdpauQueueBackgroundColor[1]; ///< queue background color
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
static int VdpauBackground; ///< background supported
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static int VdpauHqScalingMax; ///< highest supported scaling level
static int VdpauTemporal; ///< temporal deinterlacer supported
static int VdpauTemporalSpatial; ///< temporal spatial deint. supported
static int VdpauInverseTelecine; ///< inverse telecine deint. supported
Prepared vdpau noise reduction support.
2011-12-29 19:45:00 +01:00
static int VdpauNoiseReduction; ///< noise reduction supported
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
static int VdpauSharpness; ///< sharpness supported
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static int VdpauSkipChroma; ///< skip chroma deint. supported
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
static VdpChromaType VdpauChromaType; ///< best video surface chroma format
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// display surface ring buffer
static VdpOutputSurface VdpauSurfacesRb[OUTPUT_SURFACES_MAX];
static int VdpauSurfaceIndex; ///< current display surface
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
#ifdef USE_BITMAP
/// bitmap surfaces for osd
static VdpBitmapSurface VdpauOsdBitmapSurface[2] = {
VDP_INVALID_HANDLE, VDP_INVALID_HANDLE
};
#else
/// output surfaces for osd
static VdpOutputSurface VdpauOsdOutputSurface[2] = {
VDP_INVALID_HANDLE, VDP_INVALID_HANDLE
};
#endif
static int VdpauOsdSurfaceIndex; ///< index into double buffered osd
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
/// grab render output surface
static VdpOutputSurface VdpauGrabRenderSurface = VDP_INVALID_HANDLE;
static pthread_mutex_t VdpauGrabMutex;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Function pointer of the VDPAU device.
///
///@{
static VdpGetErrorString *VdpauGetErrorString;
static VdpDeviceDestroy *VdpauDeviceDestroy;
static VdpGenerateCSCMatrix *VdpauGenerateCSCMatrix;
static VdpVideoSurfaceQueryCapabilities *VdpauVideoSurfaceQueryCapabilities;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities *
VdpauVideoSurfaceQueryGetPutBitsYCbCrCapabilities;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpVideoSurfaceCreate *VdpauVideoSurfaceCreate;
static VdpVideoSurfaceDestroy *VdpauVideoSurfaceDestroy;
static VdpVideoSurfaceGetParameters *VdpauVideoSurfaceGetParameters;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
static VdpVideoSurfaceGetBitsYCbCr *VdpauVideoSurfaceGetBitsYCbCr;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpVideoSurfacePutBitsYCbCr *VdpauVideoSurfacePutBitsYCbCr;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpOutputSurfaceQueryCapabilities *VdpauOutputSurfaceQueryCapabilities;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpOutputSurfaceCreate *VdpauOutputSurfaceCreate;
static VdpOutputSurfaceDestroy *VdpauOutputSurfaceDestroy;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
static VdpOutputSurfaceGetParameters *VdpauOutputSurfaceGetParameters;
static VdpOutputSurfaceGetBitsNative *VdpauOutputSurfaceGetBitsNative;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpOutputSurfacePutBitsNative *VdpauOutputSurfacePutBitsNative;
static VdpBitmapSurfaceQueryCapabilities *VdpauBitmapSurfaceQueryCapabilities;
static VdpBitmapSurfaceCreate *VdpauBitmapSurfaceCreate;
static VdpBitmapSurfaceDestroy *VdpauBitmapSurfaceDestroy;
static VdpBitmapSurfacePutBitsNative *VdpauBitmapSurfacePutBitsNative;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpOutputSurfaceRenderOutputSurface
*VdpauOutputSurfaceRenderOutputSurface;
static VdpOutputSurfaceRenderBitmapSurface
*VdpauOutputSurfaceRenderBitmapSurface;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpDecoderQueryCapabilities *VdpauDecoderQueryCapabilities;
static VdpDecoderCreate *VdpauDecoderCreate;
static VdpDecoderDestroy *VdpauDecoderDestroy;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
static VdpDecoderRender *VdpauDecoderRender;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpVideoMixerQueryFeatureSupport *VdpauVideoMixerQueryFeatureSupport;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpVideoMixerQueryAttributeSupport
*VdpauVideoMixerQueryAttributeSupport;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpVideoMixerCreate *VdpauVideoMixerCreate;
static VdpVideoMixerSetFeatureEnables *VdpauVideoMixerSetFeatureEnables;
static VdpVideoMixerSetAttributeValues *VdpauVideoMixerSetAttributeValues;
static VdpVideoMixerDestroy *VdpauVideoMixerDestroy;
static VdpVideoMixerRender *VdpauVideoMixerRender;
static VdpPresentationQueueTargetDestroy *VdpauPresentationQueueTargetDestroy;
static VdpPresentationQueueCreate *VdpauPresentationQueueCreate;
static VdpPresentationQueueDestroy *VdpauPresentationQueueDestroy;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpPresentationQueueSetBackgroundColor *
VdpauPresentationQueueSetBackgroundColor;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpPresentationQueueGetTime *VdpauPresentationQueueGetTime;
static VdpPresentationQueueDisplay *VdpauPresentationQueueDisplay;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpPresentationQueueBlockUntilSurfaceIdle
*VdpauPresentationQueueBlockUntilSurfaceIdle;
static VdpPresentationQueueQuerySurfaceStatus
*VdpauPresentationQueueQuerySurfaceStatus;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
static VdpPreemptionCallbackRegister *VdpauPreemptionCallbackRegister;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
static VdpPresentationQueueTargetCreateX11 *
VdpauPresentationQueueTargetCreateX11;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///@}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
static void VdpauOsdInit(int, int); ///< forward definition
//----------------------------------------------------------------------------
Cleanups.
2012-03-12 17:58:19 +01:00
///
/// Output video messages.
///
/// Reduce output.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param level message level (Error, Warning, Info, Debug, ...)
/// @param format printf format string (NULL to flush messages)
/// @param ... printf arguments
///
/// @returns true, if message shown
///
static int VdpauMessage(int level, const char *format, ...)
Cleanups.
2012-03-12 17:58:19 +01:00
{
if (SysLogLevel > level || DebugLevel > level) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
static const char *last_format;
static char buf[256];
Cleanups.
2012-03-12 17:58:19 +01:00
va_list ap;
va_start(ap, format);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (format != last_format) { // don't repeat same message
if (buf[0]) { // print last repeated message
syslog(LOG_ERR, "%s", buf);
buf[0] = '\0';
}
if (format) {
Video_get_format AudioVideoReady feeds old PTS.
2012-06-27 21:47:30 +02:00
last_format = format;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
vsyslog(LOG_ERR, format, ap);
}
va_end(ap);
return 1;
}
vsnprintf(buf, sizeof(buf), format, ap);
Cleanups.
2012-03-12 17:58:19 +01:00
va_end(ap);
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
return 0;
Cleanups.
2012-03-12 17:58:19 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// Surfaces -------------------------------------------------------------
Cleanups.
2012-03-12 17:58:19 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Create surfaces for VDPAU decoder.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// @param width surface source/video width
/// @param height surface source/video height
///
static void VdpauCreateSurfaces(VdpauDecoder * decoder, int width, int height)
{
int i;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
#ifdef DEBUG
if (!decoder->SurfacesNeeded) {
Fix bug: Can't use software decoder with VDPAU.
2012-08-13 16:57:36 +02:00
Error(_("video/vdpau: surface needed not set\n"));
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->SurfacesNeeded = 3 + VIDEO_SURFACES_MAX;
}
#endif
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(3, "video/vdpau: %s: %dx%d * %d\n", __FUNCTION__, width, height,
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->SurfacesNeeded);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
// allocate only the number of needed surfaces
decoder->SurfaceFreeN = decoder->SurfacesNeeded;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
for (i = 0; i < decoder->SurfaceFreeN; ++i) {
VdpStatus status;
status =
VdpauVideoSurfaceCreate(decoder->Device, decoder->ChromaType,
width, height, decoder->SurfacesFree + i);
if (status != VDP_STATUS_OK) {
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Error(_("video/vdpau: can't create video surface: %s\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetErrorString(status));
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
decoder->SurfacesFree[i] = VDP_INVALID_HANDLE;
// FIXME: better error handling
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
Debug(4, "video/vdpau: created video surface %dx%d with id 0x%08x\n",
Initial vdpau support.
2011-12-21 12:50:14 +01:00
width, height, decoder->SurfacesFree[i]);
}
}
///
/// Destroy surfaces of VDPAU decoder.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
static void VdpauDestroySurfaces(VdpauDecoder * decoder)
{
int i;
VdpStatus status;
Debug(3, "video/vdpau: %s\n", __FUNCTION__);
for (i = 0; i < decoder->SurfaceFreeN; ++i) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
#ifdef DEBUG
if (decoder->SurfacesFree[i] == VDP_INVALID_HANDLE) {
Debug(3, "video/vdpau: invalid surface\n");
}
#endif
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Debug(4, "video/vdpau: destroy video surface with id 0x%08x\n",
decoder->SurfacesFree[i]);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status = VdpauVideoSurfaceDestroy(decoder->SurfacesFree[i]);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy video surface: %s\n"),
VdpauGetErrorString(status));
}
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
decoder->SurfacesFree[i] = VDP_INVALID_HANDLE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
for (i = 0; i < decoder->SurfaceUsedN; ++i) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
#ifdef DEBUG
if (decoder->SurfacesUsed[i] == VDP_INVALID_HANDLE) {
Debug(3, "video/vdpau: invalid surface\n");
}
#endif
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Debug(4, "video/vdpau: destroy video surface with id 0x%08x\n",
decoder->SurfacesUsed[i]);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status = VdpauVideoSurfaceDestroy(decoder->SurfacesUsed[i]);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy video surface: %s\n"),
VdpauGetErrorString(status));
}
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
decoder->SurfacesUsed[i] = VDP_INVALID_HANDLE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
decoder->SurfaceFreeN = 0;
decoder->SurfaceUsedN = 0;
}
///
/// Get a free surface.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// @returns the oldest free surface
///
static unsigned VdpauGetSurface(VdpauDecoder * decoder)
{
VdpVideoSurface surface;
int i;
if (!decoder->SurfaceFreeN) {
Error(_("video/vdpau: out of surfaces\n"));
return VDP_INVALID_HANDLE;
}
// use oldest surface
surface = decoder->SurfacesFree[0];
decoder->SurfaceFreeN--;
for (i = 0; i < decoder->SurfaceFreeN; ++i) {
decoder->SurfacesFree[i] = decoder->SurfacesFree[i + 1];
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
decoder->SurfacesFree[i] = VDP_INVALID_HANDLE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// save as used
decoder->SurfacesUsed[decoder->SurfaceUsedN++] = surface;
return surface;
}
///
/// Release a surface.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// @param surface surface no longer used
///
static void VdpauReleaseSurface(VdpauDecoder * decoder, unsigned surface)
{
int i;
for (i = 0; i < decoder->SurfaceUsedN; ++i) {
if (decoder->SurfacesUsed[i] == surface) {
// no problem, with last used
decoder->SurfacesUsed[i] =
decoder->SurfacesUsed[--decoder->SurfaceUsedN];
decoder->SurfacesFree[decoder->SurfaceFreeN++] = surface;
return;
}
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Error(_("video/vdpau: release surface %#08x, which is not in use\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
surface);
}
///
/// Debug VDPAU decoder frames drop...
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
static void VdpauPrintFrames(const VdpauDecoder * decoder)
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video/vdpau: %d missed, %d duped, %d dropped frames of %d,%d\n",
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->FramesMissed, decoder->FramesDuped, decoder->FramesDropped,
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->FrameCounter, decoder->FramesDisplayed);
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
#ifndef DEBUG
(void)decoder;
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
///
/// Create and setup VDPAU mixer.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
/// @note don't forget to update features, paramaters, attributes table
/// size, if more is add.
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static void VdpauMixerSetup(VdpauDecoder * decoder)
{
VdpStatus status;
int i;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpVideoMixerFeature features[15];
VdpBool enables[15];
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int feature_n;
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
VdpVideoMixerAttribute attributes[5];
void const *attribute_value_ptrs[5];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
int attribute_n;
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
VdpColor background_color[1];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
uint8_t skip_chroma_value;
float noise_reduction_level;
float sharpness_level;
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
VdpColorStandard color_standard;
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
VdpCSCMatrix csc_matrix;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
// Build enables table
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
feature_n = 0;
if (VdpauTemporal) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
enables[feature_n] =
(VideoDeinterlace[decoder->Resolution] == VideoDeinterlaceTemporal
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
|| VideoDeinterlace[decoder->Resolution] ==
VideoDeinterlaceTemporalSpatial) ? VDP_TRUE : VDP_FALSE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL;
Debug(3, "video/vdpau: temporal deinterlace %s\n",
enables[feature_n - 1] ? "enabled" : "disabled");
}
if (VdpauTemporalSpatial) {
enables[feature_n] =
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoDeinterlace[decoder->Resolution] ==
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VideoDeinterlaceTemporalSpatial ? VDP_TRUE : VDP_FALSE;
features[feature_n++] =
VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL;
Debug(3, "video/vdpau: temporal spatial deinterlace %s\n",
enables[feature_n - 1] ? "enabled" : "disabled");
}
if (VdpauInverseTelecine) {
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
enables[feature_n] =
VideoInverseTelecine[decoder->Resolution] ? VDP_TRUE : VDP_FALSE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE;
Debug(3, "video/vdpau: inverse telecine %s\n",
enables[feature_n - 1] ? "enabled" : "disabled");
}
Prepared vdpau noise reduction support.
2011-12-29 19:45:00 +01:00
if (VdpauNoiseReduction) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
enables[feature_n] =
VideoDenoise[decoder->Resolution] ? VDP_TRUE : VDP_FALSE;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION;
Prepared vdpau noise reduction support.
2011-12-29 19:45:00 +01:00
Debug(3, "video/vdpau: noise reduction %s\n",
enables[feature_n - 1] ? "enabled" : "disabled");
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
if (VdpauSharpness) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
enables[feature_n] =
VideoSharpen[decoder->Resolution] ? VDP_TRUE : VDP_FALSE;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_SHARPNESS;
Debug(3, "video/vdpau: sharpness %s\n",
enables[feature_n - 1] ? "enabled" : "disabled");
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
for (i = VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1;
i <= VdpauHqScalingMax; ++i) {
enables[feature_n] =
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoScaling[decoder->Resolution] ==
VideoScalingHQ ? VDP_TRUE : VDP_FALSE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
features[feature_n++] = i;
Debug(3, "video/vdpau: high quality scaling %d %s\n",
1 + i - VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1,
enables[feature_n - 1] ? "enabled" : "disabled");
}
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
status =
VdpauVideoMixerSetFeatureEnables(decoder->VideoMixer, feature_n,
features, enables);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't set mixer feature enables: %s\n"),
VdpauGetErrorString(status));
}
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
//
// build attributes table
//
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/*
Remove warning, when building without vdpau.
2011-12-30 21:50:58 +01:00
FIXME:
VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MIN_LUMA
VDP_VIDEO_MIXER_ATTRIBUTE_LUMA_KEY_MAX_LUMA
Initial vdpau support.
2011-12-21 12:50:14 +01:00
*/
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
attribute_n = 0;
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
// none video-area background color
if (VdpauBackground) {
background_color->red = (VideoBackground >> 24) / 255.0;
background_color->green = ((VideoBackground >> 16) & 0xFF) / 255.0;
background_color->blue = ((VideoBackground >> 8) & 0xFF) / 255.0;
background_color->alpha = (VideoBackground & 0xFF) / 255.0;
attributes[attribute_n] = VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR;
attribute_value_ptrs[attribute_n++] = background_color;
Debug(3, "video/vdpau: background color %f/%f/%f/%f\n",
background_color->red, background_color->green,
background_color->blue, background_color->alpha);
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
if (VdpauSkipChroma) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
skip_chroma_value = VideoSkipChromaDeinterlace[decoder->Resolution];
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
attributes[attribute_n]
= VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;
attribute_value_ptrs[attribute_n++] = &skip_chroma_value;
Debug(3, "video/vdpau: skip chroma deinterlace %s\n",
skip_chroma_value ? "enabled" : "disabled");
}
if (VdpauNoiseReduction) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
noise_reduction_level = VideoDenoise[decoder->Resolution] / 1000.0;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
attributes[attribute_n]
= VDP_VIDEO_MIXER_ATTRIBUTE_NOISE_REDUCTION_LEVEL;
attribute_value_ptrs[attribute_n++] = &noise_reduction_level;
Debug(3, "video/vdpau: noise reduction level %1.3f\n",
noise_reduction_level);
}
if (VdpauSharpness) {
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
sharpness_level = VideoSharpen[decoder->Resolution] / 1000.0;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
attributes[attribute_n]
= VDP_VIDEO_MIXER_ATTRIBUTE_SHARPNESS_LEVEL;
attribute_value_ptrs[attribute_n++] = &sharpness_level;
Debug(3, "video/vdpau: sharpness level %+1.3f\n", sharpness_level);
}
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
switch (VideoColorSpaces[decoder->Resolution]) {
case VideoColorSpaceNone:
default:
color_standard = 0;
break;
case VideoColorSpaceBt601:
color_standard = VDP_COLOR_STANDARD_ITUR_BT_601;
Debug(3, "video/vdpau: color space ITU-R BT.601\n");
break;
case VideoColorSpaceBt709:
color_standard = VDP_COLOR_STANDARD_ITUR_BT_709;
Debug(3, "video/vdpau: color space ITU-R BT.709\n");
break;
case VideoColorSpaceSmpte240:
color_standard = VDP_COLOR_STANDARD_SMPTE_240M;
Debug(3, "video/vdpau: color space SMPTE-240M\n");
break;
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
}
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
//
// Studio levels
//
// based on www.nvnews.net forum thread
//
if (VideoStudioLevels) {
static const float color_coeffs[][3] = {
{0.299, 0.587, 0.114},
{0.2125, 0.7154, 0.0721},
{0.2122, 0.7013, 0.0865}
};
float uvcos, uvsin;
float uv_coeffs[3][2];
float Kr, Kg, Kb;
const int rgbmin = 16;
const int rgbr = 235 - rgbmin;
Kr = color_coeffs[color_standard][0];
Kg = color_coeffs[color_standard][1];
Kb = color_coeffs[color_standard][2];
uv_coeffs[0][0] = 0.0;
uv_coeffs[0][1] = (rgbr / 112.0) * (1.0 - Kr);
uv_coeffs[1][0] = -(rgbr / 112.0) * (1.0 - Kb) * Kb / Kg;
uv_coeffs[1][1] = -(rgbr / 112.0) * (1.0 - Kr) * Kr / Kg;
uv_coeffs[2][0] = (rgbr / 112.0) * (1.0 - Kb);
uv_coeffs[2][1] = 0.0;
uvcos = decoder->Procamp.saturation * cos(decoder->Procamp.hue);
uvsin = decoder->Procamp.saturation * sin(decoder->Procamp.hue);
for (i = 0; i < 3; ++i) {
csc_matrix[i][3] = decoder->Procamp.brightness;
csc_matrix[i][0] = rgbr * decoder->Procamp.contrast / 219;
csc_matrix[i][3] += (-16 / 255.0) * csc_matrix[i][0];
csc_matrix[i][1] =
uv_coeffs[i][0] * uvcos + uv_coeffs[i][1] * uvsin;
csc_matrix[i][3] += (-128 / 255.0) * csc_matrix[i][1];
csc_matrix[i][2] =
uv_coeffs[i][0] * uvsin + uv_coeffs[i][1] * uvcos;
csc_matrix[i][3] += (-128 / 255.0) * csc_matrix[i][2];
csc_matrix[i][3] += rgbmin / 255.0;
csc_matrix[i][3] += 0.5 - decoder->Procamp.contrast / 2.0;
}
} else {
status =
VdpauGenerateCSCMatrix(&decoder->Procamp, color_standard,
&csc_matrix);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't generate CSC matrix: %s\n"),
VdpauGetErrorString(status));
}
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
}
attributes[attribute_n] = VDP_VIDEO_MIXER_ATTRIBUTE_CSC_MATRIX;
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
attribute_value_ptrs[attribute_n++] = &csc_matrix;
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
status =
VdpauVideoMixerSetAttributeValues(decoder->VideoMixer, attribute_n,
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
attributes, attribute_value_ptrs);
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't set mixer attribute values: %s\n"),
VdpauGetErrorString(status));
}
}
///
/// Create and setup VDPAU mixer.
///
/// @param decoder VDPAU hw decoder
///
/// @note don't forget to update features, paramaters, attributes table
/// size, if more is add.
///
static void VdpauMixerCreate(VdpauDecoder * decoder)
{
VdpStatus status;
int i;
VdpVideoMixerFeature features[15];
int feature_n;
VdpVideoMixerParameter paramaters[4];
void const *value_ptrs[4];
int parameter_n;
VdpChromaType chroma_type;
int layers;
//
// Build feature table
//
feature_n = 0;
if (VdpauTemporal) {
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL;
}
if (VdpauTemporalSpatial) {
features[feature_n++] =
VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL;
}
if (VdpauInverseTelecine) {
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE;
}
if (VdpauNoiseReduction) {
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION;
}
if (VdpauSharpness) {
features[feature_n++] = VDP_VIDEO_MIXER_FEATURE_SHARPNESS;
}
for (i = VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1;
i <= VdpauHqScalingMax; ++i) {
features[feature_n++] = i;
}
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
decoder->ChromaType = chroma_type = VdpauChromaType;
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
//
// Setup parameter/value tables
//
paramaters[0] = VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_WIDTH;
value_ptrs[0] = &decoder->InputWidth;
paramaters[1] = VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_HEIGHT;
value_ptrs[1] = &decoder->InputHeight;
paramaters[2] = VDP_VIDEO_MIXER_PARAMETER_CHROMA_TYPE;
value_ptrs[2] = &chroma_type;
layers = 0;
paramaters[3] = VDP_VIDEO_MIXER_PARAMETER_LAYERS;
value_ptrs[3] = &layers;
parameter_n = 4;
status =
VdpauVideoMixerCreate(VdpauDevice, feature_n, features, parameter_n,
paramaters, value_ptrs, &decoder->VideoMixer);
if (status != VDP_STATUS_OK) {
Fatal(_("video/vdpau: can't create video mixer: %s\n"),
VdpauGetErrorString(status));
// FIXME: no fatal errors
}
VdpauMixerSetup(decoder);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
///
/// Allocate new VDPAU decoder.
///
/// @returns a new prepared vdpau hardware decoder.
///
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static VdpauDecoder *VdpauNewHwDecoder(void)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
VdpauDecoder *decoder;
int i;
if (VdpauDecoderN == 1) {
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
Error(_("video/vdpau: out of decoders\n"));
return NULL;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
if (!(decoder = calloc(1, sizeof(*decoder)))) {
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
Error(_("video/vdpau: out of memory\n"));
return NULL;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
decoder->Device = VdpauDevice;
decoder->Window = VideoWindow;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->Profile = VDP_INVALID_HANDLE;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
decoder->VideoDecoder = VDP_INVALID_HANDLE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->VideoMixer = VDP_INVALID_HANDLE;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
for (i = 0; i < CODEC_SURFACES_MAX; ++i) {
decoder->SurfacesUsed[i] = VDP_INVALID_HANDLE;
decoder->SurfacesFree[i] = VDP_INVALID_HANDLE;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// setup video surface ring buffer
//
atomic_set(&decoder->SurfacesFilled, 0);
for (i = 0; i < VIDEO_SURFACES_MAX; ++i) {
decoder->SurfacesRb[i] = VDP_INVALID_HANDLE;
}
#ifdef DEBUG
if (VIDEO_SURFACES_MAX < 1 + 1 + 1 + 1) {
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
Error(_
Initial vdpau support.
2011-12-21 12:50:14 +01:00
("video/vdpau: need 1 future, 1 current, 1 back and 1 work surface\n"));
}
#endif
Add color standard support to vdpau.
2012-01-05 20:24:18 +01:00
// Procamp operation parameterization data
decoder->Procamp.struct_version = VDP_PROCAMP_VERSION;
decoder->Procamp.brightness = 0.0;
decoder->Procamp.contrast = 1.0;
decoder->Procamp.saturation = 1.0;
decoder->Procamp.hue = 0.0; // default values
Force black picture after start or suspend.
2012-04-22 21:01:34 +02:00
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputHeight = VideoWindowHeight;
decoder->Closing = -300 - 1;
Cleanups.
2012-03-12 17:58:19 +01:00
decoder->PTS = AV_NOPTS_VALUE;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// FIXME: hack
VdpauDecoderN = 1;
VdpauDecoders[0] = decoder;
return decoder;
}
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
///
/// Cleanup VDPAU.
///
/// @param decoder VDPAU hw decoder
///
static void VdpauCleanup(VdpauDecoder * decoder)
{
VdpStatus status;
int i;
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
if (decoder->VideoDecoder != VDP_INVALID_HANDLE) {
Workaround for dead-lock in VdpauExit.
2012-01-24 00:32:07 +01:00
// hangs in lock
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
status = VdpauDecoderDestroy(decoder->VideoDecoder);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy video decoder: %s\n"),
VdpauGetErrorString(status));
}
decoder->VideoDecoder = VDP_INVALID_HANDLE;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->Profile = VDP_INVALID_HANDLE;
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
}
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
if (decoder->VideoMixer != VDP_INVALID_HANDLE) {
status = VdpauVideoMixerDestroy(decoder->VideoMixer);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy video mixer: %s\n"),
VdpauGetErrorString(status));
}
decoder->VideoMixer = VDP_INVALID_HANDLE;
}
if (decoder->SurfaceFreeN || decoder->SurfaceUsedN) {
VdpauDestroySurfaces(decoder);
}
//
// reset video surface ring buffer
//
atomic_set(&decoder->SurfacesFilled, 0);
for (i = 0; i < VIDEO_SURFACES_MAX; ++i) {
decoder->SurfacesRb[i] = VDP_INVALID_HANDLE;
}
decoder->SurfaceRead = 0;
decoder->SurfaceWrite = 0;
Fix vdpau hangup when switching none/interlaced.
2011-12-23 00:09:59 +01:00
decoder->SurfaceField = 0;
Adds audio normalize support.
2012-04-19 16:01:20 +02:00
decoder->SyncCounter = 0;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->FrameCounter = 0;
decoder->FramesDisplayed = 0;
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter = 0;
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
decoder->Closing = 0;
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
decoder->PTS = AV_NOPTS_VALUE;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
VideoDeltaPTS = 0;
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Destroy a VDPAU decoder.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
static void VdpauDelHwDecoder(VdpauDecoder * decoder)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
int i;
for (i = 0; i < VdpauDecoderN; ++i) {
if (VdpauDecoders[i] == decoder) {
VdpauDecoders[i] = NULL;
VdpauDecoderN--;
// FIXME: must copy last slot into empty slot and --
break;
}
}
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
VdpauCleanup(decoder);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauPrintFrames(decoder);
free(decoder);
}
///
/// Get the proc address.
///
/// @param id VDP function id
/// @param[out] addr address of VDP function
/// @param name name of function for error message
///
static inline void VdpauGetProc(const VdpFuncId id, void *addr,
const char *name)
{
VdpStatus status;
status = VdpauGetProcAddress(VdpauDevice, id, addr);
if (status != VDP_STATUS_OK) {
Fatal(_("video/vdpau: Can't get function address of '%s': %s\n"), name,
VdpauGetErrorString(status));
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
// FIXME: rewrite none fatal
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
}
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
///
/// Initialize output queue.
///
static void VdpauInitOutputQueue(void)
{
VdpStatus status;
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
VdpRGBAFormat format;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
int i;
status =
VdpauPresentationQueueTargetCreateX11(VdpauDevice, VideoWindow,
&VdpauQueueTarget);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create presentation queue target: %s\n"),
VdpauGetErrorString(status));
return;
}
status =
VdpauPresentationQueueCreate(VdpauDevice, VdpauQueueTarget,
&VdpauQueue);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create presentation queue: %s\n"),
VdpauGetErrorString(status));
VdpauPresentationQueueTargetDestroy(VdpauQueueTarget);
VdpauQueueTarget = 0;
return;
}
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
VdpauQueueBackgroundColor->red = 0.01;
VdpauQueueBackgroundColor->green = 0.02;
VdpauQueueBackgroundColor->blue = 0.03;
VdpauQueueBackgroundColor->alpha = 1.00;
VdpauPresentationQueueSetBackgroundColor(VdpauQueue,
VdpauQueueBackgroundColor);
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
//
// Create display output surfaces
//
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
format = VDP_RGBA_FORMAT_B8G8R8A8;
// FIXME: does a 10bit rgba produce a better output?
// format = VDP_RGBA_FORMAT_R10G10B10A2;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
for (i = 0; i < OUTPUT_SURFACES_MAX; ++i) {
status =
VdpauOutputSurfaceCreate(VdpauDevice, format, VideoWindowWidth,
VideoWindowHeight, VdpauSurfacesRb + i);
if (status != VDP_STATUS_OK) {
Fatal(_("video/vdpau: can't create output surface: %s\n"),
VdpauGetErrorString(status));
}
Debug(3, "video/vdpau: created output surface %dx%d with id 0x%08x\n",
VideoWindowWidth, VideoWindowHeight, VdpauSurfacesRb[i]);
}
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
//
// Create render output surface for grabbing
//
status =
VdpauOutputSurfaceCreate(VdpauDevice, format, VideoWindowWidth,
VideoWindowHeight, &VdpauGrabRenderSurface);
if (status != VDP_STATUS_OK) {
Fatal(_("video/vdpau: can't create grab render output surface: %s\n"),
VdpauGetErrorString(status));
}
Debug(3,
"video/vdpau: created grab render output surface %dx%d with id 0x%08x\n",
VideoWindowWidth, VideoWindowHeight, VdpauGrabRenderSurface);
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
}
///
/// Cleanup output queue.
///
static void VdpauExitOutputQueue(void)
{
int i;
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
VdpStatus status;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
//
// destroy display output surfaces
//
for (i = 0; i < OUTPUT_SURFACES_MAX; ++i) {
Debug(4, "video/vdpau: destroy output surface with id 0x%08x\n",
VdpauSurfacesRb[i]);
Fix bug: devision by zero in ...UpdateOutput,
2012-01-13 10:04:26 +01:00
if (VdpauSurfacesRb[i] != VDP_INVALID_HANDLE) {
Destroy vdpau surface only, when initialized.
2012-01-13 00:58:30 +01:00
status = VdpauOutputSurfaceDestroy(VdpauSurfacesRb[i]);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy output surface: %s\n"),
VdpauGetErrorString(status));
}
VdpauSurfacesRb[i] = VDP_INVALID_HANDLE;
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
}
}
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
if (VdpauGrabRenderSurface != VDP_INVALID_HANDLE) {
status = VdpauOutputSurfaceDestroy(VdpauGrabRenderSurface);
if (status != VDP_STATUS_OK) {
Error(_
("video/vdpau: can't destroy grab render output surface: %s\n"),
VdpauGetErrorString(status));
}
VdpauGrabRenderSurface = VDP_INVALID_HANDLE;
}
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
if (VdpauQueue) {
VdpauPresentationQueueDestroy(VdpauQueue);
VdpauQueue = 0;
}
if (VdpauQueueTarget) {
VdpauPresentationQueueTargetDestroy(VdpauQueueTarget);
VdpauQueueTarget = 0;
}
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
///
/// Display preemption callback.
///
/// @param device device that had its display preempted
/// @param context client-supplied callback context
///
static void VdpauPreemptionCallback(VdpDevice device, __attribute__ ((unused))
void *context)
{
Debug(3, "video/vdpau: display preemption\n");
if (device != VdpauDevice) {
Error(_("video/vdpau preemption device not our device\n"));
return;
}
VdpauPreemption = 1; // set flag for video thread
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// VDPAU setup.
///
/// @param display_name x11/xcb display name
///
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
/// @returns true if VDPAU could be initialized, false otherwise.
///
static int VdpauInit(const char *display_name)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
VdpStatus status;
VdpGetApiVersion *get_api_version;
uint32_t api_version;
VdpGetInformationString *get_information_string;
const char *information_string;
int i;
VdpBool flag;
uint32_t max_width;
uint32_t max_height;
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
pthread_mutex_init(&VdpauGrabMutex, NULL);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status =
vdp_device_create_x11(XlibDisplay, DefaultScreen(XlibDisplay),
&VdpauDevice, &VdpauGetProcAddress);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: Can't create vdp device on display '%s'\n"),
display_name);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
// get error function first, for better error messages
status =
VdpauGetProcAddress(VdpauDevice, VDP_FUNC_ID_GET_ERROR_STRING,
(void **)&VdpauGetErrorString);
if (status != VDP_STATUS_OK) {
Error(_
("video/vdpau: Can't get function address of 'GetErrorString'\n"));
// FIXME: destroy_x11 VdpauDeviceDestroy
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
// get destroy device next, for cleaning up
VdpauGetProc(VDP_FUNC_ID_DEVICE_DESTROY, &VdpauDeviceDestroy,
"DeviceDestroy");
// get version
VdpauGetProc(VDP_FUNC_ID_GET_API_VERSION, &get_api_version,
"GetApiVersion");
VdpauGetProc(VDP_FUNC_ID_GET_INFORMATION_STRING, &get_information_string,
"VdpauGetProc");
status = get_api_version(&api_version);
// FIXME: check status
status = get_information_string(&information_string);
// FIXME: check status
Info(_("video/vdpau: VDPAU API version: %u\n"), api_version);
Info(_("video/vdpau: VDPAU information: %s\n"), information_string);
// FIXME: check if needed capabilities are available
VdpauGetProc(VDP_FUNC_ID_GENERATE_CSC_MATRIX, &VdpauGenerateCSCMatrix,
"GenerateCSCMatrix");
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_QUERY_CAPABILITIES,
&VdpauVideoSurfaceQueryCapabilities, "VideoSurfaceQueryCapabilities");
VdpauGetProc
(VDP_FUNC_ID_VIDEO_SURFACE_QUERY_GET_PUT_BITS_Y_CB_CR_CAPABILITIES,
&VdpauVideoSurfaceQueryGetPutBitsYCbCrCapabilities,
"VideoSurfaceQueryGetPutBitsYCbCrCapabilities");
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_CREATE, &VdpauVideoSurfaceCreate,
"VideoSurfaceCreate");
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_DESTROY, &VdpauVideoSurfaceDestroy,
"VideoSurfaceDestroy");
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_GET_PARAMETERS,
&VdpauVideoSurfaceGetParameters, "VideoSurfaceGetParameters");
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR,
&VdpauVideoSurfaceGetBitsYCbCr, "VideoSurfaceGetBitsYCbCr");
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetProc(VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR,
&VdpauVideoSurfacePutBitsYCbCr, "VideoSurfacePutBitsYCbCr");
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_CAPABILITIES,
&VdpauOutputSurfaceQueryCapabilities,
"OutputSurfaceQueryCapabilities");
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#if 0
VdpauGetProc
(VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_GET_PUT_BITS_NATIVE_CAPABILITIES, &,
"");
VdpauGetProc
(VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_PUT_BITS_INDEXED_CAPABILITIES, &,
"");
VdpauGetProc
(VDP_FUNC_ID_OUTPUT_SURFACE_QUERY_PUT_BITS_Y_CB_CR_CAPABILITIES, &,
"");
#endif
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_CREATE, &VdpauOutputSurfaceCreate,
"OutputSurfaceCreate");
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY,
&VdpauOutputSurfaceDestroy, "OutputSurfaceDestroy");
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_GET_PARAMETERS,
&VdpauOutputSurfaceGetParameters, "OutputSurfaceGetParameters");
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_GET_BITS_NATIVE,
&VdpauOutputSurfaceGetBitsNative, "OutputSurfaceGetBitsNative");
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_NATIVE,
&VdpauOutputSurfacePutBitsNative, "OutputSurfacePutBitsNative");
#if 0
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_INDEXED, &, "");
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_PUT_BITS_Y_CB_CR, &, "");
#endif
VdpauGetProc(VDP_FUNC_ID_BITMAP_SURFACE_QUERY_CAPABILITIES,
&VdpauBitmapSurfaceQueryCapabilities,
"BitmapSurfaceQueryCapabilities");
VdpauGetProc(VDP_FUNC_ID_BITMAP_SURFACE_CREATE, &VdpauBitmapSurfaceCreate,
"BitmapSurfaceCreate");
VdpauGetProc(VDP_FUNC_ID_BITMAP_SURFACE_DESTROY,
&VdpauBitmapSurfaceDestroy, "BitmapSurfaceDestroy");
// VdpauGetProc(VDP_FUNC_ID_BITMAP_SURFACE_GET_PARAMETERS, &VdpauBitmapSurfaceGetParameters, "BitmapSurfaceGetParameters");
VdpauGetProc(VDP_FUNC_ID_BITMAP_SURFACE_PUT_BITS_NATIVE,
&VdpauBitmapSurfacePutBitsNative, "BitmapSurfacePutBitsNative");
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_OUTPUT_SURFACE,
&VdpauOutputSurfaceRenderOutputSurface,
"OutputSurfaceRenderOutputSurface");
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_BITMAP_SURFACE,
&VdpauOutputSurfaceRenderBitmapSurface,
"OutputSurfaceRenderBitmapSurface");
#if 0
VdpauGetProc(VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_VIDEO_SURFACE_LUMA, &, "");
#endif
VdpauGetProc(VDP_FUNC_ID_DECODER_QUERY_CAPABILITIES,
&VdpauDecoderQueryCapabilities, "DecoderQueryCapabilities");
VdpauGetProc(VDP_FUNC_ID_DECODER_CREATE, &VdpauDecoderCreate,
"DecoderCreate");
VdpauGetProc(VDP_FUNC_ID_DECODER_DESTROY, &VdpauDecoderDestroy,
"DecoderDestroy");
#if 0
VdpauGetProc(VDP_FUNC_ID_DECODER_GET_PARAMETERS,
&VdpauDecoderGetParameters, "DecoderGetParameters");
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetProc(VDP_FUNC_ID_DECODER_RENDER, &VdpauDecoderRender,
"DecoderRender");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_QUERY_FEATURE_SUPPORT,
&VdpauVideoMixerQueryFeatureSupport, "VideoMixerQueryFeatureSupport");
#if 0
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_QUERY_PARAMETER_SUPPORT, &, "");
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
#endif
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_QUERY_ATTRIBUTE_SUPPORT,
&VdpauVideoMixerQueryAttributeSupport,
"VideoMixerQueryAttributeSupport");
#if 0
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_QUERY_PARAMETER_VALUE_RANGE, &, "");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_QUERY_ATTRIBUTE_VALUE_RANGE, &, "");
#endif
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_CREATE, &VdpauVideoMixerCreate,
"VideoMixerCreate");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_SET_FEATURE_ENABLES,
&VdpauVideoMixerSetFeatureEnables, "VideoMixerSetFeatureEnables");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_SET_ATTRIBUTE_VALUES,
&VdpauVideoMixerSetAttributeValues, "VideoMixerSetAttributeValues");
#if 0
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_GET_FEATURE_SUPPORT, &, "");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_GET_FEATURE_ENABLES, &, "");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_GET_PARAMETER_VALUES, &, "");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_GET_ATTRIBUTE_VALUES, &, "");
#endif
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_DESTROY, &VdpauVideoMixerDestroy,
"VideoMixerDestroy");
VdpauGetProc(VDP_FUNC_ID_VIDEO_MIXER_RENDER, &VdpauVideoMixerRender,
"VideoMixerRender");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_DESTROY,
&VdpauPresentationQueueTargetDestroy,
"PresentationQueueTargetDestroy");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_CREATE,
&VdpauPresentationQueueCreate, "PresentationQueueCreate");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_DESTROY,
&VdpauPresentationQueueDestroy, "PresentationQueueDestroy");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_SET_BACKGROUND_COLOR,
&VdpauPresentationQueueSetBackgroundColor,
"PresentationQueueSetBackgroundColor");
#if 0
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_GET_BACKGROUND_COLOR,
&VdpauPresentationQueueGetBackgroundColor,
"PresentationQueueGetBackgroundColor");
#endif
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_GET_TIME,
&VdpauPresentationQueueGetTime, "PresentationQueueGetTime");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_DISPLAY,
&VdpauPresentationQueueDisplay, "PresentationQueueDisplay");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_BLOCK_UNTIL_SURFACE_IDLE,
&VdpauPresentationQueueBlockUntilSurfaceIdle,
"PresentationQueueBlockUntilSurfaceIdle");
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_QUERY_SURFACE_STATUS,
&VdpauPresentationQueueQuerySurfaceStatus,
"PresentationQueueQuerySurfaceStatus");
VdpauGetProc(VDP_FUNC_ID_PREEMPTION_CALLBACK_REGISTER,
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
&VdpauPreemptionCallbackRegister, "PreemptionCallbackRegister");
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetProc(VDP_FUNC_ID_PRESENTATION_QUEUE_TARGET_CREATE_X11,
&VdpauPresentationQueueTargetCreateX11,
"PresentationQueueTargetCreateX11");
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
status =
VdpauPreemptionCallbackRegister(VdpauDevice, VdpauPreemptionCallback,
NULL);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't register preemption callback: %s\n"),
VdpauGetErrorString(status));
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// Look which levels of high quality scaling are supported
//
for (i = 0; i < 9; ++i) {
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 + i, &flag);
if (status != VDP_STATUS_OK) {
Warning(_("video/vdpau: can't query feature '%s': %s\n"),
"high-quality-scaling", VdpauGetErrorString(status));
break;
}
if (!flag) {
break;
}
VdpauHqScalingMax =
VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 + i;
}
//
// Cache some features
//
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_ATTRIBUTE_BACKGROUND_COLOR, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"background-color", VdpauGetErrorString(status));
} else {
VdpauBackground = flag;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"deinterlace-temporal", VdpauGetErrorString(status));
} else {
VdpauTemporal = flag;
}
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"deinterlace-temporal-spatial", VdpauGetErrorString(status));
} else {
VdpauTemporalSpatial = flag;
}
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"inverse-telecine", VdpauGetErrorString(status));
} else {
VdpauInverseTelecine = flag;
}
Prepared vdpau noise reduction support.
2011-12-29 19:45:00 +01:00
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"noise-reduction", VdpauGetErrorString(status));
} else {
VdpauNoiseReduction = flag;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status =
VdpauVideoMixerQueryFeatureSupport(VdpauDevice,
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VDP_VIDEO_MIXER_FEATURE_SHARPNESS, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"), "sharpness",
VdpauGetErrorString(status));
} else {
VdpauSharpness = flag;
}
status =
VdpauVideoMixerQueryAttributeSupport(VdpauDevice,
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE, &flag);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query feature '%s': %s\n"),
"skip-chroma-deinterlace", VdpauGetErrorString(status));
} else {
VdpauSkipChroma = flag;
}
Fix message, if no hq scaling is supported.
2012-02-16 09:58:13 +01:00
if (VdpauHqScalingMax) {
Info(_("video/vdpau: highest supported high quality scaling %d\n"),
VdpauHqScalingMax -
VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 + 1);
} else {
Info(_("video/vdpau: high quality scaling unsupported\n"));
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Info(_("video/vdpau: feature deinterlace temporal %s\n"),
VdpauTemporal ? _("supported") : _("unsupported"));
Info(_("video/vdpau: feature deinterlace temporal spatial %s\n"),
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpauTemporalSpatial ? _("supported") : _("unsupported"));
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Info(_("video/vdpau: attribute skip chroma deinterlace %s\n"),
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpauSkipChroma ? _("supported") : _("unsupported"));
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// video formats
//
flag = VDP_FALSE;
status =
VdpauVideoSurfaceQueryCapabilities(VdpauDevice, VDP_CHROMA_TYPE_420,
&flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
Error(_("video/vdpau: can't query video surface: %s\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 4:2:0 chroma format with %dx%d supported\n"),
max_width, max_height);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
VdpauChromaType = VDP_CHROMA_TYPE_420;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
flag = VDP_FALSE;
status =
VdpauVideoSurfaceQueryCapabilities(VdpauDevice, VDP_CHROMA_TYPE_422,
&flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
Error(_("video/vdpau: can't query video surface: %s\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 4:2:2 chroma format with %dx%d supported\n"),
max_width, max_height);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
VdpauChromaType = VDP_CHROMA_TYPE_422;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
flag = VDP_FALSE;
status =
VdpauVideoSurfaceQueryCapabilities(VdpauDevice, VDP_CHROMA_TYPE_444,
&flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
Error(_("video/vdpau: can't query video surface: %s\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 4:4:4 chroma format with %dx%d supported\n"),
max_width, max_height);
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
VdpauChromaType = VDP_CHROMA_TYPE_444;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
// FIXME: check if all chroma-types failed
// FIXME: vdpau didn't support decode of other chroma types
VdpauChromaType = VDP_CHROMA_TYPE_420;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// FIXME: does only check for chroma formats, but no action
status =
VdpauVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpauDevice,
VDP_CHROMA_TYPE_422, VDP_YCBCR_FORMAT_YUYV, &flag);
if (status != VDP_STATUS_OK || !flag) {
Error(_("video/vdpau: doesn't support yuvy video surface\n"));
}
status =
VdpauVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpauDevice,
VDP_CHROMA_TYPE_420, VDP_YCBCR_FORMAT_YV12, &flag);
if (status != VDP_STATUS_OK || !flag) {
Error(_("video/vdpau: doesn't support yv12 video surface\n"));
}
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
flag = VDP_FALSE;
status =
VdpauOutputSurfaceQueryCapabilities(VdpauDevice,
VDP_RGBA_FORMAT_B8G8R8A8, &flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query output surface: %s\n"),
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 8bit BGRA format with %dx%d supported\n"),
max_width, max_height);
}
flag = VDP_FALSE;
status =
VdpauOutputSurfaceQueryCapabilities(VdpauDevice,
VDP_RGBA_FORMAT_R8G8B8A8, &flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query output surface: %s\n"),
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 8bit RGBA format with %dx%d supported\n"),
max_width, max_height);
}
flag = VDP_FALSE;
status =
VdpauOutputSurfaceQueryCapabilities(VdpauDevice,
VDP_RGBA_FORMAT_R10G10B10A2, &flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query output surface: %s\n"),
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 10bit RGBA format with %dx%d supported\n"),
max_width, max_height);
}
flag = VDP_FALSE;
status =
VdpauOutputSurfaceQueryCapabilities(VdpauDevice,
VDP_RGBA_FORMAT_B10G10R10A2, &flag, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't query output surface: %s\n"),
VdpauGetErrorString(status));
}
if (flag) {
Info(_("video/vdpau: 8bit BRGA format with %dx%d supported\n"),
max_width, max_height);
}
// FIXME: does only check for rgba formats, but no action
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Fix buf: VDPAU looses preemption callback.
2012-04-12 15:38:22 +02:00
// FIXME: what if preemption happens during setup?
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
// Create presentation queue, only one queue pro window
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
VdpauInitOutputQueue();
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
return 1;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
///
/// VDPAU cleanup.
///
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
static void VdpauExit(void)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
int i;
for (i = 0; i < VdpauDecoderN; ++i) {
if (VdpauDecoders[i]) {
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VdpauDelHwDecoder(VdpauDecoders[i]);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
VdpauDecoders[i] = NULL;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
if (VdpauDevice) {
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
VdpauExitOutputQueue();
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// FIXME: more VDPAU cleanups...
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (VdpauDeviceDestroy) {
VdpauDeviceDestroy(VdpauDevice);
}
Fix vdpau hangup when switching none/interlaced.
2011-12-23 00:09:59 +01:00
VdpauDevice = 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
pthread_mutex_destroy(&VdpauGrabMutex);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
/// Update output for new size or aspect ratio.
///
/// @param decoder VDPAU hw decoder
///
static void VdpauUpdateOutput(VdpauDecoder * decoder)
{
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VideoUpdateOutput(decoder->InputAspect, decoder->InputWidth,
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->InputHeight, decoder->Resolution, &decoder->OutputX,
&decoder->OutputY, &decoder->OutputWidth, &decoder->OutputHeight,
&decoder->CropX, &decoder->CropY, &decoder->CropWidth,
&decoder->CropHeight);
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
#ifdef USE_AUTOCROP
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
decoder->AutoCrop->State = 0;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->AutoCrop->Count = AutoCropDelay;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
#endif
}
///
/// Configure VDPAU for new video format.
///
/// @param decoder VDPAU hw decoder
///
static void VdpauSetupOutput(VdpauDecoder * decoder)
{
VdpStatus status;
VdpChromaType chroma_type;
uint32_t width;
uint32_t height;
// FIXME: need only to create and destroy surfaces for size changes
// or when number of needed surfaces changed!
decoder->Resolution =
VideoResolutionGroup(decoder->InputWidth, decoder->InputHeight,
decoder->Interlaced);
VdpauCreateSurfaces(decoder, decoder->InputWidth, decoder->InputHeight);
VdpauMixerCreate(decoder);
VdpauUpdateOutput(decoder); // update aspect/scaling
// get real surface size
status =
VdpauVideoSurfaceGetParameters(decoder->SurfacesFree[0], &chroma_type,
&width, &height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface parameters: %s\n"),
VdpauGetErrorString(status));
return;
}
// vdpau can choose different sizes, must use them for putbits
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
if (chroma_type != decoder->ChromaType) {
// I request 422 if supported, but get only 420
Warning(_("video/vdpau: video surface chroma type mismatch\n"));
}
if (width != (uint32_t) decoder->InputWidth
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
|| height != (uint32_t) decoder->InputHeight) {
// FIXME: must rewrite the code to support this case
Spatial deinterlacer for VA-API.
2012-02-07 18:18:13 +01:00
Fatal(_("video/vdpau: video surface size mismatch\n"));
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Check profile supported.
///
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
/// @param decoder VDPAU hw decoder
/// @param profile VDPAU profile requested
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static VdpDecoderProfile VdpauCheckProfile(VdpauDecoder * decoder,
VdpDecoderProfile profile)
{
VdpStatus status;
VdpBool is_supported;
uint32_t max_level;
uint32_t max_macroblocks;
uint32_t max_width;
uint32_t max_height;
status =
VdpauDecoderQueryCapabilities(decoder->Device, profile, &is_supported,
&max_level, &max_macroblocks, &max_width, &max_height);
if (status != VDP_STATUS_OK) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Error(_("video/vdpau: can't query decoder capabilities: %s\n"),
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauGetErrorString(status));
return VDP_INVALID_HANDLE;
}
Debug(3,
"video/vdpau: profile %d with level %d, macro blocks %d, width %d, height %d %ssupported\n",
profile, max_level, max_macroblocks, max_width, max_height,
is_supported ? "" : "not ");
return is_supported ? profile : VDP_INVALID_HANDLE;
}
///
/// Callback to negotiate the PixelFormat.
///
/// @param fmt is the list of formats which are supported by the codec,
/// it is terminated by -1 as 0 is a valid format, the
/// formats are ordered by quality.
///
static enum PixelFormat Vdpau_get_format(VdpauDecoder * decoder,
AVCodecContext * video_ctx, const enum PixelFormat *fmt)
{
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
const enum PixelFormat *fmt_idx;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpDecoderProfile profile;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
VdpStatus status;
int max_refs;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video: new stream format %dms\n", GetMsTicks() - VideoSwitch);
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
VdpauCleanup(decoder);
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
if (!VideoHardwareDecoder || (video_ctx->codec_id == CODEC_ID_MPEG2VIDEO
&& VideoHardwareDecoder == 1)
) { // hardware disabled by config
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(3, "codec: hardware acceleration disabled\n");
Initial vdpau support.
2011-12-21 12:50:14 +01:00
goto slow_path;
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
//
// look through formats
//
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Debug(3, "%s: codec %d fmts:\n", __FUNCTION__, video_ctx->codec_id);
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
for (fmt_idx = fmt; *fmt_idx != PIX_FMT_NONE; fmt_idx++) {
Debug(3, "\t%#010x %s\n", *fmt_idx, av_get_pix_fmt_name(*fmt_idx));
// check supported pixel format with entry point
switch (*fmt_idx) {
case PIX_FMT_VDPAU_H264:
case PIX_FMT_VDPAU_MPEG1:
case PIX_FMT_VDPAU_MPEG2:
case PIX_FMT_VDPAU_WMV3:
case PIX_FMT_VDPAU_VC1:
case PIX_FMT_VDPAU_MPEG4:
break;
default:
continue;
}
break;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
if (*fmt_idx == PIX_FMT_NONE) {
Error(_("video/vdpau: no valid vdpau pixfmt found\n"));
goto slow_path;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
max_refs = CODEC_SURFACES_DEFAULT;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// check profile
switch (video_ctx->codec_id) {
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
case CODEC_ID_MPEG1VIDEO:
Fix bug #1089: vdpau wrong number of mpeg refs.
2012-10-24 15:38:09 +02:00
max_refs = CODEC_SURFACES_MPEG2;
Fix bug: wrong aspect video size calculation.
2011-12-25 11:35:18 +01:00
profile = VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG1);
break;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
case CODEC_ID_MPEG2VIDEO:
Fix bug #1089: vdpau wrong number of mpeg refs.
2012-10-24 15:38:09 +02:00
max_refs = CODEC_SURFACES_MPEG2;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
profile =
VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_MPEG2_MAIN);
break;
case CODEC_ID_MPEG4:
case CODEC_ID_H263:
/*
p = VaapiFindProfile(profiles, profile_n,
VAProfileMPEG4AdvancedSimple);
*/
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
goto slow_path;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
case CODEC_ID_H264:
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
// FIXME: can calculate level 4.1 limits
max_refs = 16;
// try more simple formats, fallback to better
if (video_ctx->profile == FF_PROFILE_H264_BASELINE) {
profile =
VdpauCheckProfile(decoder,
VDP_DECODER_PROFILE_H264_BASELINE);
if (profile == VDP_INVALID_HANDLE) {
profile =
VdpauCheckProfile(decoder,
VDP_DECODER_PROFILE_H264_MAIN);
}
if (profile == VDP_INVALID_HANDLE) {
profile =
VdpauCheckProfile(decoder,
VDP_DECODER_PROFILE_H264_HIGH);
}
} else if (video_ctx->profile == FF_PROFILE_H264_MAIN) {
profile =
VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_H264_MAIN);
if (profile == VDP_INVALID_HANDLE) {
profile =
VdpauCheckProfile(decoder,
VDP_DECODER_PROFILE_H264_HIGH);
}
} else {
profile =
VdpauCheckProfile(decoder, VDP_DECODER_PROFILE_H264_MAIN);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
break;
case CODEC_ID_WMV3:
/*
p = VaapiFindProfile(profiles, profile_n, VAProfileVC1Main);
*/
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
goto slow_path;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
case CODEC_ID_VC1:
/*
p = VaapiFindProfile(profiles, profile_n, VAProfileVC1Advanced);
*/
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
goto slow_path;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
default:
goto slow_path;
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
if (profile == VDP_INVALID_HANDLE) {
Error(_("video/vdpau: no valid profile found\n"));
Initial vdpau support.
2011-12-21 12:50:14 +01:00
goto slow_path;
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(3, "video/vdpau: create decoder profile=%d %dx%d #%d refs\n",
profile, video_ctx->width, video_ctx->height, max_refs);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
decoder->Profile = profile;
decoder->SurfacesNeeded = max_refs + VIDEO_SURFACES_MAX;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
status =
VdpauDecoderCreate(VdpauDevice, profile, video_ctx->width,
video_ctx->height, max_refs, &decoder->VideoDecoder);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create decoder: %s\n"),
VdpauGetErrorString(status));
Initial vdpau support.
2011-12-21 12:50:14 +01:00
goto slow_path;
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
// FIXME: combine this with VdpauSetupOutput and software decoder part
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
video_ctx->width - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
video_ctx->height - VideoCutTopBottom[decoder->Resolution] * 2;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->PixFmt = *fmt_idx;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->InputWidth = video_ctx->width;
decoder->InputHeight = video_ctx->height;
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
decoder->InputAspect = video_ctx->sample_aspect_ratio;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauSetupOutput(decoder);
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, ...
2012-01-18 15:15:37 +01:00
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(3, "\t%#010x %s\n", fmt_idx[0], av_get_pix_fmt_name(fmt_idx[0]));
Initial vdpau support.
2011-12-21 12:50:14 +01:00
return *fmt_idx;
slow_path:
// no accelerated format found
Fix bug: VA-API intel software decoder broken.
2012-02-01 18:36:24 +01:00
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
decoder->InputWidth = 0;
decoder->InputHeight = 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
video_ctx->hwaccel_context = NULL;
return avcodec_default_get_format(video_ctx, fmt);
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#ifdef USE_GRAB
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#ifdef DEBUG // function not used
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
///
/// Grab video surface.
///
/// @param decoder VDPAU hw decoder
///
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
static void VdpauGrabVideoSurface(VdpauDecoder * decoder)
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
{
VdpVideoSurface surface;
VdpStatus status;
VdpChromaType chroma_type;
uint32_t size;
uint32_t width;
uint32_t height;
void *base;
void *data[3];
uint32_t pitches[3];
VdpYCbCrFormat format;
// FIXME: test function to grab output surface content
// for screen shots, atom light and auto crop.
surface = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
// get real surface size
status =
VdpauVideoSurfaceGetParameters(surface, &chroma_type, &width, &height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface parameters: %s\n"),
VdpauGetErrorString(status));
return;
}
switch (chroma_type) {
case VDP_CHROMA_TYPE_420:
case VDP_CHROMA_TYPE_422:
case VDP_CHROMA_TYPE_444:
size = width * height + ((width + 1) / 2) * ((height + 1) / 2)
+ ((width + 1) / 2) * ((height + 1) / 2);
base = malloc(size);
if (!base) {
Error(_("video/vdpau: out of memory\n"));
return;
}
pitches[0] = width;
pitches[1] = width / 2;
pitches[2] = width / 2;
data[0] = base;
data[1] = base + width * height;
data[2] = base + width * height + width * height / 4;
format = VDP_YCBCR_FORMAT_YV12;
break;
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
default:
Error(_("video/vdpau: unsupported chroma type %d\n"), chroma_type);
return;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
}
status = VdpauVideoSurfaceGetBitsYCbCr(surface, format, data, pitches);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface bits: %s\n"),
VdpauGetErrorString(status));
return;
}
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
free(base);
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
#endif
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
/// Grab output surface already locked.
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
/// @param ret_size[out] size of allocated surface copy
/// @param ret_width[in,out] width of output
/// @param ret_height[in,out] height of output
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
static uint8_t *VdpauGrabOutputSurfaceLocked(int *ret_size, int *ret_width,
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
int *ret_height)
{
VdpOutputSurface surface;
VdpStatus status;
VdpRGBAFormat rgba_format;
uint32_t size;
uint32_t width;
uint32_t height;
void *base;
void *data[1];
uint32_t pitches[1];
VdpRect source_rect;
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
VdpRect output_rect;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
surface = VdpauSurfacesRb[VdpauSurfaceIndex];
// get real surface size
status =
VdpauOutputSurfaceGetParameters(surface, &rgba_format, &width,
&height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get output surface parameters: %s\n"),
VdpauGetErrorString(status));
return NULL;
}
Debug(3, "video/vdpau: grab %dx%d format %d\n", width, height,
rgba_format);
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
source_rect.x0 = 0;
source_rect.y0 = 0;
source_rect.x1 = width;
source_rect.y1 = height;
if (ret_width && ret_height) {
if (*ret_width <= -64) { // this is a Atmo grab service request
int overscan;
// calculate aspect correct size of analyze image
width = *ret_width * -1;
height = (width * source_rect.y1) / source_rect.x1;
// calculate size of grab (sub) window
overscan = *ret_height;
if (overscan > 0 && overscan <= 200) {
source_rect.x0 = source_rect.x1 * overscan / 1000;
source_rect.x1 -= source_rect.x0;
source_rect.y0 = source_rect.y1 * overscan / 1000;
source_rect.y1 -= source_rect.y0;
}
} else {
if (*ret_width > 0 && (unsigned)*ret_width < width) {
width = *ret_width;
}
if (*ret_height > 0 && (unsigned)*ret_height < height) {
height = *ret_height;
}
}
Debug(3, "video/vdpau: grab source rect %d,%d:%d,%d dest dim %dx%d\n",
source_rect.x0, source_rect.y0, source_rect.x1, source_rect.y1,
width, height);
if ((source_rect.x1 - source_rect.x0) != width
|| (source_rect.y1 - source_rect.y0) != height) {
output_rect.x0 = 0;
output_rect.y0 = 0;
output_rect.x1 = width;
output_rect.y1 = height;
status =
VdpauOutputSurfaceRenderOutputSurface(VdpauGrabRenderSurface,
&output_rect, surface, &source_rect, NULL, NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render output surface: %s\n"),
VdpauGetErrorString(status));
return NULL;
}
surface = VdpauGrabRenderSurface;
source_rect = output_rect;
}
}
Cleanups and Codec..Del.. prototypes.
2012-01-22 17:07:08 +01:00
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
switch (rgba_format) {
case VDP_RGBA_FORMAT_B8G8R8A8:
case VDP_RGBA_FORMAT_R8G8B8A8:
size = width * height * sizeof(uint32_t);
base = malloc(size);
if (!base) {
Error(_("video/vdpau: out of memory\n"));
return NULL;
}
pitches[0] = width * sizeof(uint32_t);
data[0] = base;
break;
case VDP_RGBA_FORMAT_R10G10B10A2:
case VDP_RGBA_FORMAT_B10G10R10A2:
case VDP_RGBA_FORMAT_A8:
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
default:
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
Error(_("video/vdpau: unsupported rgba format %d\n"), rgba_format);
return NULL;
}
status =
VdpauOutputSurfaceGetBitsNative(surface, &source_rect, data, pitches);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface bits native: %s\n"),
VdpauGetErrorString(status));
free(base);
return NULL;
}
if (ret_size) {
*ret_size = size;
}
if (ret_width) {
*ret_width = width;
}
if (ret_height) {
*ret_height = height;
}
return base;
}
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
///
/// Grab output surface.
///
/// @param ret_size[out] size of allocated surface copy
/// @param ret_width[in,out] width of output
/// @param ret_height[in,out] height of output
///
static uint8_t *VdpauGrabOutputSurface(int *ret_size, int *ret_width,
int *ret_height)
{
uint8_t *img;
if (VdpauGrabRenderSurface == VDP_INVALID_HANDLE) {
return NULL; // vdpau video module not yet initialized
}
pthread_mutex_lock(&VdpauGrabMutex);
img = VdpauGrabOutputSurfaceLocked(ret_size, ret_width, ret_height);
pthread_mutex_unlock(&VdpauGrabMutex);
return img;
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#endif
#ifdef USE_AUTOCROP
///
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
/// VDPAU auto-crop support.
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
///
/// @param decoder VDPAU hw decoder
///
static void VdpauAutoCrop(VdpauDecoder * decoder)
{
VdpVideoSurface surface;
VdpStatus status;
VdpChromaType chroma_type;
uint32_t size;
uint32_t width;
uint32_t height;
void *base;
void *data[3];
uint32_t pitches[3];
int crop14;
int crop16;
int next_state;
VdpYCbCrFormat format;
surface = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
// get real surface size
status =
VdpauVideoSurfaceGetParameters(surface, &chroma_type, &width, &height);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface parameters: %s\n"),
VdpauGetErrorString(status));
return;
}
switch (chroma_type) {
case VDP_CHROMA_TYPE_420:
case VDP_CHROMA_TYPE_422:
case VDP_CHROMA_TYPE_444:
size = width * height + ((width + 1) / 2) * ((height + 1) / 2)
+ ((width + 1) / 2) * ((height + 1) / 2);
base = malloc(size);
if (!base) {
Error(_("video/vdpau: out of memory\n"));
return;
}
pitches[0] = width;
pitches[1] = width / 2;
pitches[2] = width / 2;
data[0] = base;
data[1] = base + width * height;
data[2] = base + width * height + width * height / 4;
format = VDP_YCBCR_FORMAT_YV12;
break;
default:
Error(_("video/vdpau: unsupported chroma type %d\n"), chroma_type);
return;
}
status = VdpauVideoSurfaceGetBitsYCbCr(surface, format, data, pitches);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't get video surface bits: %s\n"),
VdpauGetErrorString(status));
return;
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
AutoCropDetect(decoder->AutoCrop, width, height, data, pitches);
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
free(base);
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
// ignore black frames
if (decoder->AutoCrop->Y1 >= decoder->AutoCrop->Y2) {
return;
}
crop14 =
(decoder->InputWidth * decoder->InputAspect.num * 9) /
(decoder->InputAspect.den * 14);
crop14 = (decoder->InputHeight - crop14) / 2;
crop16 =
(decoder->InputWidth * decoder->InputAspect.num * 9) /
(decoder->InputAspect.den * 16);
crop16 = (decoder->InputHeight - crop16) / 2;
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
if (decoder->AutoCrop->Y1 >= crop16 - AutoCropTolerance
&& decoder->InputHeight - decoder->AutoCrop->Y2 >=
crop16 - AutoCropTolerance) {
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
next_state = 16;
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
} else if (decoder->AutoCrop->Y1 >= crop14 - AutoCropTolerance
&& decoder->InputHeight - decoder->AutoCrop->Y2 >=
crop14 - AutoCropTolerance) {
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
next_state = 14;
} else {
next_state = 0;
}
if (decoder->AutoCrop->State == next_state) {
return;
}
Debug(3, "video: crop aspect %d:%d %d/%d %d+%d\n",
decoder->InputAspect.num, decoder->InputAspect.den, crop14, crop16,
decoder->AutoCrop->Y1, decoder->InputHeight - decoder->AutoCrop->Y2);
Debug(3, "video: crop aspect %d -> %d\n", decoder->AutoCrop->State,
next_state);
switch (decoder->AutoCrop->State) {
case 16:
case 14:
if (decoder->AutoCrop->Count++ < AutoCropDelay / 2) {
return;
}
break;
case 0:
if (decoder->AutoCrop->Count++ < AutoCropDelay) {
return;
}
break;
}
decoder->AutoCrop->State = next_state;
if (next_state) {
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY =
(next_state ==
16 ? crop16 : crop14) + VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth = decoder->InputWidth - decoder->CropX * 2;
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
decoder->CropHeight = decoder->InputHeight - decoder->CropY * 2;
// FIXME: this overwrites user choosen output position
// FIXME: resize kills the auto crop values
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// FIXME: support other 4:3 zoom modes
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
decoder->OutputX = 0;
decoder->OutputY = 0;
decoder->OutputWidth = (VideoWindowHeight * next_state) / 9;
decoder->OutputHeight = (VideoWindowWidth * 9) / next_state;
if ((unsigned)decoder->OutputWidth > VideoWindowWidth) {
decoder->OutputWidth = VideoWindowWidth;
decoder->OutputY = (VideoWindowHeight - decoder->OutputHeight) / 2;
} else if ((unsigned)decoder->OutputHeight > VideoWindowHeight) {
decoder->OutputHeight = VideoWindowHeight;
decoder->OutputX = (VideoWindowWidth - decoder->OutputWidth) / 2;
}
Debug(3, "video: aspect output %dx%d %dx%d+%d+%d\n",
decoder->InputWidth, decoder->InputHeight, decoder->OutputWidth,
decoder->OutputHeight, decoder->OutputX, decoder->OutputY);
} else {
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
decoder->InputWidth - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
decoder->InputHeight - VideoCutTopBottom[decoder->Resolution] * 2;
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
// sets AutoCrop->Count
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
VdpauUpdateOutput(decoder);
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
decoder->AutoCrop->Count = 0;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
}
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
///
/// VDPAU check if auto-crop todo.
///
/// @param decoder VDPAU hw decoder
///
/// @note a copy of VaapiCheckAutoCrop
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
/// @note auto-crop only supported with normal 4:3 display mode
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
///
static void VdpauCheckAutoCrop(VdpauDecoder * decoder)
{
// reduce load, check only n frames
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
if (Video4to3ZoomMode == VideoNormal && AutoCropInterval
&& !(decoder->FrameCounter % AutoCropInterval)) {
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
AVRational input_aspect_ratio;
AVRational tmp_ratio;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
av_reduce(&input_aspect_ratio.num, &input_aspect_ratio.den,
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->InputWidth * decoder->InputAspect.num,
decoder->InputHeight * decoder->InputAspect.den, 1024 * 1024);
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
tmp_ratio.num = 4;
tmp_ratio.den = 3;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
// only 4:3 with 16:9/14:9 inside supported
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
if (!av_cmp_q(input_aspect_ratio, tmp_ratio)) {
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
VdpauAutoCrop(decoder);
} else {
decoder->AutoCrop->Count = 0;
decoder->AutoCrop->State = 0;
}
}
}
///
/// VDPAU reset auto-crop.
///
static void VdpauResetAutoCrop(void)
{
int i;
for (i = 0; i < VdpauDecoderN; ++i) {
VdpauDecoders[i]->AutoCrop->State = 0;
VdpauDecoders[i]->AutoCrop->Count = 0;
}
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#endif
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
/// Queue output surface.
///
/// @param decoder VDPAU hw decoder
/// @param surface output surface
/// @param softdec software decoder
///
/// @note we can't mix software and hardware decoder surfaces
///
static void VdpauQueueSurface(VdpauDecoder * decoder, VdpVideoSurface surface,
int softdec)
{
VdpVideoSurface old;
++decoder->FrameCounter;
if (1) { // can't wait for output queue empty
if (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
Warning(_
("video/vdpau: output buffer full, dropping frame (%d/%d)\n"),
++decoder->FramesDropped, decoder->FrameCounter);
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
if (!(decoder->FramesDisplayed % 300)) {
VdpauPrintFrames(decoder);
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
// software surfaces only
if (softdec) {
VdpauReleaseSurface(decoder, surface);
}
return;
}
#if 0
} else { // wait for output queue empty
while (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
VideoDisplayHandler();
}
#endif
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
}
//
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
// Check and release, old surface
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
//
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
if ((old = decoder->SurfacesRb[decoder->SurfaceWrite])
!= VDP_INVALID_HANDLE) {
// now we can release the surface, software surfaces only
if (softdec) {
VdpauReleaseSurface(decoder, old);
}
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Debug(4, "video/vdpau: yy video surface %#08x@%d ready\n", surface,
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
decoder->SurfaceWrite);
decoder->SurfacesRb[decoder->SurfaceWrite] = surface;
decoder->SurfaceWrite = (decoder->SurfaceWrite + 1)
% VIDEO_SURFACES_MAX;
atomic_inc(&decoder->SurfacesFilled);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Render a ffmpeg frame.
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
/// @param video_ctx ffmpeg video codec context
/// @param frame frame to display
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static void VdpauRenderFrame(VdpauDecoder * decoder,
const AVCodecContext * video_ctx, const AVFrame * frame)
{
VdpStatus status;
VdpVideoSurface surface;
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
int interlaced;
// FIXME: some tv-stations toggle interlace on/off
// frame->interlaced_frame isn't always correct set
interlaced = frame->interlaced_frame;
if (video_ctx->height == 720) {
if (interlaced && !decoder->WrongInterlacedWarned) {
Debug(3, "video/vdpau: wrong interlace flag fixed\n");
decoder->WrongInterlacedWarned = 1;
}
interlaced = 0;
} else {
if (!interlaced && !decoder->WrongInterlacedWarned) {
Debug(3, "video/vdpau: wrong interlace flag fixed\n");
decoder->WrongInterlacedWarned = 1;
}
interlaced = 1;
}
// FIXME: should be done by init video_ctx->field_order
if (decoder->Interlaced != interlaced
|| decoder->TopFieldFirst != frame->top_field_first) {
Debug(3, "video/vdpau: interlaced %d top-field-first %d\n", interlaced,
frame->top_field_first);
decoder->Interlaced = interlaced;
decoder->TopFieldFirst = frame->top_field_first;
decoder->SurfaceField = 0;
}
// update aspect ratio changes
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,60,100)
if (decoder->InputWidth && decoder->InputHeight
&& av_cmp_q(decoder->InputAspect, frame->sample_aspect_ratio)) {
Debug(3, "video/vdpau: aspect ratio changed\n");
decoder->InputAspect = frame->sample_aspect_ratio;
VdpauUpdateOutput(decoder);
}
#else
if (decoder->InputWidth && decoder->InputHeight
Fix bug: used frame-> instead of video_ctx->.
2012-02-14 14:46:49 +01:00
&& av_cmp_q(decoder->InputAspect, video_ctx->sample_aspect_ratio)) {
Add aspect change support to software decoder path
2012-01-29 23:57:22 +01:00
Debug(3, "video/vdpau: aspect ratio changed\n");
decoder->InputAspect = video_ctx->sample_aspect_ratio;
VdpauUpdateOutput(decoder);
}
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// Hardware render
//
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
// VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
&& video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
|| video_ctx->pix_fmt == PIX_FMT_VDPAU_MPEG4) {
struct vdpau_render_state *vrs;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
vrs = (struct vdpau_render_state *)frame->data[0];
surface = vrs->surface;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Debug(4, "video/vdpau: hw render hw surface %#08x\n", surface);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
if (interlaced
&& VideoDeinterlace[decoder->Resolution] >=
VideoDeinterlaceSoftBob) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
// FIXME: software deinterlace avpicture_deinterlace
// FIXME: VdpauCpuDeinterlace(decoder, surface);
Software deinterlacer (config/skip chroma deint): Add support for skip chroma deinterlace to software deinterlacer. Type of software deinterlacer now configurable from setup menu.
2012-02-09 21:22:42 +01:00
VdpauQueueSurface(decoder, surface, 0);
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
} else {
VdpauQueueSurface(decoder, surface, 0);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
Fix vdpau hangup when switching none/interlaced.
2011-12-23 00:09:59 +01:00
// PutBitsYCbCr render
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
} else {
void const *data[3];
uint32_t pitches[3];
//
// Check image, format, size
//
if (decoder->PixFmt != video_ctx->pix_fmt
|| video_ctx->width != decoder->InputWidth
|| video_ctx->height != decoder->InputHeight) {
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
decoder->CropX = VideoCutLeftRight[decoder->Resolution];
decoder->CropY = VideoCutTopBottom[decoder->Resolution];
decoder->CropWidth =
video_ctx->width - VideoCutLeftRight[decoder->Resolution] * 2;
decoder->CropHeight =
video_ctx->height - VideoCutTopBottom[decoder->Resolution] * 2;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
decoder->PixFmt = video_ctx->pix_fmt;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->InputWidth = video_ctx->width;
decoder->InputHeight = video_ctx->height;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauCleanup(decoder);
Fix bug: Can't use software decoder with VDPAU.
2012-08-13 16:57:36 +02:00
decoder->SurfacesNeeded = VIDEO_SURFACES_MAX + 2;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauSetupOutput(decoder);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
//
// Copy data from frame to image
//
switch (video_ctx->pix_fmt) {
case PIX_FMT_YUV420P:
break;
case PIX_FMT_YUV422P:
case PIX_FMT_YUV444P:
default:
Fatal(_("video/vdpau: pixel format %d not supported\n"),
video_ctx->pix_fmt);
Fix bug: Can't use software decoder with VDPAU.
2012-08-13 16:57:36 +02:00
// FIXME: no fatals!
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
// convert ffmpeg order to vdpau
data[0] = frame->data[0];
data[1] = frame->data[2];
data[2] = frame->data[1];
pitches[0] = frame->linesize[0];
pitches[1] = frame->linesize[2];
pitches[2] = frame->linesize[1];
surface = VdpauGetSurface(decoder);
status =
VdpauVideoSurfacePutBitsYCbCr(surface, VDP_YCBCR_FORMAT_YV12, data,
pitches);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't put video surface bits: %s\n"),
VdpauGetErrorString(status));
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Fix bug: Can't use software decoder with VDPAU.
2012-08-13 16:57:36 +02:00
Debug(4, "video/vdpau: sw render hw surface %#08x\n", surface);
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
VdpauQueueSurface(decoder, surface, 1);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
if (frame->interlaced_frame) {
++decoder->FrameCounter;
}
}
///
/// Render osd surface to output surface.
///
static void VdpauMixOsd(void)
{
VdpOutputSurfaceRenderBlendState blend_state;
VdpRect source_rect;
VdpRect output_rect;
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
VdpRect output_double_rect;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpStatus status;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
//uint32_t start;
//uint32_t end;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// blend overlay over output
//
blend_state.struct_version = VDP_OUTPUT_SURFACE_RENDER_BLEND_STATE_VERSION;
blend_state.blend_factor_source_color =
VDPAU: Changed OSD alpha calculation.
2012-01-19 22:58:02 +01:00
VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_ALPHA;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
blend_state.blend_factor_source_alpha =
VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE;
blend_state.blend_factor_destination_color =
VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
blend_state.blend_factor_destination_alpha =
VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA;
blend_state.blend_equation_color =
VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD;
blend_state.blend_equation_alpha =
VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD;
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
// use dirty area
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, ...
2012-01-18 15:15:37 +01:00
if (OsdDirtyWidth && OsdDirtyHeight) {
source_rect.x0 = OsdDirtyX;
source_rect.y0 = OsdDirtyY;
source_rect.x1 = source_rect.x0 + OsdDirtyWidth;
source_rect.y1 = source_rect.y0 + OsdDirtyHeight;
output_rect.x0 = (OsdDirtyX * VideoWindowWidth) / OsdWidth;
output_rect.y0 = (OsdDirtyY * VideoWindowHeight) / OsdHeight;
output_rect.x1 =
output_rect.x0 + (OsdDirtyWidth * VideoWindowWidth) / OsdWidth;
output_rect.y1 =
output_rect.y0 + (OsdDirtyHeight * VideoWindowHeight) / OsdHeight;
} else {
source_rect.x0 = 0;
source_rect.y0 = 0;
source_rect.x1 = OsdWidth;
source_rect.y1 = OsdHeight;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
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, ...
2012-01-18 15:15:37 +01:00
output_rect.x0 = 0;
output_rect.y0 = 0;
output_rect.x1 = VideoWindowWidth;
output_rect.y1 = VideoWindowHeight;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
output_double_rect = output_rect;
switch (Osd3DMode) {
case 1:
output_rect.x1 = output_rect.x1 / 2;
output_double_rect.x0 = output_rect.x1;
break;
case 2:
output_rect.y1 = output_rect.y1 / 2;
output_double_rect.y0 = output_rect.y1;
break;
default:
break;
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
//start = GetMsTicks();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
// FIXME: double buffered osd disabled
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
VdpauOsdSurfaceIndex = 1;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_BITMAP
status =
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
VdpauOutputSurfaceRenderBitmapSurface(VdpauSurfacesRb
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
[VdpauSurfaceIndex], &output_rect,
VdpauOsdBitmapSurface[!VdpauOsdSurfaceIndex], &source_rect, NULL,
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
VideoTransparentOsd ? &blend_state : NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render bitmap surface: %s\n"),
VdpauGetErrorString(status));
}
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
if (Osd3DMode > 0) {
status =
VdpauOutputSurfaceRenderBitmapSurface(VdpauSurfacesRb
[VdpauSurfaceIndex], &output_double_rect,
VdpauOsdOutputSurface[!VdpauOsdSurfaceIndex], &source_rect, NULL,
VideoTransparentOsd ? &blend_state : NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render output surface: %s\n"),
VdpauGetErrorString(status));
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#else
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
status =
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauOutputSurfaceRenderOutputSurface(VdpauSurfacesRb
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
[VdpauSurfaceIndex], &output_rect,
VdpauOsdOutputSurface[!VdpauOsdSurfaceIndex], &source_rect, NULL,
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
VideoTransparentOsd ? &blend_state : NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render output surface: %s\n"),
VdpauGetErrorString(status));
}
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
if (Osd3DMode > 0) {
status =
VdpauOutputSurfaceRenderOutputSurface(VdpauSurfacesRb
[VdpauSurfaceIndex], &output_double_rect,
VdpauOsdOutputSurface[!VdpauOsdSurfaceIndex], &source_rect, NULL,
VideoTransparentOsd ? &blend_state : NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render output surface: %s\n"),
VdpauGetErrorString(status));
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#endif
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
//end = GetMsTicks();
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
/*
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(4, "video:/vdpau: osd render %d %dms\n", VdpauOsdSurfaceIndex,
Release Version 0.3.5.
2012-01-19 16:01:05 +01:00
end - start);
*/
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
VdpauOsdSurfaceIndex = !VdpauOsdSurfaceIndex;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
///
/// Render video surface to output surface.
///
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
static void VdpauMixVideo(VdpauDecoder * decoder)
{
VdpVideoSurface current;
VdpRect video_src_rect;
VdpRect dst_rect;
VdpRect dst_video_rect;
VdpStatus status;
VA-API: Add auto-crop support.
2012-01-23 15:40:59 +01:00
#ifdef USE_AUTOCROP
// FIXME: can move to render frame
VdpauCheckAutoCrop(decoder);
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
dst_rect.x0 = 0; // window output (clip)
dst_rect.y0 = 0;
dst_rect.x1 = VideoWindowWidth;
dst_rect.y1 = VideoWindowHeight;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
video_src_rect.x0 = decoder->CropX; // video source (crop)
video_src_rect.y0 = decoder->CropY;
video_src_rect.x1 = decoder->CropX + decoder->CropWidth;
video_src_rect.y1 = decoder->CropY + decoder->CropHeight;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
dst_video_rect.x0 = decoder->OutputX; // video output (scale)
dst_video_rect.y0 = decoder->OutputY;
dst_video_rect.x1 = decoder->OutputX + decoder->OutputWidth;
dst_video_rect.y1 = decoder->OutputY + decoder->OutputHeight;
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
if (decoder->Interlaced
&& VideoDeinterlace[decoder->Resolution] != VideoDeinterlaceWeave) {
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// Build deinterlace structures
//
VdpVideoMixerPictureStructure cps;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpVideoSurface past[3];
int past_n;
VdpVideoSurface future[3];
int future_n;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef DEBUG
if (atomic_read(&decoder->SurfacesFilled) < 3) {
Debug(3, "only %d\n", atomic_read(&decoder->SurfacesFilled));
}
#endif
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
// FIXME: can use VDP_INVALID_HANDLE to support less surface on start
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
if (VideoDeinterlaceSurfaces == 5) {
past_n = 2;
future_n = 2;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
// FIXME: wrong for bottom-field first
// read: past: B0 T0 current T1 future B1 T2 (0 1 2)
// read: past: T1 B0 current B1 future T2 B2 (0 1 2)
if (decoder->TopFieldFirst != decoder->SurfaceField) {
cps = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD;
past[1] = decoder->SurfacesRb[decoder->SurfaceRead];
past[0] = past[1];
current = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
future[0] = current;
future[1] = decoder->SurfacesRb[(decoder->SurfaceRead + 2)
% VIDEO_SURFACES_MAX];
// FIXME: can support 1 future more
} else {
cps = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD;
// FIXME: can support 1 past more
past[1] = decoder->SurfacesRb[decoder->SurfaceRead];
past[0] = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
current = past[0];
future[0] = decoder->SurfacesRb[(decoder->SurfaceRead + 2)
% VIDEO_SURFACES_MAX];
future[1] = future[0];
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
} else if (VideoDeinterlaceSurfaces == 4) {
past_n = 2;
future_n = 1;
// FIXME: wrong for bottom-field first
// read: past: B0 T0 current T1 future B1 (0 1 2)
// read: past: T1 B0 current B1 future T2 (0 1 2)
if (decoder->TopFieldFirst != decoder->SurfaceField) {
cps = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD;
past[1] = decoder->SurfacesRb[decoder->SurfaceRead];
past[0] = past[1];
current = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
future[0] = current;
} else {
cps = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD;
past[1] = decoder->SurfacesRb[decoder->SurfaceRead];
past[0] = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
current = past[0];
future[0] = decoder->SurfacesRb[(decoder->SurfaceRead + 2)
% VIDEO_SURFACES_MAX];
}
} else {
Error(_("video/vdpau: %d surface deinterlace unsupported\n"),
VideoDeinterlaceSurfaces);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
// FIXME: past_n, future_n here:
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Debug(4, " %02d %02d(%c%02d) %02d %02d\n", past[1], past[0],
cps == VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD ? 'T' : 'B',
current, future[0], future[1]);
status =
VdpauVideoMixerRender(decoder->VideoMixer, VDP_INVALID_HANDLE,
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
NULL, cps, past_n, past, current, future_n, future,
&video_src_rect, VdpauSurfacesRb[VdpauSurfaceIndex], &dst_rect,
&dst_video_rect, 0, NULL);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
} else {
Reset closing only, if trickspeed is set.
2012-08-18 15:53:14 +02:00
if (decoder->Interlaced) {
current = decoder->SurfacesRb[(decoder->SurfaceRead + 1)
% VIDEO_SURFACES_MAX];
} else {
current = decoder->SurfacesRb[decoder->SurfaceRead];
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
status =
VdpauVideoMixerRender(decoder->VideoMixer, VDP_INVALID_HANDLE,
NULL, VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME, 0, NULL, current, 0,
NULL, &video_src_rect, VdpauSurfacesRb[VdpauSurfaceIndex],
&dst_rect, &dst_video_rect, 0, NULL);
}
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't render mixer: %s\n"),
VdpauGetErrorString(status));
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
Debug(4, "video/vdpau: yy video surface %#08x@%d displayed\n", current,
Initial vdpau support.
2011-12-21 12:50:14 +01:00
decoder->SurfaceRead);
}
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
///
/// Create and display a black empty surface.
///
/// @param decoder VDPAU hw decoder
///
Call VdpauMixerSetup only, if mixer setup.
2012-01-21 21:56:19 +01:00
/// @FIXME: render only video area, not fullscreen!
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
/// decoder->Output.. isn't correct setup for radio stations
Call VdpauMixerSetup only, if mixer setup.
2012-01-21 21:56:19 +01:00
///
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
static void VdpauBlackSurface(VdpauDecoder * decoder)
{
VdpStatus status;
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
VdpRect source_rect;
VdpRect output_rect;
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
source_rect.x0 = 0;
source_rect.y0 = 0;
source_rect.x1 = 0;
source_rect.y1 = 0;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (0) {
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
// FIXME: wrong for radio channels
output_rect.x0 = decoder->OutputX; // video output (scale)
output_rect.y0 = decoder->OutputY;
output_rect.x1 = decoder->OutputX + decoder->OutputWidth;
output_rect.y1 = decoder->OutputY + decoder->OutputHeight;
} else {
output_rect.x0 = 0;
output_rect.y0 = 0;
output_rect.x1 = VideoWindowWidth;
output_rect.y1 = VideoWindowHeight;
}
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
status =
VdpauOutputSurfaceRenderOutputSurface(VdpauSurfacesRb
[VdpauSurfaceIndex], &output_rect,
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
VdpauOsdOutputSurface[!VdpauOsdSurfaceIndex], &source_rect, NULL, NULL,
VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
if (status != VDP_STATUS_OK) {
Faster VdpauBlackSurface version.
2012-03-30 17:19:31 +02:00
Error(_("video/vdpau: can't render output surface: %s\n"),
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
VdpauGetErrorString(status));
}
}
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// Advance displayed frame of decoder.
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param decoder VDPAU hw decoder
///
static void VdpauAdvanceDecoderFrame(VdpauDecoder * decoder)
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// next surface, if complete frame is displayed (1 -> 0)
if (decoder->SurfaceField) {
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
int filled;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: this should check the caller
// check decoder, if new surface is available
// need 2 frames for progressive
// need 4 frames for interlaced
filled = atomic_read(&decoder->SurfacesFilled);
if (filled <= 1 + 2 * decoder->Interlaced) {
// keep use of last surface
++decoder->FramesDuped;
// FIXME: don't warn after stream start, don't warn during pause
Error(_("video: display buffer empty, duping frame (%d/%d) %d\n"),
decoder->FramesDuped, decoder->FrameCounter,
VideoGetBuffers());
return;
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
decoder->SurfaceRead = (decoder->SurfaceRead + 1) % VIDEO_SURFACES_MAX;
atomic_dec(&decoder->SurfacesFilled);
decoder->SurfaceField = !decoder->Interlaced;
return;
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// next field
decoder->SurfaceField = 1;
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Display a video frame.
///
static void VdpauDisplayFrame(void)
{
VdpStatus status;
VdpTime first_time;
static VdpTime last_time;
int i;
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
if (VideoSurfaceModesChanged) { // handle changed modes
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VideoSurfaceModesChanged = 0;
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
for (i = 0; i < VdpauDecoderN; ++i) {
Call VdpauMixerSetup only, if mixer setup.
2012-01-21 21:56:19 +01:00
if (VdpauDecoders[i]->VideoMixer != VDP_INVALID_HANDLE) {
VdpauMixerSetup(VdpauDecoders[i]);
}
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// wait for surface visible (blocks max ~5ms)
//
status =
VdpauPresentationQueueBlockUntilSurfaceIdle(VdpauQueue,
VdpauSurfacesRb[VdpauSurfaceIndex], &first_time);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't block queue: %s\n"),
VdpauGetErrorString(status));
}
// check if surface was displayed for more than 1 frame
Cleanups.
2012-03-12 17:58:19 +01:00
// FIXME: 21 only correct for 50Hz
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (last_time && first_time > last_time + 21 * 1000 * 1000) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: ignore still-frame, trick-speed
Fix compiler warnings.
2012-07-05 23:59:28 +02:00
Debug(3, "video/vdpau: %" PRId64 " display time %" PRId64 "\n",
first_time / 1000, (first_time - last_time) / 1000);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// FIXME: can be more than 1 frame long shown
for (i = 0; i < VdpauDecoderN; ++i) {
VdpauDecoders[i]->FramesMissed++;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VdpauMessage(2, _("video/vdpau: missed frame (%d/%d)\n"),
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
VdpauDecoders[i]->FramesMissed,
VdpauDecoders[i]->FrameCounter);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
}
last_time = first_time;
//
// Render videos into output
//
for (i = 0; i < VdpauDecoderN; ++i) {
int filled;
VdpauDecoder *decoder;
decoder = VdpauDecoders[i];
Add video/audio sync to vdpau.
2011-12-22 22:20:52 +01:00
decoder->FramesDisplayed++;
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter++;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
filled = atomic_read(&decoder->SurfacesFilled);
// need 1 frame for progressive, 3 frames for interlaced
if (filled < 1 + 2 * decoder->Interlaced) {
Vpdau displays black, when no video available.
2011-12-29 17:47:21 +01:00
// FIXME: rewrite MixVideo to support less surfaces
Don't show black picture during still-pictures.
2012-10-29 19:29:43 +01:00
if ((VideoShowBlackPicture && !decoder->TrickSpeed)
|| decoder->Closing < -300) {
Made showing black picture configurable.
2012-04-20 15:40:14 +02:00
VdpauBlackSurface(decoder);
VdpauMessage(3, "video/vdpau: black surface displayed\n");
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
continue;
}
VdpauMixVideo(decoder);
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
//
// add osd to surface
//
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, ...
2012-01-18 15:15:37 +01:00
if (OsdShown) { // showing costs performance
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
VdpauMixOsd();
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// place surface in presentation queue
//
status =
VdpauPresentationQueueDisplay(VdpauQueue,
VdpauSurfacesRb[VdpauSurfaceIndex], 0, 0, 0);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't queue display: %s\n"),
VdpauGetErrorString(status));
}
Fix vdpau hangup when switching none/interlaced.
2011-12-23 00:09:59 +01:00
for (i = 0; i < VdpauDecoderN; ++i) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// remember time of last shown surface
Fix vdpau hangup when switching none/interlaced.
2011-12-23 00:09:59 +01:00
clock_gettime(CLOCK_REALTIME, &VdpauDecoders[i]->FrameTime);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauSurfaceIndex = (VdpauSurfaceIndex + 1) % OUTPUT_SURFACES_MAX;
xcb_flush(Connection);
}
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// Set VDPAU decoder video clock.
///
/// @param decoder VDPAU hardware decoder
/// @param pts audio presentation timestamp
///
void VdpauSetClock(VdpauDecoder * decoder, int64_t pts)
{
decoder->PTS = pts;
}
///
/// Get VDPAU decoder video clock.
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// FIXME: 20 wrong for 60hz dvb streams
///
static int64_t VdpauGetClock(const VdpauDecoder * decoder)
{
// pts is the timestamp of the latest decoded frame
if (decoder->PTS == (int64_t) AV_NOPTS_VALUE) {
return AV_NOPTS_VALUE;
}
// subtract buffered decoded frames
if (decoder->Interlaced) {
/*
Info("video: %s =pts field%d #%d\n",
Timestamp2String(decoder->PTS),
decoder->SurfaceField,
atomic_read(&decoder->SurfacesFilled));
*/
Skip audio sync while trick play.
2012-04-26 15:33:51 +02:00
// 1 field is future, 2 fields are past, + 2 in driver queue
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
return decoder->PTS -
20 * 90 * (2 * atomic_read(&decoder->SurfacesFilled)
- decoder->SurfaceField - 2 + 2);
}
// + 2 in driver queue
return decoder->PTS - 20 * 90 * (atomic_read(&decoder->SurfacesFilled) +
2);
}
///
/// Set trick play speed.
///
/// @param decoder VDPAU decoder
/// @param speed trick speed (0 = normal)
///
static void VdpauSetTrickSpeed(VdpauDecoder * decoder, int speed)
{
decoder->TrickSpeed = speed;
decoder->TrickCounter = speed;
Reset closing only, if trickspeed is set.
2012-08-18 15:53:14 +02:00
if (speed) {
decoder->Closing = 0;
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
///
/// Sync decoder output to audio.
///
/// trick-speed show frame <n> times
/// still-picture show frame until new frame arrives
/// 60hz-mode repeat every 5th picture
/// video>audio slow down video by duplicating frames
/// video<audio speed up video by skipping frames
/// soft-start show every second frame
///
/// @param decoder VDPAU hw decoder
///
static void VdpauSyncDecoder(VdpauDecoder * decoder)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
int err;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
int filled;
int64_t audio_clock;
int64_t video_clock;
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
err = 0;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
audio_clock = AudioGetClock();
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
video_clock = VdpauGetClock(decoder);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
filled = atomic_read(&decoder->SurfacesFilled);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// 60Hz: repeat every 5th field
if (Video60HzMode && !(decoder->FramesDisplayed % 6)) {
if (audio_clock == (int64_t) AV_NOPTS_VALUE
|| video_clock == (int64_t) AV_NOPTS_VALUE) {
goto out;
}
// both clocks are known
if (audio_clock + VideoAudioDelay <= video_clock + 15 * 90) {
goto out;
}
// out of sync: audio before video
if (!decoder->TrickSpeed) {
goto skip_sync;
}
}
// TrickSpeed
if (decoder->TrickSpeed) {
if (decoder->TrickCounter--) {
goto out;
}
decoder->TrickCounter = decoder->TrickSpeed;
Skip audio sync while trick play.
2012-04-26 15:33:51 +02:00
goto skip_sync;
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
// at start of new video stream, soft or hard sync video to audio
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
if (!VideoSoftStartSync && decoder->StartCounter < VideoSoftStartFrames
Safer 4:3 detection, 4:3 crop correction.
2012-05-17 16:50:40 +02:00
&& video_clock != (int64_t) AV_NOPTS_VALUE
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
&& (audio_clock == (int64_t) AV_NOPTS_VALUE
|| video_clock > audio_clock + VideoAudioDelay + 120 * 90)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
err =
VdpauMessage(3, "video: initial slow down video, frame %d\n",
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
decoder->StartCounter);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
goto out;
}
if (decoder->SyncCounter && decoder->SyncCounter--) {
goto skip_sync;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (audio_clock != (int64_t) AV_NOPTS_VALUE
New audio PES handling. New easier and more flexible audio PES packet parser, which includes own codec parser. Removed av_parser use. Reduced audio buffer time, faster channel switch. New audio transport stream parser (not enabled as default).
2012-02-21 20:55:28 +01:00
&& video_clock != (int64_t) AV_NOPTS_VALUE) {
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// both clocks are known
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (abs(video_clock - audio_clock + VideoAudioDelay) > 5000 * 90) {
Improved audio skip, after channel switch.
2012-06-25 17:30:30 +02:00
err = VdpauMessage(2, "video: audio/video difference too big\n");
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (video_clock > audio_clock + VideoAudioDelay + 100 * 90) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: this quicker sync step, did not work with new code!
Improved audio skip, after channel switch.
2012-06-25 17:30:30 +02:00
err = VdpauMessage(2, "video: slow down video, duping frame\n");
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
++decoder->FramesDuped;
decoder->SyncCounter = 1;
goto out;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (video_clock > audio_clock + VideoAudioDelay + 45 * 90) {
Improved audio skip, after channel switch.
2012-06-25 17:30:30 +02:00
err = VdpauMessage(2, "video: slow down video, duping frame\n");
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
++decoder->FramesDuped;
decoder->SyncCounter = 1;
goto out;
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
} else if (audio_clock + VideoAudioDelay > video_clock + 15 * 90
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
&& filled > 1 + 2 * decoder->Interlaced) {
Improved audio skip, after channel switch.
2012-06-25 17:30:30 +02:00
err = VdpauMessage(2, "video: speed up video, droping frame\n");
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
++decoder->FramesDropped;
VdpauAdvanceDecoderFrame(decoder);
decoder->SyncCounter = 1;
}
}
skip_sync:
// check if next field is available
if (decoder->SurfaceField && filled <= 1 + 2 * decoder->Interlaced) {
if (filled == 1 + 2 * decoder->Interlaced) {
++decoder->FramesDuped;
// FIXME: don't warn after stream start, don't warn during pause
err =
VdpauMessage(1,
_("video: decoder buffer empty, "
"duping frame (%d/%d) %d v-buf\n"), decoder->FramesDuped,
decoder->FrameCounter, VideoGetBuffers());
New audio filters next part.
2012-04-19 00:47:34 +02:00
if (decoder->Closing < -300) {
Fix bug: Black screen is sometimes not shown.
2012-05-17 16:52:08 +02:00
atomic_set(&decoder->SurfacesFilled, 0);
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
goto out;
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VdpauAdvanceDecoderFrame(decoder);
out:
Add A-V info output and compile time option.
2012-02-01 23:12:45 +01:00
#if defined(DEBUG) || defined(AV_INFO)
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
// debug audio/video sync
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
if (err || !(decoder->FramesDisplayed % AV_INFO_TIME)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (!err) {
VdpauMessage(0, NULL);
}
Add number of buffered video output frames to info.
2012-08-28 19:15:11 +02:00
Info("video: %s%+5" PRId64 " %4" PRId64 " %3d/\\ms %3d+%d v-buf\n",
Move time-stamp printing to misc.h.
2012-03-05 17:34:10 +01:00
Timestamp2String(video_clock),
Nicer debug output when clock out of range.
2012-02-19 22:45:29 +01:00
abs((video_clock - audio_clock) / 90) <
Cleanups.
2012-03-12 17:58:19 +01:00
8888 ? ((video_clock - audio_clock) / 90) : 8888,
Add number of buffered video output frames to info.
2012-08-28 19:15:11 +02:00
AudioGetDelay() / 90, (int)VideoDeltaPTS / 90, VideoGetBuffers(),
(1 + decoder->Interlaced) * atomic_read(&decoder->SurfacesFilled)
- decoder->SurfaceField);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (!(decoder->FramesDisplayed % (5 * 60 * 60))) {
VdpauPrintFrames(decoder);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
#endif
Fix gcc error bug.
2012-03-31 23:20:06 +02:00
return; // fix gcc bug!
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
///
/// Sync a video frame.
///
static void VdpauSyncFrame(void)
{
int i;
//
// Sync video decoder to audio
//
for (i = 0; i < VdpauDecoderN; ++i) {
VdpauSyncDecoder(VdpauDecoders[i]);
}
}
///
/// Sync and display surface.
///
static void VdpauSyncDisplayFrame(void)
{
VdpauDisplayFrame();
VdpauSyncFrame();
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Sync and render a ffmpeg frame
///
Cleanup on destroy decoder.
2011-12-22 23:05:22 +01:00
/// @param decoder VDPAU hw decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// @param video_ctx ffmpeg video codec context
/// @param frame frame to display
///
static void VdpauSyncRenderFrame(VdpauDecoder * decoder,
const AVCodecContext * video_ctx, const AVFrame * frame)
{
Make soft start sync setup menu configurable.
2012-03-06 12:16:47 +01:00
// FIXME: temp debug
if (0 && frame->pkt_pts != (int64_t) AV_NOPTS_VALUE) {
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
Debug(3, "video: render frame pts %s\n",
Timestamp2String(frame->pkt_pts));
Make soft start sync setup menu configurable.
2012-03-06 12:16:47 +01:00
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#ifdef DEBUG
Initial vdpau support.
2011-12-21 12:50:14 +01:00
if (!atomic_read(&decoder->SurfacesFilled)) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video: new stream frame %dms\n", GetMsTicks() - VideoSwitch);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#endif
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
if (VdpauPreemption) { // display preempted
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
if (!decoder->Closing) {
VideoSetPts(&decoder->PTS, decoder->Interlaced, frame);
}
Rewrote video/audio start code.
2012-03-02 18:16:20 +01:00
return;
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// if video output buffer is full, wait and display surface.
// loop for interlace
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
// FIXME: wrong for multiple streams
Initial vdpau support.
2011-12-21 12:50:14 +01:00
while (atomic_read(&decoder->SurfacesFilled) >= VIDEO_SURFACES_MAX) {
struct timespec abstime;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
pthread_mutex_unlock(&VideoLockMutex);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
abstime = decoder->FrameTime;
abstime.tv_nsec += 14 * 1000 * 1000;
if (abstime.tv_nsec >= 1000 * 1000 * 1000) {
// avoid overflow
abstime.tv_sec++;
abstime.tv_nsec -= 1000 * 1000 * 1000;
}
VideoPollEvent();
Fix dead-lock in VdpauExit.
2012-01-24 10:02:39 +01:00
// fix dead-lock with VdpauExit
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
pthread_mutex_lock(&VideoLockMutex);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
// give osd some time slot
while (pthread_cond_timedwait(&VideoWakeupCond, &VideoLockMutex,
&abstime) != ETIMEDOUT) {
// SIGUSR1
Debug(3, "video/vdpau: pthread_cond_timedwait error\n");
}
Fix dead-lock in VdpauExit.
2012-01-24 10:02:39 +01:00
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
if (VdpauPreemption) { // display become preempted
return;
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VdpauSyncDisplayFrame();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
if (!decoder->Closing) {
VideoSetPts(&decoder->PTS, decoder->Interlaced, frame);
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
VdpauRenderFrame(decoder, video_ctx, frame);
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
///
/// Recover from preemption.
///
static int VdpauPreemptionRecover(void)
{
VdpStatus status;
int i;
status =
vdp_device_create_x11(XlibDisplay, DefaultScreen(XlibDisplay),
&VdpauDevice, &VdpauGetProcAddress);
if (status != VDP_STATUS_OK) {
VdpauPreemption = 1;
return -1;
}
Fix buf: VDPAU looses preemption callback.
2012-04-12 15:38:22 +02:00
// VDPAU seems to loose the callback during preemption
status =
VdpauPreemptionCallbackRegister(VdpauDevice, VdpauPreemptionCallback,
NULL);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't register preemption callback: %s\n"),
VdpauGetErrorString(status));
}
VdpauPreemption = 0;
Debug(3, "video/vdpau: display preemption recovery\n");
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauInitOutputQueue();
// mixer
for (i = 0; i < VdpauDecoderN; ++i) {
VdpauDecoders[i]->VideoDecoder = VDP_INVALID_HANDLE;
VdpauDecoders[i]->VideoMixer = VDP_INVALID_HANDLE;
VdpauDecoders[i]->SurfaceFreeN = 0;
VdpauDecoders[i]->SurfaceUsedN = 0;
}
// FIXME: codec has still some surfaces used
//
// invalid osd bitmap/output surfaces
//
for (i = 0; i < 1; ++i) {
#ifdef USE_BITMAP
VdpauOsdBitmapSurface[i] = VDP_INVALID_HANDLE;
#else
VdpauOsdOutputSurface[i] = VDP_INVALID_HANDLE;
#endif
Fix buf: VDPAU looses preemption callback.
2012-04-12 15:38:22 +02:00
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauOsdInit(OsdWidth, OsdHeight);
return 1;
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
///
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
/// Set VDPAU background color.
///
/// @param rgba 32 bit RGBA color.
///
static void VdpauSetBackground( __attribute__ ((unused)) uint32_t rgba)
{
}
///
/// Set VDPAU video mode.
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
///
static void VdpauSetVideoMode(void)
{
int i;
VdpauExitOutputQueue();
VdpauInitOutputQueue();
for (i = 0; i < VdpauDecoderN; ++i) {
VdpauUpdateOutput(VdpauDecoders[i]);
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_VIDEO_THREAD
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Handle a VDPAU display.
///
/// @todo FIXME: only a single decoder supported.
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
static void VdpauDisplayHandlerThread(void)
{
int err;
int filled;
struct timespec nowtime;
VdpauDecoder *decoder;
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
if (!(decoder = VdpauDecoders[0])) { // no stream available
Fix buf: VDPAU looses preemption callback.
2012-04-12 15:38:22 +02:00
usleep(15 * 1000);
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
return;
}
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
if (VdpauPreemption) { // display preempted
if (VdpauPreemptionRecover()) {
usleep(15 * 1000);
return;
}
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//
// fill frame output ring buffer
//
filled = atomic_read(&decoder->SurfacesFilled);
if (filled < VIDEO_SURFACES_MAX) {
// FIXME: hot polling
pthread_mutex_lock(&VideoLockMutex);
// fetch+decode or reopen
Poll input buffers, if display buffers are full.
2012-05-13 18:33:24 +02:00
err = VideoDecodeInput();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
pthread_mutex_unlock(&VideoLockMutex);
Poll input buffers, if display buffers are full.
2012-05-13 18:33:24 +02:00
} else {
err = VideoPollInput();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
if (err) {
// FIXME: sleep on wakeup
usleep(5 * 1000); // nothing buffered
New audio filters next part.
2012-04-19 00:47:34 +02:00
if (err == -1 && decoder->Closing) {
decoder->Closing--;
if (!decoder->Closing) {
Debug(3, "video/vdpau: closing eof\n");
decoder->Closing = -1;
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
clock_gettime(CLOCK_REALTIME, &nowtime);
// time for one frame over?
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
if ( //filled<VIDEO_SURFACES_MAX &&
(nowtime.tv_sec - decoder->FrameTime.tv_sec)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
* 1000 * 1000 * 1000 + (nowtime.tv_nsec - decoder->FrameTime.tv_nsec) <
15 * 1000 * 1000) {
return;
}
pthread_mutex_lock(&VideoLockMutex);
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VdpauSyncDisplayFrame();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
pthread_mutex_unlock(&VideoLockMutex);
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
#else
#define VdpauDisplayHandlerThread NULL
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set video output position.
///
/// @param decoder VDPAU hw decoder
/// @param x video output x coordinate inside the window
/// @param y video output y coordinate inside the window
/// @param width video output width
/// @param height video output height
///
/// @note FIXME: need to know which stream.
///
static void VdpauSetOutputPosition(VdpauDecoder * decoder, int x, int y,
int width, int height)
{
decoder->OutputX = x;
decoder->OutputY = y;
decoder->OutputWidth = width;
decoder->OutputHeight = height;
// next video pictures are automatic rendered to correct position
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
//----------------------------------------------------------------------------
// VDPAU OSD
//----------------------------------------------------------------------------
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, ...
2012-01-18 15:15:37 +01:00
static const uint8_t OsdZeros[1920 * 1080 * 4]; ///< 0 for clear osd
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Clear subpicture image.
///
/// @note looked by caller
///
static void VdpauOsdClear(void)
{
VdpStatus status;
void const *data[1];
uint32_t pitches[1];
VdpRect dst_rect;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
if (VdpauPreemption) { // display preempted
return;
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
// osd image available?
#ifdef USE_BITMAP
if (VdpauOsdBitmapSurface[VdpauOsdSurfaceIndex] == VDP_INVALID_HANDLE) {
return;
}
#else
if (VdpauOsdOutputSurface[VdpauOsdSurfaceIndex] == VDP_INVALID_HANDLE) {
return;
}
#endif
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, ...
2012-01-18 15:15:37 +01:00
if (OsdWidth * OsdHeight > 1920 * 1080) {
Error(_("video/vdpau: osd too big: unsupported\n"));
return;
}
// have dirty area.
if (OsdDirtyWidth && OsdDirtyHeight) {
Debug(3, "video/vdpau: osd clear dirty %dx%d+%d+%d\n", OsdDirtyWidth,
OsdDirtyHeight, OsdDirtyX, OsdDirtyY);
dst_rect.x0 = OsdDirtyX;
dst_rect.y0 = OsdDirtyY;
dst_rect.x1 = dst_rect.x0 + OsdDirtyWidth;
dst_rect.y1 = dst_rect.y0 + OsdDirtyHeight;
} else {
Debug(3, "video/vdpau: osd clear image\n");
dst_rect.x0 = 0;
dst_rect.y0 = 0;
dst_rect.x1 = dst_rect.x0 + OsdWidth;
dst_rect.y1 = dst_rect.y0 + OsdHeight;
}
data[0] = OsdZeros;
pitches[0] = OsdWidth * 4;
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
#ifdef USE_BITMAP
status =
VdpauBitmapSurfacePutBitsNative(VdpauOsdBitmapSurface
[VdpauOsdSurfaceIndex], data, pitches, &dst_rect);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: bitmap surface put bits failed: %s\n"),
VdpauGetErrorString(status));
}
#else
status =
VdpauOutputSurfacePutBitsNative(VdpauOsdOutputSurface
[VdpauOsdSurfaceIndex], data, pitches, &dst_rect);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: output surface put bits failed: %s\n"),
VdpauGetErrorString(status));
}
#endif
}
///
/// Upload ARGB to subpicture image.
///
/// @param x x position of image in osd
/// @param y y position of image in osd
/// @param width width of image
/// @param height height of image
/// @param argb argb image
///
/// @note looked by caller
///
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
static void VdpauOsdDrawARGB(int x, int y, int width, int height,
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
const uint8_t * argb)
{
VdpStatus status;
void const *data[1];
uint32_t pitches[1];
VdpRect dst_rect;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
uint32_t start;
uint32_t end;
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
if (VdpauPreemption) { // display preempted
return;
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
// osd image available?
#ifdef USE_BITMAP
if (VdpauOsdBitmapSurface[VdpauOsdSurfaceIndex] == VDP_INVALID_HANDLE) {
return;
}
#else
if (VdpauOsdOutputSurface[VdpauOsdSurfaceIndex] == VDP_INVALID_HANDLE) {
return;
}
#endif
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
start = GetMsTicks();
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
dst_rect.x0 = x;
dst_rect.y0 = y;
dst_rect.x1 = dst_rect.x0 + width;
dst_rect.y1 = dst_rect.y0 + height;
data[0] = argb;
pitches[0] = width * 4;
#ifdef USE_BITMAP
status =
VdpauBitmapSurfacePutBitsNative(VdpauOsdBitmapSurface
[VdpauOsdSurfaceIndex], data, pitches, &dst_rect);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: bitmap surface put bits failed: %s\n"),
VdpauGetErrorString(status));
}
#else
status =
VdpauOutputSurfacePutBitsNative(VdpauOsdOutputSurface
[VdpauOsdSurfaceIndex], data, pitches, &dst_rect);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: output surface put bits failed: %s\n"),
VdpauGetErrorString(status));
}
#endif
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
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, ...
2012-01-18 15:15:37 +01:00
end = GetMsTicks();
Cleanups.
2012-03-12 17:58:19 +01:00
Debug(3, "video/vdpau: osd upload %dx%d+%d+%d %dms %d\n", width, height, x,
y, end - start, width * height * 4);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
}
///
/// VDPAU initialize OSD.
///
/// @param width osd width
/// @param height osd height
///
static void VdpauOsdInit(int width, int height)
{
int i;
VdpStatus status;
if (!VdpauDevice) {
Debug(3, "video/vdpau: vdpau not setup\n");
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
return;
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
}
//
// create bitmap/surface for osd
//
#ifdef USE_BITMAP
if (VdpauOsdBitmapSurface[0] == VDP_INVALID_HANDLE) {
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, ...
2012-01-18 15:15:37 +01:00
for (i = 0; i < 1; ++i) {
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
status =
VdpauBitmapSurfaceCreate(VdpauDevice, VDP_RGBA_FORMAT_B8G8R8A8,
width, height, VDP_TRUE, VdpauOsdBitmapSurface + i);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create bitmap surface: %s\n"),
VdpauGetErrorString(status));
}
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Debug(4,
"video/vdpau: created bitmap surface %dx%d with id 0x%08x\n",
width, height, VdpauOsdBitmapSurface[i]);
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
}
}
#else
if (VdpauOsdOutputSurface[0] == VDP_INVALID_HANDLE) {
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, ...
2012-01-18 15:15:37 +01:00
for (i = 0; i < 1; ++i) {
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
status =
VdpauOutputSurfaceCreate(VdpauDevice, VDP_RGBA_FORMAT_B8G8R8A8,
width, height, VdpauOsdOutputSurface + i);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create output surface: %s\n"),
VdpauGetErrorString(status));
}
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
Debug(4,
"video/vdpau: created osd output surface %dx%d with id 0x%08x\n",
width, height, VdpauOsdOutputSurface[i]);
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
}
}
#endif
Debug(3, "video/vdpau: osd surfaces created\n");
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Cleanup osd.
///
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
static void VdpauOsdExit(void)
{
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, ...
2012-01-18 15:15:37 +01:00
int i;
//
// destroy osd bitmap/output surfaces
//
#ifdef USE_BITMAP
for (i = 0; i < 1; ++i) {
VdpStatus status;
if (VdpauOsdBitmapSurface[i] != VDP_INVALID_HANDLE) {
status = VdpauBitmapSurfaceDestroy(VdpauOsdBitmapSurface[i]);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy bitmap surface: %s\n"),
VdpauGetErrorString(status));
}
VdpauOsdBitmapSurface[i] = VDP_INVALID_HANDLE;
}
}
#else
for (i = 0; i < 1; ++i) {
VdpStatus status;
if (VdpauOsdOutputSurface[i] != VDP_INVALID_HANDLE) {
status = VdpauOutputSurfaceDestroy(VdpauOsdOutputSurface[i]);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't destroy output surface: %s\n"),
VdpauGetErrorString(status));
}
VdpauOsdOutputSurface[i] = VDP_INVALID_HANDLE;
}
}
#endif
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
}
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
/// VDPAU module.
///
static const VideoModule VdpauModule = {
.Name = "vdpau",
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.Enabled = 1,
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
.NewHwDecoder = (VideoHwDecoder * (*const)(void))VdpauNewHwDecoder,
.DelHwDecoder = (void (*const) (VideoHwDecoder *))VdpauDelHwDecoder,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.GetSurface = (unsigned (*const) (VideoHwDecoder *))VdpauGetSurface,
.ReleaseSurface =
(void (*const) (VideoHwDecoder *, unsigned))VdpauReleaseSurface,
.get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
AVCodecContext *, const enum PixelFormat *))Vdpau_get_format,
.RenderFrame = (void (*const) (VideoHwDecoder *,
const AVCodecContext *, const AVFrame *))VdpauSyncRenderFrame,
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
.SetClock = (void (*const) (VideoHwDecoder *, int64_t))VdpauSetClock,
.GetClock = (int64_t(*const) (const VideoHwDecoder *))VdpauGetClock,
.SetTrickSpeed =
(void (*const) (const VideoHwDecoder *, int))VdpauSetTrickSpeed,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.GrabOutput = VdpauGrabOutputSurface,
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
.SetBackground = VdpauSetBackground,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
.SetVideoMode = VdpauSetVideoMode,
.ResetAutoCrop = VdpauResetAutoCrop,
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
.DisplayHandlerThread = VdpauDisplayHandlerThread,
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
.OsdClear = VdpauOsdClear,
.OsdDrawARGB = VdpauOsdDrawARGB,
.OsdInit = VdpauOsdInit,
.OsdExit = VdpauOsdExit,
.Init = VdpauInit,
.Exit = VdpauExit,
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
};
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#endif
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
//----------------------------------------------------------------------------
// NOOP
//----------------------------------------------------------------------------
///
/// Allocate new noop decoder.
///
/// @returns always NULL.
///
static VideoHwDecoder *NoopNewHwDecoder(void)
{
return NULL;
}
///
/// Release a surface.
///
/// Can be called while exit.
///
/// @param decoder noop hw decoder
/// @param surface surface no longer used
///
static void NoopReleaseSurface(
__attribute__ ((unused)) VideoHwDecoder * decoder, __attribute__ ((unused))
unsigned surface)
{
}
///
/// Set noop background color.
///
/// @param rgba 32 bit RGBA color.
///
static void NoopSetBackground( __attribute__ ((unused)) uint32_t rgba)
{
}
///
/// Noop initialize OSD.
///
/// @param width osd width
/// @param height osd height
///
static void NoopOsdInit( __attribute__ ((unused))
int width, __attribute__ ((unused))
int height)
{
}
///
/// Draw OSD ARGB image.
///
/// @param x x position of image in osd
/// @param y y position of image in osd
/// @param width width of image
/// @param height height of image
/// @param argb argb image
///
/// @note looked by caller
///
static void NoopOsdDrawARGB( __attribute__ ((unused))
int x, __attribute__ ((unused))
int y, __attribute__ ((unused))
int width, __attribute__ ((unused))
int height, __attribute__ ((unused))
const uint8_t * argb)
{
}
///
/// Noop setup.
///
/// @param display_name x11/xcb display name
///
/// @returns always true.
///
static int NoopInit(const char *display_name)
{
Info("video/noop: noop driver running on display '%s'\n", display_name);
return 1;
}
#ifdef USE_VIDEO_THREAD
///
/// Handle a noop display.
///
static void NoopDisplayHandlerThread(void)
{
// avoid 100% cpu use
usleep(20 * 1000);
#if 0
// this can't be canceled
if (XlibDisplay) {
XEvent event;
XPeekEvent(XlibDisplay, &event);
}
#endif
}
#else
#define NoopDisplayHandlerThread NULL
#endif
///
/// Noop void function.
///
static void NoopVoid(void)
{
}
///
/// Noop video module.
///
static const VideoModule NoopModule = {
.Name = "noop",
.Enabled = 1,
.NewHwDecoder = NoopNewHwDecoder,
#if 0
// can't be called:
.DelHwDecoder = NoopDelHwDecoder,
.GetSurface = (unsigned (*const) (VideoHwDecoder *))NoopGetSurface,
#endif
.ReleaseSurface = NoopReleaseSurface,
#if 0
.get_format = (enum PixelFormat(*const) (VideoHwDecoder *,
AVCodecContext *, const enum PixelFormat *))Noop_get_format,
.RenderFrame = (void (*const) (VideoHwDecoder *,
const AVCodecContext *, const AVFrame *))NoopSyncRenderFrame,
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
.SetClock = (void (*const) (VideoHwDecoder *, int64_t))NoopSetClock,
.GetClock = (int64_t(*const) (const VideoHwDecoder *))NoopGetClock,
.SetTrickSpeed =
(void (*const) (const VideoHwDecoder *, int))NoopSetTrickSpeed,
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
.GrabOutput = NoopGrabOutputSurface,
#endif
.SetBackground = NoopSetBackground,
.SetVideoMode = NoopVoid,
.ResetAutoCrop = NoopVoid,
.DisplayHandlerThread = NoopDisplayHandlerThread,
.OsdClear = NoopVoid,
.OsdDrawARGB = NoopOsdDrawARGB,
.OsdInit = NoopOsdInit,
.OsdExit = NoopVoid,
.Init = NoopInit,
.Exit = NoopVoid,
};
Initial vdpau support.
2011-12-21 12:50:14 +01:00
//----------------------------------------------------------------------------
// OSD
//----------------------------------------------------------------------------
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Clear the OSD.
///
/// @todo I use glTexImage2D to clear the texture, are there faster and
/// better ways to clear a texture?
///
Initial vdpau support.
2011-12-21 12:50:14 +01:00
void VideoOsdClear(void)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_GLX
if (GlxEnabled) {
void *texbuf;
texbuf = calloc(OsdWidth * OsdHeight, 4);
glEnable(GL_TEXTURE_2D); // 2d texture
glBindTexture(GL_TEXTURE_2D, OsdGlTextures[OsdIndex]);
// upload no image data, clears texture (on some drivers only)
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, OsdWidth, OsdHeight, 0,
GL_BGRA, GL_UNSIGNED_BYTE, texbuf);
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
GlxCheck();
free(texbuf);
}
#endif
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->OsdClear();
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
OsdDirtyX = OsdWidth;
OsdDirtyY = OsdHeight;
OsdDirtyWidth = 0;
OsdDirtyHeight = 0;
OsdShown = 0;
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadUnlock();
Initial vdpau support.
2011-12-21 12:50:14 +01:00
}
Initial vdpau osd support.
2011-12-22 21:25:38 +01:00
///
/// Draw an OSD ARGB image.
///
/// @param x x position of image in osd
/// @param y y position of image in osd
/// @param width width of image
/// @param height height of image
/// @param argb argb image
///
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, ...
2012-01-18 15:15:37 +01:00
void VideoOsdDrawARGB(int x, int y, int width, int height,
Initial vdpau support.
2011-12-21 12:50:14 +01:00
const uint8_t * argb)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
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, ...
2012-01-18 15:15:37 +01:00
// update dirty area
if (x < OsdDirtyX) {
if (OsdDirtyWidth) {
OsdDirtyWidth += OsdDirtyX - x;
}
OsdDirtyX = x;
}
if (y < OsdDirtyY) {
if (OsdDirtyHeight) {
OsdDirtyHeight += OsdDirtyY - y;
}
OsdDirtyY = y;
}
if (x + width > OsdDirtyX + OsdDirtyWidth) {
OsdDirtyWidth = x + width - OsdDirtyX;
}
if (y + height > OsdDirtyY + OsdDirtyHeight) {
OsdDirtyHeight = y + height - OsdDirtyY;
}
Fix message, if no hq scaling is supported.
2012-02-16 09:58:13 +01:00
Debug(4, "video: osd dirty %dx%d+%d+%d -> %dx%d+%d+%d\n", width, height, x,
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, ...
2012-01-18 15:15:37 +01:00
y, OsdDirtyWidth, OsdDirtyHeight, OsdDirtyX, OsdDirtyY);
Initial vdpau support.
2011-12-21 12:50:14 +01:00
#ifdef USE_GLX
if (GlxEnabled) {
Debug(3, "video: %p <-> %p\n", glXGetCurrentContext(), GlxContext);
GlxUploadTexture(x, y, height, width, argb);
VideoThreadUnlock();
return;
}
#endif
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->OsdDrawARGB(x, y, width, height, argb);
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
OsdShown = 1;
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadUnlock();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
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, ...
2012-01-18 15:15:37 +01:00
///
/// Get OSD size.
///
Makes OSD size configurable.
2012-05-21 15:34:33 +02:00
/// @param[out] width OSD width
/// @param[out] height OSD height
///
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, ...
2012-01-18 15:15:37 +01:00
void VideoGetOsdSize(int *width, int *height)
{
*width = 1920;
*height = 1080; // unknown default
if (OsdWidth && OsdHeight) {
*width = OsdWidth;
*height = OsdHeight;
}
}
Makes OSD size configurable.
2012-05-21 15:34:33 +02:00
/// Set OSD Size.
///
/// @param width OSD width
/// @param height OSD height
///
void VideoSetOsdSize(int width, int height)
{
if (OsdConfigWidth != width || OsdConfigHeight != height) {
VideoOsdExit();
OsdConfigWidth = width;
OsdConfigHeight = height;
VideoOsdInit();
}
}
Add support to change OSD for 3d SBS/TB streams.
2012-10-30 16:50:31 +01:00
///
/// Set the 3d OSD mode.
///
/// @pram mode OSD mode (0=off, 1=SBS, 2=Top Bottom)
///
void VideoSetOsd3DMode(int mode)
{
Osd3DMode = mode;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Setup osd.
///
/// FIXME: looking for BGRA, but this fourcc isn't supported by the
/// drawing functions yet.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoOsdInit(void)
{
Makes OSD size configurable.
2012-05-21 15:34:33 +02:00
if (OsdConfigWidth && OsdConfigHeight) {
OsdWidth = OsdConfigWidth;
OsdHeight = OsdConfigHeight;
} else {
OsdWidth = VideoWindowWidth;
OsdHeight = VideoWindowHeight;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
#ifdef USE_GLX
// FIXME: make an extra function for this
if (GlxEnabled) {
int i;
Debug(3, "video/glx: %p <-> %p\n", glXGetCurrentContext(), GlxContext);
//
// create a RGBA texture.
//
glEnable(GL_TEXTURE_2D); // create 2d texture(s)
glGenTextures(2, OsdGlTextures);
for (i = 0; i < 2; ++i) {
glBindTexture(GL_TEXTURE_2D, OsdGlTextures[i]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE);
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, OsdWidth, OsdHeight, 0,
GL_BGRA, GL_UNSIGNED_BYTE, NULL);
}
glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D);
return;
}
#endif
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
VideoUsedModule->OsdInit(OsdWidth, OsdHeight);
VideoThreadUnlock();
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
VideoOsdClear();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Cleanup OSD.
///
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
void VideoOsdExit(void)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
VideoUsedModule->OsdExit();
VideoThreadUnlock();
Auto-crop improvement and nicer a-v sync display.
2012-02-02 16:01:38 +01:00
OsdDirtyWidth = 0;
OsdDirtyHeight = 0;
Add missing VdpauDecoderDestroy.
2011-12-29 00:55:57 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
#if 0
//----------------------------------------------------------------------------
// Overlay
//----------------------------------------------------------------------------
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Render osd surface.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoRenderOverlay(void)
{
#ifdef USE_GLX
if (GlxEnabled) {
GlxRender(OsdWidth, OsdHeight);
} else
#endif
{
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Display overlay surface.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoDisplayOverlay(void)
{
#ifdef USE_GLX
if (GlxEnabled) {
int osd_x1;
int osd_y1;
osd_x1 = 0;
osd_y1 = 0;
#ifdef noDEBUG
osd_x1 = 100;
osd_y1 = 100;
#endif
GlxRenderTexture(OsdGlTextures[OsdIndex], osd_x1, osd_y1,
VideoWindowWidth, VideoWindowHeight);
return;
}
#endif
#ifdef USE_VAAPI
{
void *image_buffer;
static int counter;
// upload needs long time
if (counter == 5) {
//return;
}
// osd image available?
if (VaOsdImage.image_id == VA_INVALID_ID) {
return;
}
// FIXME: this version hangups
//return;
// map osd surface/image into memory.
if (vaMapBuffer(VaDisplay, VaOsdImage.buf,
&image_buffer) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't map osd image buffer\n"));
return;
}
// 100% transparent
memset(image_buffer, 0x80 | counter++, VaOsdImage.data_size);
// convert internal osd to VA-API image
//GfxConvert(image_buffer, VaOsdImage.offsets[0], VaOsdImage.pitches[0]);
if (vaUnmapBuffer(VaDisplay, VaOsdImage.buf) != VA_STATUS_SUCCESS) {
Error(_("video/vaapi: can't unmap osd image buffer\n"));
}
}
#endif
}
#endif
//----------------------------------------------------------------------------
// Events
//----------------------------------------------------------------------------
/// C callback feed key press
extern void FeedKeyPress(const char *, const char *, int, int);
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
///
/// Handle XLib I/O Errors.
///
/// @param display display with i/o error
///
static int VideoIOErrorHandler( __attribute__ ((unused)) Display * display)
{
Error(_("video: fatal i/o error\n"));
// should be called from VideoThread
if (VideoThread && VideoThread == pthread_self()) {
Debug(3, "video: called from video thread\n");
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule = &NoopModule;
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
XlibDisplay = NULL;
VideoWindow = XCB_NONE;
#ifdef USE_VIDEO_THREAD
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_cond_destroy(&VideoWakeupCond);
pthread_mutex_destroy(&VideoLockMutex);
pthread_mutex_destroy(&VideoMutex);
VideoThread = 0;
pthread_exit("video thread exit");
#endif
}
do {
sleep(1000);
} while (1); // let other threads running
return -1;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Handle X11 events.
///
/// @todo Signal WmDeleteMessage to application.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VideoEvent(void)
{
XEvent event;
KeySym keysym;
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
char buf[32];
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
uint32_t values[1];
C part of the plugin.
2011-12-07 15:05:38 +01:00
XNextEvent(XlibDisplay, &event);
switch (event.type) {
case ClientMessage:
Debug(3, "video/event: ClientMessage\n");
if (event.xclient.data.l[0] == (long)WmDeleteWindowAtom) {
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
Debug(3, "video/event: wm-delete-message\n");
FeedKeyPress("XKeySym", "Close", 0, 0);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
break;
case MapNotify:
Debug(3, "video/event: MapNotify\n");
Release Version 0.4.0.
2012-01-21 15:56:45 +01:00
// <20>wm workaround
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
xcb_change_window_attributes(Connection, VideoWindow,
XCB_CW_CURSOR, &VideoBlankCursor);
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
VideoBlankTick = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
break;
case Expose:
Release Version 0.4.0.
2012-01-21 15:56:45 +01:00
//Debug(3, "video/event: Expose\n");
C part of the plugin.
2011-12-07 15:05:38 +01:00
break;
case ReparentNotify:
Debug(3, "video/event: ReparentNotify\n");
break;
case ConfigureNotify:
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
//Debug(3, "video/event: ConfigureNotify\n");
VideoSetVideoMode(event.xconfigure.x, event.xconfigure.y,
event.xconfigure.width, event.xconfigure.height);
C part of the plugin.
2011-12-07 15:05:38 +01:00
break;
Add support for fullscreen mode.
2012-01-13 16:31:29 +01:00
case ButtonPress:
VideoSetFullscreen(-1);
break;
C part of the plugin.
2011-12-07 15:05:38 +01:00
case KeyPress:
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
XLookupString(&event.xkey, buf, sizeof(buf), &keysym, NULL);
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (keysym == NoSymbol) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Warning(_("video/event: No symbol for %d\n"),
event.xkey.keycode);
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
break;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
FeedKeyPress("XKeySym", XKeysymToString(keysym), 0, 0);
Fix bug #876: Keypad not working.
2012-02-10 10:43:31 +01:00
break;
C part of the plugin.
2011-12-07 15:05:38 +01:00
case KeyRelease:
break;
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
case MotionNotify:
values[0] = XCB_NONE;
xcb_change_window_attributes(Connection, VideoWindow,
XCB_CW_CURSOR, values);
VideoBlankTick = GetMsTicks();
break;
C part of the plugin.
2011-12-07 15:05:38 +01:00
default:
#if 0
if (XShmGetEventBase(XlibDisplay) + ShmCompletion == event.type) {
// printf("ShmCompletion\n");
}
#endif
Debug(3, "Unsupported event type %d\n", event.type);
break;
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Poll all x11 events.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoPollEvent(void)
{
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
// hide cursor, after xx ms
if (VideoBlankTick && VideoWindow != XCB_NONE
&& VideoBlankTick + 200 < GetMsTicks()) {
xcb_change_window_attributes(Connection, VideoWindow, XCB_CW_CURSOR,
&VideoBlankCursor);
VideoBlankTick = 0;
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
while (XlibDisplay && XPending(XlibDisplay)) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
VideoEvent();
}
}
//----------------------------------------------------------------------------
// Thread
//----------------------------------------------------------------------------
#ifdef USE_VIDEO_THREAD
#ifdef USE_GLX
static GLXContext GlxThreadContext; ///< our gl context for the thread
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Lock video thread.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VideoThreadLock(void)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
if (VideoThread) {
if (pthread_mutex_lock(&VideoLockMutex)) {
Error(_("video: can't lock thread\n"));
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Unlock video thread.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VideoThreadUnlock(void)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
if (VideoThread) {
if (pthread_mutex_unlock(&VideoLockMutex)) {
Error(_("video: can't unlock thread\n"));
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Video render thread.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void *VideoDisplayHandlerThread(void *dummy)
{
Debug(3, "video: display thread started\n");
#ifdef USE_GLX
if (GlxEnabled) {
Debug(3, "video: %p <-> %p\n", glXGetCurrentContext(),
GlxThreadContext);
GlxThreadContext =
glXCreateContext(XlibDisplay, GlxVisualInfo, GlxContext, GL_TRUE);
if (!GlxThreadContext) {
Error(_("video/glx: can't create glx context\n"));
return NULL;
}
// set glx context
if (!glXMakeCurrent(XlibDisplay, VideoWindow, GlxThreadContext)) {
GlxCheck();
Error(_("video/glx: can't make glx context current\n"));
return NULL;
}
}
#endif
for (;;) {
Fix dead-lock in VdpauExit.
2012-01-24 10:02:39 +01:00
// fix dead-lock with VdpauExit
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
Workaround for dead-lock in VdpauExit.
2012-01-24 00:32:07 +01:00
C part of the plugin.
2011-12-07 15:05:38 +01:00
VideoPollEvent();
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->DisplayHandlerThread();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
return dummy;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Initialize video threads.
///
static void VideoThreadInit(void)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
pthread_mutex_init(&VideoMutex, NULL);
pthread_mutex_init(&VideoLockMutex, NULL);
pthread_cond_init(&VideoWakeupCond, NULL);
pthread_create(&VideoThread, NULL, VideoDisplayHandlerThread, NULL);
pthread_setname_np(VideoThread, "softhddev video");
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Exit and cleanup video threads.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VideoThreadExit(void)
{
if (VideoThread) {
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
void *retval;
Debug(3, "video: video thread canceled\n");
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
//VideoThreadLock();
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
// FIXME: can't cancel locked
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (pthread_cancel(VideoThread)) {
Video enhancements. Pass PTS to video codec. Flush audio buffer on channel change. Sync audio + video stream. Add workaround for Intel VA-API driver that forgets OSD position/size.
2011-12-10 00:15:38 +01:00
Error(_("video: can't queue cancel video display thread\n"));
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video cleanup. More functions uses new module interface. Fix bug: VaapiOsdExit doesn't deassociate osd surface. Fix bug: First OSD can show random pixels.
2012-01-24 22:25:33 +01:00
//VideoThreadUnlock();
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (pthread_join(VideoThread, &retval) || retval != PTHREAD_CANCELED) {
Error(_("video: can't cancel video display thread\n"));
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThread = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
pthread_cond_destroy(&VideoWakeupCond);
pthread_mutex_destroy(&VideoLockMutex);
pthread_mutex_destroy(&VideoMutex);
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Video display wakeup.
///
/// New video arrived, wakeup video thread.
///
void VideoDisplayWakeup(void)
{
if (!XlibDisplay) { // not yet started
return;
}
if (!VideoThread) { // start video thread, if needed
VideoThreadInit();
}
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
//----------------------------------------------------------------------------
// Video API
//----------------------------------------------------------------------------
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
//----------------------------------------------------------------------------
///
/// Table of all audio modules.
///
static const VideoModule *VideoModules[] = {
#ifdef USE_VDPAU
&VdpauModule,
#endif
#ifdef USE_VAAPI
&VaapiModule,
#endif
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
&NoopModule
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
};
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
/// Video hardware decoder
///
struct _video_hw_decoder_
{
union
{
#ifdef USE_VAAPI
VaapiDecoder Vaapi; ///< VA-API decoder structure
#endif
#ifdef USE_VDPAU
VdpauDecoder Vdpau; ///< vdpau decoder structure
#endif
};
};
///
/// Allocate new video hw decoder.
///
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
/// @returns a new initialized video hardware decoder.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
VideoHwDecoder *VideoNewHwDecoder(void)
{
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
return VideoUsedModule->NewHwDecoder();
}
///
/// Destroy a video hw decoder.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
void VideoDelHwDecoder(VideoHwDecoder * hw_decoder)
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
if (hw_decoder) {
VideoUsedModule->DelHwDecoder(hw_decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
}
///
/// Get a free hardware decoder surface.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
/// @returns the oldest free surface or invalid surface
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
unsigned VideoGetSurface(VideoHwDecoder * hw_decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
return VideoUsedModule->GetSurface(hw_decoder);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Release a hardware decoder surface.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
/// @param surface surface no longer used
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
void VideoReleaseSurface(VideoHwDecoder * hw_decoder, unsigned surface)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
// FIXME: must be guarded against calls, after VideoExit
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VideoUsedModule->ReleaseSurface(hw_decoder, surface);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Callback to negotiate the PixelFormat.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
/// @param fmt is the list of formats which are supported by
/// the codec, it is terminated by -1 as 0 is a
/// valid format, the formats are ordered by
/// quality.
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
enum PixelFormat Video_get_format(VideoHwDecoder * hw_decoder,
C part of the plugin.
2011-12-07 15:05:38 +01:00
AVCodecContext * video_ctx, const enum PixelFormat *fmt)
{
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#ifdef DEBUG
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
int ms_delay;
// FIXME: use frame time
ms_delay = (1000 * video_ctx->time_base.num * video_ctx->ticks_per_frame)
/ video_ctx->time_base.den;
Debug(3, "video: ready %s %dms/frame\n",
Timestamp2String(VideoGetClock(hw_decoder)), ms_delay);
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
#endif
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
return VideoUsedModule->get_format(hw_decoder, video_ctx, fmt);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Initial vdpau support.
2011-12-21 12:50:14 +01:00
///
/// Display a ffmpeg frame
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
Initial vdpau support.
2011-12-21 12:50:14 +01:00
/// @param video_ctx ffmpeg video codec context
/// @param frame frame to display
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
void VideoRenderFrame(VideoHwDecoder * hw_decoder,
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
const AVCodecContext * video_ctx, const AVFrame * frame)
Initial vdpau support.
2011-12-21 12:50:14 +01:00
{
Fix bug: didn't compile without vdpau support.
2012-09-11 00:24:27 +02:00
#if 0
fprintf(stderr, "video: render frame pts %s closing %d\n",
Timestamp2String(frame->pkt_pts), hw_decoder->Vdpau.Closing);
#endif
Add posibility to disable repeat pict warning.
2012-02-16 21:55:14 +01:00
if (frame->repeat_pict && !VideoIgnoreRepeatPict) {
Warning(_("video: repeated pict %d found, but not handled\n"),
frame->repeat_pict);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
VideoUsedModule->RenderFrame(hw_decoder, video_ctx, frame);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
///
/// Get VA-API ffmpeg context
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder (must be VA-API)
C part of the plugin.
2011-12-07 15:05:38 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
struct vaapi_context *VideoGetVaapiContext(VideoHwDecoder * hw_decoder)
C part of the plugin.
2011-12-07 15:05:38 +01:00
{
#ifdef USE_VAAPI
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
if (VideoUsedModule == &VaapiModule) {
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
return hw_decoder->Vaapi.VaapiContext;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
#endif
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
(void)hw_decoder;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Error(_("video/vaapi: get vaapi context, without vaapi enabled\n"));
return NULL;
}
Remove warning, when building without vdpau.
2011-12-30 21:50:58 +01:00
#ifdef USE_VDPAU
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
/// Draw ffmpeg vdpau render state.
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
/// @param vrs vdpau render state
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
///
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
void VideoDrawRenderState(VideoHwDecoder * hw_decoder,
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
struct vdpau_render_state *vrs)
{
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
if (VideoUsedModule == &VdpauModule) {
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
VdpStatus status;
Show time used for VdpDecoderRender.
2011-12-25 11:50:17 +01:00
uint32_t start;
uint32_t end;
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauDecoder *decoder;
decoder = &hw_decoder->Vdpau;
if (decoder->VideoDecoder == VDP_INVALID_HANDLE) {
Debug(3, "video/vdpau: recover preemption\n");
status =
VdpauDecoderCreate(VdpauDevice, decoder->Profile,
decoder->InputWidth, decoder->InputHeight,
decoder->SurfacesNeeded - VIDEO_SURFACES_MAX,
&decoder->VideoDecoder);
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: can't create decoder: %s\n"),
VdpauGetErrorString(status));
}
VdpauSetupOutput(decoder);
return;
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
Debug(4, "video/vdpau: decoder render to %#010x\n", vrs->surface);
Show time used for VdpDecoderRender.
2011-12-25 11:50:17 +01:00
start = GetMsTicks();
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
status =
Add VDPAU display preemption support.
2012-01-25 15:31:49 +01:00
VdpauDecoderRender(decoder->VideoDecoder, vrs->surface,
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
(VdpPictureInfo const *)&vrs->info, vrs->bitstream_buffers_used,
vrs->bitstream_buffers);
Show time used for VdpDecoderRender.
2011-12-25 11:50:17 +01:00
end = GetMsTicks();
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
if (status != VDP_STATUS_OK) {
Error(_("video/vdpau: decoder rendering failed: %s\n"),
VdpauGetErrorString(status));
}
Fix bug: swapped end and start.
2011-12-25 17:23:29 +01:00
if (end - start > 35) {
Remove warnings, reduce debug informations.
2012-01-04 16:58:35 +01:00
// report this
Add PTS to render too slow message.
2012-08-29 17:00:36 +02:00
Info(_("video/vdpau: %s: decoder render too slow %ums\n"),
Timestamp2String(decoder->PTS), end - start);
Show time used for VdpDecoderRender.
2011-12-25 11:50:17 +01:00
}
Initial vdpau hw decoder support.
2011-12-23 19:33:30 +01:00
return;
}
Error(_("video/vdpau: draw render state, without vdpau enabled\n"));
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// Set video clock.
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
/// @param hw_decoder video hardware decoder
/// @param pts audio presentation timestamp
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
void VideoSetClock(VideoHwDecoder * hw_decoder, int64_t pts)
Initial support of replay.
2011-12-14 18:01:03 +01:00
{
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Debug(3, "video: set clock %s\n", Timestamp2String(pts));
if (hw_decoder) {
VideoUsedModule->SetClock(hw_decoder, pts);
Initial support of replay.
2011-12-14 18:01:03 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
}
///
/// Get video clock.
///
/// @param hw_decoder video hardware decoder
///
/// @note this isn't monoton, decoding reorders frames, setter keeps it
/// monotonic
///
int64_t VideoGetClock(const VideoHwDecoder * hw_decoder)
{
if (hw_decoder) {
return VideoUsedModule->GetClock(hw_decoder);
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
return AV_NOPTS_VALUE;
Initial support of replay.
2011-12-14 18:01:03 +01:00
}
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
///
/// Set closing stream flag.
///
/// @param hw_decoder video hardware decoder
///
void VideoSetClosing(VideoHwDecoder * hw_decoder)
{
Debug(3, "video: set closing\n");
// FIXME: test to check if working, than make module function
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
hw_decoder->Vdpau.Closing = 1;
}
#endif
Fix bug: spelling USE_VAPI wrong, missing function.
2012-07-06 00:04:08 +02:00
#ifdef USE_VAAPI
Show black picture, if no video stream available. New audio ring code. New audio filters (first part).
2012-04-17 16:45:27 +02:00
if (VideoUsedModule == &VaapiModule) {
hw_decoder->Vaapi.Closing = 1;
}
#endif
// clear clock to avoid further sync
VideoSetClock(hw_decoder, AV_NOPTS_VALUE);
}
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
///
/// Reset start of frame counter.
///
/// @param hw_decoder video hardware decoder
///
void VideoResetStart(VideoHwDecoder * hw_decoder)
{
Debug(3, "video: reset start\n");
// FIXME: test to check if working, than make module function
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
hw_decoder->Vdpau.StartCounter = 0;
}
#endif
Fix bug: spelling USE_VAPI wrong, missing function.
2012-07-06 00:04:08 +02:00
#ifdef USE_VAAPI
Handle jump in stream like stream start.
2012-04-21 12:59:04 +02:00
if (VideoUsedModule == &VaapiModule) {
hw_decoder->Vaapi.StartCounter = 0;
}
#endif
// clear clock to trigger new video stream
VideoSetClock(hw_decoder, AV_NOPTS_VALUE);
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
///
/// Set trick play speed.
///
/// @param hw_decoder video hardware decoder
/// @param speed trick speed (0 = normal)
///
void VideoSetTrickSpeed(VideoHwDecoder * hw_decoder, int speed)
{
return VideoUsedModule->SetTrickSpeed(hw_decoder, speed);
}
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
///
/// Grab full screen image.
///
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
/// @param size[out] size of allocated image
/// @param width[in,out] width of image
/// @param height[in,out] height of image
///
Add support for grab jpeg image.
2012-01-24 22:40:06 +01:00
uint8_t *VideoGrab(int *size, int *width, int *height, int write_header)
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
{
Debug(3, "video: grab\n");
#ifdef USE_GRAB
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
if (VideoUsedModule->GrabOutput) {
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
uint8_t *data;
uint8_t *rgb;
char buf[64];
int i;
int n;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
int scale_width;
int scale_height;
int x;
int y;
double src_x;
double src_y;
double scale_x;
double scale_y;
scale_width = *width;
scale_height = *height;
Fix bug: unscaled jpeg includes PNG header.
2012-02-13 20:15:25 +01:00
n = 0;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
data = VideoUsedModule->GrabOutput(size, width, height);
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
if (data == NULL)
return NULL;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
if (scale_width <= 0) {
scale_width = *width;
}
if (scale_height <= 0) {
scale_height = *height;
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
// hardware didn't scale for us, use simple software scaler
if (scale_width != *width && scale_height != *height) {
if (write_header) {
n = snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n",
scale_width, scale_height);
}
rgb = malloc(scale_width * scale_height * 3 + n);
if (!rgb) {
Error(_("video: out of memory\n"));
free(data);
return NULL;
}
*size = scale_width * scale_height * 3 + n;
memcpy(rgb, buf, n); // header
scale_x = (double)*width / scale_width;
scale_y = (double)*height / scale_height;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
src_y = 0.0;
for (y = 0; y < scale_height; y++) {
int o;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
src_x = 0.0;
o = (int)src_y **width;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
for (x = 0; x < scale_width; x++) {
i = 4 * (o + (int)src_x);
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
rgb[n + (x + y * scale_width) * 3 + 0] = data[i + 2];
rgb[n + (x + y * scale_width) * 3 + 1] = data[i + 1];
rgb[n + (x + y * scale_width) * 3 + 2] = data[i + 0];
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
src_x += scale_x;
}
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
src_y += scale_y;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
*width = scale_width;
*height = scale_height;
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
// grabed image of correct size convert BGRA -> RGB
} else {
Fix bug: unscaled jpeg includes PNG header.
2012-02-13 20:15:25 +01:00
if (write_header) {
n = snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", *width,
*height);
}
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
rgb = malloc(*width * *height * 3 + n);
if (!rgb) {
Error(_("video: out of memory\n"));
free(data);
return NULL;
}
memcpy(rgb, buf, n); // header
VDPAU: Add primitive software scaler to grab image
2012-01-23 20:04:15 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
for (i = 0; i < *size / 4; ++i) { // convert bgra -> rgb
rgb[n + i * 3 + 0] = data[i * 4 + 2];
rgb[n + i * 3 + 1] = data[i * 4 + 1];
rgb[n + i * 3 + 2] = data[i * 4 + 0];
}
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
*size = *width * *height * 3 + n;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
}
free(data);
return rgb;
Move grab unsupported warning to low-level.
2012-03-05 20:10:23 +01:00
} else
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
#endif
Move grab unsupported warning to low-level.
2012-03-05 20:10:23 +01:00
{
Warning(_("softhddev: grab unsupported\n"));
}
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
(void)size;
(void)width;
(void)height;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
(void)write_header;
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
return NULL;
}
Adds VDR DFAtmo Plugin support.
2012-04-30 14:47:08 +02:00
///
/// Grab image service.
///
/// @param size[out] size of allocated image
/// @param width[in,out] width of image
/// @param height[in,out] height of image
///
uint8_t *VideoGrabService(int *size, int *width, int *height)
{
Debug(3, "video: grab service\n");
#ifdef USE_GRAB
if (VideoUsedModule->GrabOutput) {
return VideoUsedModule->GrabOutput(size, width, height);
} else
#endif
{
Warning(_("softhddev: grab unsupported\n"));
}
(void)size;
(void)width;
(void)height;
return NULL;
}
Display frame statistics in plugin menu.
2012-07-02 17:05:36 +02:00
///
/// Get decoder statistics.
///
/// @param hw_decoder video hardware decoder
/// @param[out] missed missed frames
/// @param[out] duped duped frames
/// @param[out] dropped dropped frames
/// @param[out] count number of decoded frames
///
void VideoGetStats(VideoHwDecoder * hw_decoder, int *missed, int *duped,
int *dropped, int *counter)
{
// FIXME: test to check if working, than make module function
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
*missed = hw_decoder->Vdpau.FramesMissed;
*duped = hw_decoder->Vdpau.FramesDuped;
*dropped = hw_decoder->Vdpau.FramesDropped;
*counter = hw_decoder->Vdpau.FrameCounter;
}
#endif
Fix bug: spelling USE_VAPI wrong, missing function.
2012-07-06 00:04:08 +02:00
#ifdef USE_VAAPI
Display frame statistics in plugin menu.
2012-07-02 17:05:36 +02:00
if (VideoUsedModule == &VaapiModule) {
*missed = hw_decoder->Vaapi.FramesMissed;
*duped = hw_decoder->Vaapi.FramesDuped;
*dropped = hw_decoder->Vaapi.FramesDropped;
*counter = hw_decoder->Vaapi.FrameCounter;
}
#endif
}
Report correct size in cSoftHdDevice::GetVideoSize.
2012-10-10 17:26:49 +02:00
///
/// Get decoder video stream size.
///
/// @param hw_decoder video hardware decoder
/// @param[out] width video stream width
/// @param[out] height video stream height
/// @param[out] aspect_num video stream aspect numerator
/// @param[out] aspect_den video stream aspect denominator
///
void VideoGetVideoSize(VideoHwDecoder * hw_decoder, int *width, int *height,
int *aspect_num, int *aspect_den)
{
*width = 1920;
*height = 1080;
*aspect_num = 16;
*aspect_den = 9;
// FIXME: test to check if working, than make module function
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
*width = hw_decoder->Vdpau.InputWidth;
*height = hw_decoder->Vdpau.InputHeight;
av_reduce(aspect_num, aspect_den,
hw_decoder->Vdpau.InputWidth * hw_decoder->Vdpau.InputAspect.num,
hw_decoder->Vdpau.InputHeight * hw_decoder->Vdpau.InputAspect.den,
1024 * 1024);
}
#endif
#ifdef USE_VAAPI
if (VideoUsedModule == &VaapiModule) {
*width = hw_decoder->Vaapi.InputWidth;
*height = hw_decoder->Vaapi.InputHeight;
av_reduce(aspect_num, aspect_den,
hw_decoder->Vaapi.InputWidth * hw_decoder->Vaapi.InputAspect.num,
hw_decoder->Vaapi.InputHeight * hw_decoder->Vaapi.InputAspect.den,
1024 * 1024);
}
#endif
}
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
#ifdef USE_SCREENSAVER
//----------------------------------------------------------------------------
// DPMS / Screensaver
//----------------------------------------------------------------------------
static char DPMSDisabled; ///< flag we have disabled dpms
///
/// Suspend X11 screen saver.
///
/// @param connection X11 connection to enable/disable screensaver
/// @param suspend True suspend screensaver,
/// false enable screensaver
///
static void X11SuspendScreenSaver(xcb_connection_t * connection, int suspend)
{
const xcb_query_extension_reply_t *query_extension_reply;
query_extension_reply =
xcb_get_extension_data(connection, &xcb_screensaver_id);
if (query_extension_reply && query_extension_reply->present) {
xcb_screensaver_query_version_cookie_t cookie;
xcb_screensaver_query_version_reply_t *reply;
Debug(3, "video: screen saver extension present\n");
cookie =
xcb_screensaver_query_version_unchecked(connection,
XCB_SCREENSAVER_MAJOR_VERSION, XCB_SCREENSAVER_MINOR_VERSION);
reply = xcb_screensaver_query_version_reply(connection, cookie, NULL);
if (reply
&& (reply->server_major_version >= XCB_SCREENSAVER_MAJOR_VERSION)
&& (reply->server_minor_version >= XCB_SCREENSAVER_MINOR_VERSION)
) {
xcb_screensaver_suspend(connection, suspend);
}
free(reply);
}
}
///
/// DPMS (Display Power Management Signaling) extension available.
///
/// @param connection X11 connection to check for DPMS
///
static int X11HaveDPMS(xcb_connection_t * connection)
{
static int have_dpms = -1;
const xcb_query_extension_reply_t *query_extension_reply;
if (have_dpms != -1) { // already checked
return have_dpms;
}
have_dpms = 0;
query_extension_reply = xcb_get_extension_data(connection, &xcb_dpms_id);
if (query_extension_reply && query_extension_reply->present) {
xcb_dpms_get_version_cookie_t cookie;
xcb_dpms_get_version_reply_t *reply;
int major;
int minor;
Debug(3, "video: dpms extension present\n");
cookie =
xcb_dpms_get_version_unchecked(connection, XCB_DPMS_MAJOR_VERSION,
XCB_DPMS_MINOR_VERSION);
reply = xcb_dpms_get_version_reply(connection, cookie, NULL);
// use locals to avoid gcc warning
major = XCB_DPMS_MAJOR_VERSION;
minor = XCB_DPMS_MINOR_VERSION;
if (reply && (reply->server_major_version >= major)
&& (reply->server_minor_version >= minor)
) {
have_dpms = 1;
}
free(reply);
}
return have_dpms;
}
///
/// Disable DPMS (Display Power Management Signaling)
///
/// @param connection X11 connection to disable DPMS
///
static void X11DPMSDisable(xcb_connection_t * connection)
{
if (X11HaveDPMS(connection)) {
xcb_dpms_info_cookie_t cookie;
xcb_dpms_info_reply_t *reply;
cookie = xcb_dpms_info_unchecked(connection);
reply = xcb_dpms_info_reply(connection, cookie, NULL);
if (reply) {
if (reply->state) {
Debug(3, "video: dpms was enabled\n");
DPMSDisabled = 1;
xcb_dpms_disable(connection); // monitor powersave off
}
free(reply);
}
}
}
///
/// Reenable DPMS (Display Power Management Signaling)
///
/// @param connection X11 connection to enable DPMS
///
static void X11DPMSReenable(xcb_connection_t * connection)
{
if (DPMSDisabled && X11HaveDPMS(connection)) {
xcb_dpms_enable(connection); // monitor powersave on
xcb_dpms_force_level(connection, XCB_DPMS_DPMS_MODE_ON);
DPMSDisabled = 0;
}
}
#else
/// dummy function: Suspend X11 screen saver.
#define X11SuspendScreenSaver(connection, suspend)
/// dummy function: Disable X11 DPMS.
#define X11DPMSDisable(connection)
/// dummy function: Reenable X11 DPMS.
#define X11DPMSReenable(connection)
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
//----------------------------------------------------------------------------
// Setup
//----------------------------------------------------------------------------
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Create main window.
///
/// @param parent parent of new window
/// @param visual visual of parent
/// @param depth depth of parent
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void VideoCreateWindow(xcb_window_t parent, xcb_visualid_t visual,
uint8_t depth)
{
uint32_t values[4];
xcb_intern_atom_reply_t *reply;
Show transparent cursor to hide cursor.
2012-01-05 22:33:14 +01:00
xcb_pixmap_t pixmap;
xcb_cursor_t cursor;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Debug(3, "video: visual %#0x depth %d\n", visual, depth);
// Color map
VideoColormap = xcb_generate_id(Connection);
xcb_create_colormap(Connection, XCB_COLORMAP_ALLOC_NONE, VideoColormap,
parent, visual);
values[0] = 0;
values[1] = 0;
values[2] =
XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_RELEASE |
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_EXPOSURE |
XCB_EVENT_MASK_STRUCTURE_NOTIFY;
C part of the plugin.
2011-12-07 15:05:38 +01:00
values[3] = VideoColormap;
VideoWindow = xcb_generate_id(Connection);
xcb_create_window(Connection, depth, VideoWindow, parent, VideoWindowX,
VideoWindowY, VideoWindowWidth, VideoWindowHeight, 0,
XCB_WINDOW_CLASS_INPUT_OUTPUT, visual,
XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL | XCB_CW_EVENT_MASK |
XCB_CW_COLORMAP, values);
New video/audio sync code.
2011-12-15 22:45:55 +01:00
// define only available with xcb-utils-0.3.8
#ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS
C part of the plugin.
2011-12-07 15:05:38 +01:00
// FIXME: utf _NET_WM_NAME
xcb_icccm_set_wm_name(Connection, VideoWindow, XCB_ATOM_STRING, 8,
sizeof("softhddevice") - 1, "softhddevice");
xcb_icccm_set_wm_icon_name(Connection, VideoWindow, XCB_ATOM_STRING, 8,
sizeof("softhddevice") - 1, "softhddevice");
New video/audio sync code.
2011-12-15 22:45:55 +01:00
#endif
// define only available with xcb-utils-0.3.6
#ifdef XCB_NUM_WM_HINTS_ELEMENTS
// FIXME: utf _NET_WM_NAME
xcb_set_wm_name(Connection, VideoWindow, XCB_ATOM_STRING,
sizeof("softhddevice") - 1, "softhddevice");
xcb_set_wm_icon_name(Connection, VideoWindow, XCB_ATOM_STRING,
sizeof("softhddevice") - 1, "softhddevice");
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
// FIXME: size hints
// register interest in the delete window message
if ((reply =
xcb_intern_atom_reply(Connection, xcb_intern_atom(Connection, 0,
sizeof("WM_DELETE_WINDOW") - 1, "WM_DELETE_WINDOW"),
NULL))) {
WmDeleteWindowAtom = reply->atom;
free(reply);
if ((reply =
xcb_intern_atom_reply(Connection, xcb_intern_atom(Connection,
0, sizeof("WM_PROTOCOLS") - 1, "WM_PROTOCOLS"),
NULL))) {
Support xcb_set_wm_protocols for xcb-util <0.3.8.
2011-12-16 10:11:41 +01:00
#ifdef XCB_ICCCM_NUM_WM_SIZE_HINTS_ELEMENTS
C part of the plugin.
2011-12-07 15:05:38 +01:00
xcb_icccm_set_wm_protocols(Connection, VideoWindow, reply->atom, 1,
&WmDeleteWindowAtom);
Support xcb_set_wm_protocols for xcb-util <0.3.8.
2011-12-16 10:11:41 +01:00
#endif
#ifdef XCB_NUM_WM_HINTS_ELEMENTS
xcb_set_wm_protocols(Connection, reply->atom, VideoWindow, 1,
&WmDeleteWindowAtom);
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
free(reply);
}
}
Add support for fullscreen mode.
2012-01-13 16:31:29 +01:00
//
// prepare fullscreen.
//
if ((reply =
xcb_intern_atom_reply(Connection, xcb_intern_atom(Connection, 0,
sizeof("_NET_WM_STATE") - 1, "_NET_WM_STATE"), NULL))) {
NetWmState = reply->atom;
free(reply);
}
if ((reply =
xcb_intern_atom_reply(Connection, xcb_intern_atom(Connection, 0,
sizeof("_NET_WM_STATE_FULLSCREEN") - 1,
"_NET_WM_STATE_FULLSCREEN"), NULL))) {
NetWmStateFullscreen = reply->atom;
free(reply);
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
Show transparent cursor to hide cursor.
2012-01-05 22:33:14 +01:00
xcb_map_window(Connection, VideoWindow);
//
// hide cursor
//
pixmap = xcb_generate_id(Connection);
xcb_create_pixmap(Connection, 1, pixmap, parent, 1, 1);
cursor = xcb_generate_id(Connection);
xcb_create_cursor(Connection, cursor, pixmap, pixmap, 0, 0, 0, 0, 0, 0, 1,
1);
values[0] = cursor;
C part of the plugin.
2011-12-07 15:05:38 +01:00
xcb_change_window_attributes(Connection, VideoWindow, XCB_CW_CURSOR,
values);
Free used X11 resources colormap, pixmap, cursor.
2012-07-25 16:07:36 +02:00
VideoCursorPixmap = pixmap;
uwm window manager hide cursor workaround.
2012-01-06 15:37:21 +01:00
VideoBlankCursor = cursor;
Adds show cursor on mouse move + hide after 200ms.
2012-04-14 21:58:14 +02:00
VideoBlankTick = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
///
/// Set video device.
///
/// Currently this only choose the driver.
///
void VideoSetDevice(const char *device)
{
VideoDevice = device;
}
Fix bug: Can't use software decoder with VDPAU.
2012-08-13 16:57:36 +02:00
///
/// Get video driver name.
///
/// @returns name of current video driver.
///
const char *VideoGetDriverName(void)
{
if (VideoUsedModule) {
return VideoUsedModule->Name;
}
return "";
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set video geometry.
///
/// @param geometry [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
int VideoSetGeometry(const char *geometry)
{
Removed gcc 4.6 warnings. Va sync experiment.
2012-06-22 19:27:15 +02:00
XParseGeometry(geometry, &VideoWindowX, &VideoWindowY, &VideoWindowWidth,
&VideoWindowHeight);
C part of the plugin.
2011-12-07 15:05:38 +01:00
return 0;
}
Make soft start sync setup menu configurable.
2012-03-06 12:16:47 +01:00
///
60Hz display mode configurable with setup.conf.
2012-02-22 15:06:05 +01:00
/// Set 60hz display mode.
///
/// Pull up 50 Hz video for 60 Hz display.
///
/// @param onoff enable / disable the 60 Hz mode.
///
void VideoSet60HzMode(int onoff)
{
Video60HzMode = onoff;
}
Make soft start sync setup menu configurable.
2012-03-06 12:16:47 +01:00
///
/// Set soft start audio/video sync.
///
/// @param onoff enable / disable the soft start sync.
///
void VideoSetSoftStartSync(int onoff)
{
VideoSoftStartSync = onoff;
}
Made showing black picture configurable.
2012-04-20 15:40:14 +02:00
///
/// Set show black picture during channel switch.
///
/// @param onoff enable / disable black picture.
///
void VideoSetBlackPicture(int onoff)
{
VideoShowBlackPicture = onoff;
}
Add picture adjustment support for vdpau.
2012-09-03 16:39:33 +02:00
///
/// Set brightness adjustment.
///
/// @param brightness between -1000 and 1000.
/// 0 represents no modification
///
void VideoSetBrightness(int brightness)
{
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
VdpauDecoders[0]->Procamp.brightness = brightness / 1000;
}
#endif
// FIXME: VA-API support
}
///
/// Set contrast adjustment.
///
/// @param contrast between 0 and 10000.
/// 1000 represents no modification
///
void VideoSetContrast(int contrast)
{
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
VdpauDecoders[0]->Procamp.contrast = contrast / 1000;
}
#endif
// FIXME: VA-API support
}
///
/// Set saturation adjustment.
///
/// @param saturation between 0 and 10000.
/// 1000 represents no modification
///
void VideoSetSaturation(int saturation)
{
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
VdpauDecoders[0]->Procamp.saturation = saturation / 1000;
}
#endif
// FIXME: VA-API support
}
///
/// Set hue adjustment.
///
/// @param hue between -PI*1000 and PI*1000.
/// 0 represents no modification
///
void VideoSetHue(int hue)
{
#ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) {
VdpauDecoders[0]->Procamp.hue = hue / 1000;
}
#endif
// FIXME: VA-API support
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set video output position.
///
/// @param x video output x coordinate inside the window
/// @param y video output y coordinate inside the window
/// @param width video output width
/// @param height video output height
///
/// @note FIXME: need to know which stream.
///
void VideoSetOutputPosition(int x, int y, int width, int height)
{
// FIXME: high level, currently works osd relative
if (!OsdWidth || !OsdHeight) {
return;
}
x = (x * VideoWindowWidth) / OsdWidth;
y = (y * VideoWindowHeight) / OsdHeight;
width = (width * VideoWindowWidth) / OsdWidth;
height = (height * VideoWindowHeight) / OsdHeight;
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
// FIXME: what stream?
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
#ifdef USE_VDPAU
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
if (VideoUsedModule == &VdpauModule) {
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
VdpauSetOutputPosition(VdpauDecoders[0], x, y, width, height);
}
#endif
Fix bug: spelling USE_VAPI wrong, missing function.
2012-07-06 00:04:08 +02:00
#ifdef USE_VAAPI
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
// FIXME: not supported by vaapi without unscaled OSD,
// FIXME: if used to position video inside osd
#endif
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadUnlock();
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
}
///
/// Set video window position.
///
/// @param x window x coordinate
/// @param y window y coordinate
/// @param width window width
/// @param height window height
///
/// @note no need to lock, only called from inside the video thread
///
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
void VideoSetVideoMode( __attribute__ ((unused))
int x, __attribute__ ((unused))
int y, int width, int height)
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
{
Release Version 0.4.0.
2012-01-21 15:56:45 +01:00
Debug(4, "video: %s %dx%d%+d%+d\n", __FUNCTION__, width, height, x, y);
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, ...
2012-01-18 15:15:37 +01:00
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
if ((unsigned)width == VideoWindowWidth
&& (unsigned)height == VideoWindowHeight) {
return; // same size nothing todo
}
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, ...
2012-01-18 15:15:37 +01:00
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
VideoOsdExit();
// FIXME: must tell VDR that the OsdSize has been changed!
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, ...
2012-01-18 15:15:37 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
Add support for close and resize x11 window.
2012-01-10 15:53:54 +01:00
VideoWindowWidth = width;
VideoWindowHeight = height;
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->SetVideoMode();
VideoThreadUnlock();
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
VideoOsdInit();
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
}
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
///
/// Set video display format.
///
Adds Hot-key support for 4:3 zoom modes.
2012-04-11 12:15:12 +02:00
/// @param format video format (stretch, normal, center cut-out)
///
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
void VideoSetDisplayFormat(int format)
{
VideoOsdExit();
// FIXME: must tell VDR that the OsdSize has been changed!
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
switch (format) {
Adds Hot-key support for 4:3 zoom modes.
2012-04-11 12:15:12 +02:00
case -1: // rotate settings
Video4to3ZoomMode = (Video4to3ZoomMode + 1) % VideoCenterCutOut;
break;
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
case 0: // pan&scan (we have no pan&scan)
Video4to3ZoomMode = VideoStretch;
break;
case 1: // letter box
Video4to3ZoomMode = VideoNormal;
break;
case 2: // center cut-out
Video4to3ZoomMode = VideoCenterCutOut;
break;
}
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->SetVideoMode();
VideoThreadUnlock();
Video updates and bug fix. Check if surface is ready in VaapiGetSurface. Set PTS/DTS only in the first split video packet. 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.
2012-02-01 16:50:48 +01:00
VideoOsdInit();
}
Add support for fullscreen mode.
2012-01-13 16:31:29 +01:00
///
/// Send fullscreen message to window.
///
/// @param onoff -1 toggle, true turn on, false turn off
///
void VideoSetFullscreen(int onoff)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
if (XlibDisplay) { // needs running connection
xcb_client_message_event_t event;
memset(&event, 0, sizeof(event));
event.response_type = XCB_CLIENT_MESSAGE;
event.format = 32;
event.window = VideoWindow;
event.type = NetWmState;
if (onoff < 0) {
event.data.data32[0] = XCB_EWMH_WM_STATE_TOGGLE;
} else if (onoff) {
event.data.data32[0] = XCB_EWMH_WM_STATE_ADD;
} else {
event.data.data32[0] = XCB_EWMH_WM_STATE_REMOVE;
}
event.data.data32[1] = NetWmStateFullscreen;
VideoSetFullscreen needs X11 connection.
2012-02-26 20:54:31 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
xcb_send_event(Connection, XCB_SEND_EVENT_DEST_POINTER_WINDOW,
DefaultRootWindow(XlibDisplay),
XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY |
XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, (void *)&event);
Debug(3, "video/x11: send fullscreen message %x %x\n",
event.data.data32[0], event.data.data32[1]);
Add support for fullscreen mode.
2012-01-13 16:31:29 +01:00
}
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set deinterlace mode.
///
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
void VideoSetDeinterlace(int mode[VideoResolutionMax])
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
{
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoDeinterlace[0] = mode[0];
VideoDeinterlace[1] = mode[1];
VideoDeinterlace[2] = mode[2];
VideoDeinterlace[3] = mode[3];
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VideoSurfaceModesChanged = 1;
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set skip chroma deinterlace on/off.
///
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
void VideoSetSkipChromaDeinterlace(int onoff[VideoResolutionMax])
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
{
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoSkipChromaDeinterlace[0] = onoff[0];
VideoSkipChromaDeinterlace[1] = onoff[1];
VideoSkipChromaDeinterlace[2] = onoff[2];
VideoSkipChromaDeinterlace[3] = onoff[3];
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VideoSurfaceModesChanged = 1;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
}
VDPAU: Enable inverse telecine configuration.
2012-02-14 22:29:17 +01:00
///
/// Set inverse telecine on/off.
///
void VideoSetInverseTelecine(int onoff[VideoResolutionMax])
{
VideoInverseTelecine[0] = onoff[0];
VideoInverseTelecine[1] = onoff[1];
VideoInverseTelecine[2] = onoff[2];
VideoInverseTelecine[3] = onoff[3];
VideoSurfaceModesChanged = 1;
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set denoise level (0 .. 1000).
///
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
void VideoSetDenoise(int level[VideoResolutionMax])
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
{
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoDenoise[0] = level[0];
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
VideoDenoise[1] = level[1];
VideoDenoise[2] = level[2];
VideoDenoise[3] = level[3];
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VideoSurfaceModesChanged = 1;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set sharpness level (-1000 .. 1000).
///
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
void VideoSetSharpen(int level[VideoResolutionMax])
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
{
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoSharpen[0] = level[0];
VideoSharpen[1] = level[1];
VideoSharpen[2] = level[2];
VideoSharpen[3] = level[3];
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VideoSurfaceModesChanged = 1;
VDPAU improvements. Add denoise, sharpness, skip chroma deinterlace support. Show OSD only if something is to display, improves performance. Add deinterlace mode with only 4 surfaces.
2012-01-05 17:20:44 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set scaling mode.
///
Fix bug: Used VideoSharpen for denoise settings. Instant update deinterlace/... configuration changes.
2012-01-19 21:28:38 +01:00
/// @param mode table with VideoResolutionMax values
///
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
void VideoSetScaling(int mode[VideoResolutionMax])
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
{
Video improvements. Fix generate of video output from StillPicture. Add support for resolution dependend video parameterts (Deinterlace, Scaling, Denoise, Sharpen, ...).
2012-01-09 17:03:04 +01:00
VideoScaling[0] = mode[0];
VideoScaling[1] = mode[1];
VideoScaling[2] = mode[2];
VideoScaling[3] = mode[3];
VAAPI: Instant use new deinterlace configuration.
2012-01-12 23:07:06 +01:00
VideoSurfaceModesChanged = 1;
DisplayFrame displays now only a single frame.
2011-12-12 17:04:41 +01:00
}
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// Set cut top and bottom.
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// @param pixels table with VideoResolutionMax values
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
void VideoSetCutTopBottom(int pixels[VideoResolutionMax])
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
{
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
VideoCutTopBottom[0] = pixels[0];
VideoCutTopBottom[1] = pixels[1];
VideoCutTopBottom[2] = pixels[2];
VideoCutTopBottom[3] = pixels[3];
Add configurable skip lines at video top + bottom.
2012-01-28 01:44:50 +01:00
}
Add VideoSkipPixels support.
2012-03-26 20:49:18 +02:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// Set cut left and right.
Add VideoSkipPixels support.
2012-03-26 20:49:18 +02:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
/// @param pixels table with VideoResolutionMax values
Add VideoSkipPixels support.
2012-03-26 20:49:18 +02:00
///
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
void VideoSetCutLeftRight(int pixels[VideoResolutionMax])
Add VideoSkipPixels support.
2012-03-26 20:49:18 +02:00
{
Cutting pixels configured for each resolution.
2012-04-05 22:51:20 +02:00
VideoCutLeftRight[0] = pixels[0];
VideoCutLeftRight[1] = pixels[1];
VideoCutLeftRight[2] = pixels[2];
VideoCutLeftRight[3] = pixels[3];
Add VideoSkipPixels support.
2012-03-26 20:49:18 +02:00
}
Studio levels could be configured in setup menu.
2012-02-13 14:13:24 +01:00
///
/// Set studio levels.
///
/// @param onoff flag on/off
///
void VideoSetStudioLevels(int onoff)
{
VideoStudioLevels = onoff;
}
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
///
/// Set background color.
///
/// @param rgba 32 bit RGBA color.
///
void VideoSetBackground(uint32_t rgba)
{
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoBackground = rgba; // saved for later start
VideoUsedModule->SetBackground(rgba);
Support configuration and set of video background.
2012-02-24 15:15:50 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Set audio delay.
///
/// @param ms delay in ms
///
Audio/video sync improvements. Configurable audio delay. Use monotonic pts. Support old libav or ffmpeg libraries.
2011-12-19 17:03:40 +01:00
void VideoSetAudioDelay(int ms)
{
VideoAudioDelay = ms * 90;
}
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
///
/// Set auto-crop parameters.
///
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
void VideoSetAutoCrop(int interval, int delay, int tolerance)
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
{
#ifdef USE_AUTOCROP
AutoCropInterval = interval;
AutoCropDelay = delay;
Add auto-crop tolerance configuration.
2012-01-27 23:49:05 +01:00
AutoCropTolerance = tolerance;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoThreadLock();
VideoUsedModule->ResetAutoCrop();
VideoThreadUnlock();
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#else
(void)interval;
(void)delay;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
(void)tolerance;
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
#endif
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Initialize video output module.
///
/// @param display_name X11 display name
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoInit(const char *display_name)
{
int screen_nr;
int i;
xcb_screen_iterator_t screen_iter;
Support display with non-square pixels.
2012-05-10 16:03:56 +02:00
xcb_screen_t const *screen;
C part of the plugin.
2011-12-07 15:05:38 +01:00
if (XlibDisplay) { // allow multiple calls
Debug(3, "video: x11 already setup\n");
return;
}
// Open the connection to the X server.
// use the DISPLAY environment variable as the default display name
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
if (!display_name && !(display_name = getenv("DISPLAY"))) {
// if no environment variable, use :0.0 as default display name
display_name = ":0.0";
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
if (!(XlibDisplay = XOpenDisplay(display_name))) {
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
Error(_("video: Can't connect to X11 server on '%s'\n"), display_name);
C part of the plugin.
2011-12-07 15:05:38 +01:00
// FIXME: we need to retry connection
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
return;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Workaround for dead-lock in VdpauExit.
2012-01-24 00:32:07 +01:00
// XInitThreads();
Survive lost X11 display.
2012-02-23 17:57:21 +01:00
// Register error handler
XSetIOErrorHandler(VideoIOErrorHandler);
C part of the plugin.
2011-12-07 15:05:38 +01:00
// Convert XLIB display to XCB connection
if (!(Connection = XGetXCBConnection(XlibDisplay))) {
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
Error(_("video: Can't convert XLIB display to XCB connection\n"));
VideoExit();
return;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
// prefetch extensions
//xcb_prefetch_extension_data(Connection, &xcb_big_requests_id);
//xcb_prefetch_extension_data(Connection, &xcb_glx_id);
//xcb_prefetch_extension_data(Connection, &xcb_randr_id);
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
#ifdef USE_SCREENSAVER
xcb_prefetch_extension_data(Connection, &xcb_screensaver_id);
xcb_prefetch_extension_data(Connection, &xcb_dpms_id);
#endif
C part of the plugin.
2011-12-07 15:05:38 +01:00
//xcb_prefetch_extension_data(Connection, &xcb_shm_id);
//xcb_prefetch_extension_data(Connection, &xcb_xv_id);
// Get the requested screen number
screen_nr = DefaultScreen(XlibDisplay);
screen_iter = xcb_setup_roots_iterator(xcb_get_setup(Connection));
for (i = 0; i < screen_nr; ++i) {
xcb_screen_next(&screen_iter);
}
screen = screen_iter.data;
Support display with non-square pixels.
2012-05-10 16:03:56 +02:00
VideoScreen = screen;
C part of the plugin.
2011-12-07 15:05:38 +01:00
//
// Default window size
//
if (!VideoWindowHeight) {
if (VideoWindowWidth) {
VideoWindowHeight = (VideoWindowWidth * 9) / 16;
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
} else { // default to fullscreen
VideoWindowHeight = screen->height_in_pixels;
VideoWindowWidth = screen->width_in_pixels;
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
}
if (!VideoWindowWidth) {
VideoWindowWidth = (VideoWindowHeight * 16) / 9;
}
//
// prepare opengl
//
#ifdef USE_GLX
if (GlxEnabled) {
GlxInit();
// FIXME: use root window?
VideoCreateWindow(screen->root, GlxVisualInfo->visualid,
GlxVisualInfo->depth);
GlxSetupWindow(VideoWindow, VideoWindowWidth, VideoWindowHeight);
} else
#endif
//
// Create output window
//
if (1) { // FIXME: use window mode
VideoCreateWindow(screen->root, screen->root_visual,
screen->root_depth);
} else {
// FIXME: support embedded mode
VideoWindow = screen->root;
// FIXME: VideoWindowHeight VideoWindowWidth
}
Debug(3, "video: window prepared\n");
//
// prepare hardware decoder VA-API/VDPAU
//
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
for (i = 0; i < (int)(sizeof(VideoModules) / sizeof(*VideoModules)); ++i) {
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
// FIXME: support list of drivers and include display name
// use user device or first working enabled device driver
if ((VideoDevice && !strcasecmp(VideoDevice, VideoModules[i]->Name))
|| (!VideoDevice && VideoModules[i]->Enabled)) {
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
if (VideoModules[i]->Init(display_name)) {
VideoUsedModule = VideoModules[i];
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
goto found;
Finished rewrite of video code, to support modules.
2012-01-30 15:58:21 +01:00
}
VDPAU: Add screenshot support.
2012-01-20 21:46:22 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
Error(_("video: '%s' output module isn't supported\n"), VideoDevice);
VideoUsedModule = &NoopModule;
C part of the plugin.
2011-12-07 15:05:38 +01:00
Audio/Video sync rewrite. Trick-speed support moved to video module. Reduce video messages.
2012-03-31 21:27:54 +02:00
found:
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
// FIXME: make it configurable from gui
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
if (getenv("NO_MPEG_HW")) {
Fix software deinterlace with VA-API.
2012-01-17 17:41:24 +01:00
VideoHardwareDecoder = 1;
}
Add workaround for Intel VA-API MPEG GPU hung.
2012-01-29 11:28:10 +01:00
if (getenv("NO_HW")) {
VideoHardwareDecoder = 0;
}
VDPAU: support for studio levels added.
2012-02-10 15:47:52 +01:00
if (getenv("STUDIO_LEVELS")) {
VideoStudioLevels = 1;
}
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
// disable x11 screensaver
X11SuspendScreenSaver(Connection, 1);
X11DPMSDisable(Connection);
C part of the plugin.
2011-12-07 15:05:38 +01:00
//xcb_prefetch_maximum_request_length(Connection);
xcb_flush(Connection);
Window defaults to fullscreen without geometry.
2012-02-13 14:00:53 +01:00
// I would like to start threads here, but this produces:
// [xcb] Unknown sequence number while processing queue
// [xcb] Most likely this is a multi-threaded client and XInitThreads
// has not been called
//VideoPollEvent();
//VideoThreadInit();
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Cleanup video output module.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
void VideoExit(void)
{
if (!XlibDisplay) { // no init or failed
return;
}
Removed double comment.
2012-10-19 15:38:05 +02:00
//
// Reenable screensaver / DPMS.
//
Disable and reenable screen saver and DPMS.
2012-03-08 15:25:10 +01:00
X11DPMSReenable(Connection);
X11SuspendScreenSaver(Connection, 0);
C part of the plugin.
2011-12-07 15:05:38 +01:00
#ifdef USE_VIDEO_THREAD
VideoThreadExit();
Workaround for dead-lock in VdpauExit.
2012-01-24 00:32:07 +01:00
// VDPAU cleanup hangs in XLockDisplay every 100 exits
// XUnlockDisplay(XlibDisplay);
// xcb_flush(Connection);
C part of the plugin.
2011-12-07 15:05:38 +01:00
#endif
Video cleanup. Add noop video output module. Move VideoThread check into lock/unlock functions. Add support for choosing video output module.
2012-03-07 15:31:43 +01:00
VideoUsedModule->Exit();
VideoUsedModule = &NoopModule;
C part of the plugin.
2011-12-07 15:05:38 +01:00
#ifdef USE_GLX
if (GlxEnabled) {
GlxExit();
}
#endif
//
// FIXME: cleanup.
//
//RandrExit();
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
//
// X11/xcb cleanup
//
if (VideoWindow != XCB_NONE) {
xcb_destroy_window(Connection, VideoWindow);
VideoWindow = XCB_NONE;
}
Free used X11 resources colormap, pixmap, cursor.
2012-07-25 16:07:36 +02:00
if (VideoColormap != XCB_NONE) {
xcb_free_colormap(Connection, VideoColormap);
VideoColormap = XCB_NONE;
}
if (VideoBlankCursor != XCB_NONE) {
xcb_free_cursor(Connection, VideoBlankCursor);
VideoBlankCursor = XCB_NONE;
}
if (VideoCursorPixmap != XCB_NONE) {
xcb_free_pixmap(Connection, VideoCursorPixmap);
VideoCursorPixmap = XCB_NONE;
}
Flush X11 output buffer before close.
2012-10-29 17:24:58 +01:00
xcb_flush(Connection);
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
if (XlibDisplay) {
if (XCloseDisplay(XlibDisplay)) {
Error(_("video: error closing display\n"));
}
XlibDisplay = NULL;
Flush X11 output buffer before close.
2012-10-29 17:24:58 +01:00
Connection = 0;
Suspend can close and open video and audio device.
2012-01-22 20:49:43 +01:00
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
#endif
#ifdef VIDEO_TEST
#include <getopt.h>
int SysLogLevel; ///< show additional debug informations
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
uint32_t VideoSwitch; ///< required
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
int64_t AudioGetDelay(void) ///< required
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
{
AudioGetDelay returns signed value and cleanups.
2012-03-10 15:00:58 +01:00
return 0L;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
}
int64_t AudioGetClock(void) ///< required
{
return AV_NOPTS_VALUE;
}
void FeedKeyPress( __attribute__ ((unused))
const char *x, __attribute__ ((unused))
const char *y, __attribute__ ((unused))
int a, __attribute__ ((unused))
int b)
{
}
Poll input buffers, if display buffers are full.
2012-05-13 18:33:24 +02:00
int VideoDecodeInput(void)
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
{
return -1;
}
C part of the plugin.
2011-12-07 15:05:38 +01:00
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Print version.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void PrintVersion(void)
{
printf("video_test: video tester Version " VERSION
#ifdef GIT_REV
"(GIT-" GIT_REV ")"
#endif
VDPAU: Add auto-crop support.
2012-01-20 15:33:37 +01:00
",\n\t(c) 2009 - 2012 by Johns\n"
C part of the plugin.
2011-12-07 15:05:38 +01:00
"\tLicense AGPLv3: GNU Affero General Public License version 3\n");
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Print usage.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
static void PrintUsage(void)
{
printf("Usage: video_test [-?dhv]\n"
"\t-d\tenable debug, more -d increase the verbosity\n"
"\t-? -h\tdisplay this message\n" "\t-v\tdisplay version information\n"
"Only idiots print usage on stderr!\n");
}
Support yaepghd video output position change. And code and comments cleanups.
2012-01-07 22:36:06 +01:00
///
/// Main entry point.
///
/// @param argc number of arguments
/// @param argv arguments vector
///
/// @returns -1 on failures, 0 clean exit.
///
C part of the plugin.
2011-12-07 15:05:38 +01:00
int main(int argc, char *const argv[])
{
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
uint32_t start_tick;
uint32_t tick;
int n;
VideoHwDecoder *video_hw_decoder;
C part of the plugin.
2011-12-07 15:05:38 +01:00
SysLogLevel = 0;
//
// Parse command line arguments
//
for (;;) {
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
switch (getopt(argc, argv, "hv?-c:dg:")) {
C part of the plugin.
2011-12-07 15:05:38 +01:00
case 'd': // enabled debug
++SysLogLevel;
continue;
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
case 'g': // geometry
if (VideoSetGeometry(optarg) < 0) {
fprintf(stderr,
_
("Bad formated geometry please use: [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]\n"));
return 0;
}
continue;
C part of the plugin.
2011-12-07 15:05:38 +01:00
case EOF:
break;
case 'v': // print version
PrintVersion();
return 0;
case '?':
case 'h': // help usage
PrintVersion();
PrintUsage();
return 0;
case '-':
PrintVersion();
PrintUsage();
fprintf(stderr, "\nWe need no long options\n");
return -1;
case ':':
PrintVersion();
fprintf(stderr, "Missing argument for option '%c'\n", optopt);
return -1;
default:
PrintVersion();
fprintf(stderr, "Unkown option '%c'\n", optopt);
return -1;
}
break;
}
if (optind < argc) {
PrintVersion();
while (optind < argc) {
fprintf(stderr, "Unhandled argument '%s'\n", argv[optind++]);
}
return -1;
}
//
// main loop
//
Patch collection from Christian Ruppert. 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.
2012-01-10 22:48:42 +01:00
VideoInit(NULL);
C part of the plugin.
2011-12-07 15:05:38 +01:00
VideoOsdInit();
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
video_hw_decoder = VideoNewHwDecoder();
start_tick = GetMsTicks();
n = 0;
C part of the plugin.
2011-12-07 15:05:38 +01:00
for (;;) {
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#if 0
C part of the plugin.
2011-12-07 15:05:38 +01:00
VideoRenderOverlay();
VideoDisplayOverlay();
glXSwapBuffers(XlibDisplay, VideoWindow);
GlxCheck();
glClear(GL_COLOR_BUFFER_BIT);
XSync(XlibDisplay, False);
XFlush(XlibDisplay);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
#endif
#ifdef USE_VAAPI
if (VideoVaapiEnabled) {
VaapiDisplayFrame();
}
#endif
#ifdef USE_VDPAU
if (VideoVdpauEnabled) {
VdpauDisplayFrame();
}
#endif
tick = GetMsTicks();
n++;
if (!(n % 100)) {
Cleanups.
2012-03-12 17:58:19 +01:00
printf("%dms / frame\n", (tick - start_tick) / n);
Video bug fix. 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.
2012-01-27 21:08:37 +01:00
}
usleep(2 * 1000);
C part of the plugin.
2011-12-07 15:05:38 +01:00
}
VideoExit();
return 0;
}
#endif
Reference in New Issue Copy Permalink