frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't return actual values

This commit is contained in:
Klaus Schmidinger 2011-09-10 09:45:55 +02:00
parent 699fd6d5d7
commit 873b14ac0c
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1868,6 +1868,8 @@ Luca Olivetti <luca@ventoso.org>
"repeat" keypresses very fast "repeat" keypresses very fast
for reporting a broken entry 'A111.1W' in sources.conf for reporting a broken entry 'A111.1W' in sources.conf
for translating OSD texts to the Spanish and Catalan language for translating OSD texts to the Spanish and Catalan language
for fixing scaling subtitles in case the primary device's GetVideoSize() function
doesn't return actual values
Mikko Salo <mikko.salo@ppe.inet.fi> Mikko Salo <mikko.salo@ppe.inet.fi>
for suggesting to make the setup option "DVB/Video display format" available only for suggesting to make the setup option "DVB/Video display format" available only

5
HISTORY
View File

@ -6742,3 +6742,8 @@ Video Disk Recorder Revision History
Detecting frames in case the Picture Start Code or Access Unit Delimiter Detecting frames in case the Picture Start Code or Access Unit Delimiter
extends over TS packet boundaries is now done by locally skipping TS packets extends over TS packet boundaries is now done by locally skipping TS packets
in cFrameDetector. in cFrameDetector.
2011-09-10: Version 1.7.22
- Fixed scaling subtitles in case the primary device's GetVideoSize() function doesn't
return actual values (thanks to Luca Olivetti).

10
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 2.34 2011/08/20 08:51:47 kls Exp $ * $Id: config.h 2.35 2011/09/10 09:45:55 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.7.21" #define VDRVERSION "1.7.22"
#define VDRVERSNUM 10721 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10722 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "1.7.21" #define APIVERSION "1.7.22"
#define APIVERSNUM 10721 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10722 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to

4
dvbsubtitle.c
View File

@ -7,7 +7,7 @@
* Original author: Marco Schlüßler <marco@lordzodiac.de> * Original author: Marco Schlüßler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
* *
* $Id: dvbsubtitle.c 2.18 2011/08/13 13:33:00 kls Exp $ * $Id: dvbsubtitle.c 2.19 2011/09/10 09:43:40 kls Exp $
*/ */
@ -887,7 +887,7 @@ void cDvbSubtitleConverter::SetOsdData(void)
double VideoAspect; double VideoAspect;
cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect); cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect);
cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect); cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect);
if (OsdWidth == displayWidth && OsdHeight == displayHeight) { if (OsdWidth == displayWidth && OsdHeight == displayHeight || VideoWidth == 0) {
osdFactorX = osdFactorY = 1.0; osdFactorX = osdFactorY = 1.0;
osdDeltaX = osdDeltaY = 0; osdDeltaX = osdDeltaY = 0;
} }