summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-01-02 15:29:49 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-01-02 15:29:49 +0100
commitab177a1579371aef6d03c11509717cdf6855b8d7 (patch)
tree1b397bea0665da0c1df99fd69f16cd5a815538e7
parent0b3a801ab463186519e9e1c14ea891924c64dff5 (diff)
downloadvdr-ab177a1579371aef6d03c11509717cdf6855b8d7.tar.gz
vdr-ab177a1579371aef6d03c11509717cdf6855b8d7.tar.bz2
Fixed reusing OSD in cDvbSpuDecoder
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--dvbspu.c28
3 files changed, 25 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 38d3bfd9..93a2b102 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -901,6 +901,7 @@ Reinhard Nissl <rnissl@gmx.de>
for reporting a high CPU load in still picture mode after removing the usleep()
call from cDvbPlayer::Action()
for reporting a race condition in starting a thread
+ for fixing reusing OSD in cDvbSpuDecoder
Richard Robson <richard_robson@beeb.net>
for reporting freezing replay if a timer starts while in Transfer Mode from the
diff --git a/HISTORY b/HISTORY
index 77ad4447..74a0a8c5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3265,3 +3265,4 @@ Video Disk Recorder Revision History
used to get notified when the audio track has been switched.
- Skins need to implement the new cSkinDisplayTrack class to display the audio
track menu.
+- Fixed reusing OSD in cDvbSpuDecoder (thanks to Reinhard Nissl).
diff --git a/dvbspu.c b/dvbspu.c
index 69611392..3c17e563 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
*
* parts of this file are derived from the OMS program.
*
- * $Id: dvbspu.c 1.8 2004/11/06 11:50:13 kls Exp $
+ * $Id: dvbspu.c 1.9 2005/01/02 15:27:07 kls Exp $
*/
#include <assert.h>
@@ -349,6 +349,20 @@ sDvbSpuRect cDvbSpuDecoder::CalcAreaSize(sDvbSpuRect fgsize, cBitmap *fgbmp, sDv
return size;
}
+static bool OsdMatchesArea(cOsd *osd, tArea &area)
+{
+ cBitmap *bmp = osd->GetBitmap(0);
+ if (!bmp)
+ return false;
+ if (bmp->Bpp() != area.bpp)
+ return false;
+ if (bmp->X0() != area.x1 || bmp->Y0() != area.y1)
+ return false;
+ if (bmp->Width() != area.Width() || bmp->Height() != area.Height())
+ return false;
+ return true;
+}
+
void cDvbSpuDecoder::Draw(void)
{
if (!spubmp) {
@@ -386,12 +400,16 @@ void cDvbSpuDecoder::Draw(void)
}
if (bg || fg) {
+ int x2 = areaSize.x2;
+ while ((x2 - areaSize.x1 + 1) & 0x03)
+ x2++;
+ tArea Area = { areaSize.x1, areaSize.y1, x2, areaSize.y2, (fg && bg) ? 4 : 2 };
+ if (osd && !OsdMatchesArea(osd, Area)) {
+ delete osd;
+ osd = NULL;
+ }
if (osd == NULL) {
osd = cOsdProvider::NewOsd(0, 0);
- int x2 = areaSize.x2;
- while ((x2 - areaSize.x1 + 1) & 0x03)
- x2++;
- tArea Area = { areaSize.x1, areaSize.y1, x2, areaSize.y2, (fg && bg) ? 4 : 2 };
osd->SetAreas(&Area, 1);
}