frodovdr
/
vdr-plugin-softhddevice
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Change VideoSetOutputPosition to work OSD relative.

This commit is contained in:
Johns 2012-12-31 17:51:43 +01:00
parent 3907f3eb2f
commit 33b14be516
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
video.c
View File

@ -10217,8 +10217,8 @@ void VideoSetHue(int hue)
/// ///
/// Set video output position. /// Set video output position.
/// ///
/// @param x video output x coordinate inside the window /// @param x video output x coordinate OSD relative
/// @param y video output y coordinate inside the window /// @param y video output y coordinate OSD relative
/// @param width video output width /// @param width video output width
/// @param height video output height /// @param height video output height
/// ///
@ -10226,8 +10226,8 @@ void VideoSetHue(int hue)
/// ///
void VideoSetOutputPosition(int x, int y, int width, int height) void VideoSetOutputPosition(int x, int y, int width, int height)
{ {
static int last_x; ///< last video output window x coordinate static int last_x; ///< last video output window x
static int last_y; ///< last video output window y coordinate static int last_y; ///< last video output window y
static unsigned last_width; ///< last video output window width static unsigned last_width; ///< last video output window width
static unsigned last_height; ///< last video output window height static unsigned last_height; ///< last video output window height
@ -10235,32 +10235,33 @@ void VideoSetOutputPosition(int x, int y, int width, int height)
return; return;
} }
if (!width || !height) { if (!width || !height) {
if (x == last_x && y == last_y && VideoWindowWidth == last_width
&& VideoWindowHeight == last_height) {
// not necessary...
return;
}
// restore full size & remember values to be able to avoid // restore full size & remember values to be able to avoid
// interfering with the video thread if possible // interfering with the video thread if possible
last_width = VideoWindowWidth; width = VideoWindowWidth;
last_height = VideoWindowHeight; height = VideoWindowHeight;
} else { } else {
if (x == last_x && y == last_y && (unsigned)width == last_width // convert OSD coordinates to window coordinates
&& (unsigned)height == last_height) { x = (x * VideoWindowWidth) / OsdWidth;
// not necessary... width = (width * VideoWindowWidth) / OsdWidth;
return; y = (y * VideoWindowHeight) / OsdHeight;
} height = (height * VideoWindowHeight) / OsdHeight;
// scale & remember values to be able to avoid
// interfering with the video thread if possible
last_width = width;
last_height = height;
} }
// remember position to be able to avoid
if (x == last_x && y == last_y && (unsigned)width == last_width
&& (unsigned)height == last_height) {
// not necessary...
return;
}
// scale & remember values to be able to avoid
// interfering with the video thread if possible // interfering with the video thread if possible
last_x = x; last_x = x;
last_y = y; last_y = y;
last_width = width;
last_height = height;
VideoThreadLock(); VideoThreadLock();
// FIXME: what stream? // FIXME: what stream?
// FIXME: add function to module class
#ifdef USE_VDPAU #ifdef USE_VDPAU
if (VideoUsedModule == &VdpauModule) { if (VideoUsedModule == &VdpauModule) {
VdpauSetOutputPosition(VdpauDecoders[0], last_x, last_y, last_width, VdpauSetOutputPosition(VdpauDecoders[0], last_x, last_y, last_width,