From patchwork Thu Mar 6 17:52:49 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ville Aakko X-Patchwork-Id: 12621 Received: from gv-out-0910.google.com ([216.239.58.187]) by www.linuxtv.org with esmtp (Exim 4.63) (envelope-from ) id 1JXKH5-0004aO-QV for vdr@linuxtv.org; Thu, 06 Mar 2008 18:53:05 +0100 Received: by gv-out-0910.google.com with SMTP id o2so1790725gve.16 for ; Thu, 06 Mar 2008 09:52:52 -0800 (PST) Received: by 10.142.216.9 with SMTP id o9mr46669wfg.172.1204825969996; Thu, 06 Mar 2008 09:52:49 -0800 (PST) Received: by 10.143.164.14 with HTTP; Thu, 6 Mar 2008 09:52:49 -0800 (PST) Message-ID: Date: Thu, 6 Mar 2008 19:52:49 +0200 From: "Ville Aakko" To: "VDR Mailing List" In-Reply-To: <47CFADDF.3070204@ventoso.org> MIME-Version: 1.0 References: <20080304205553.GA29585@srotta.homeip.net> <20080305120231.GA32268@srotta.homeip.net> <20080305164745.GA923@srotta.homeip.net> <47CECF7B.5090709@cadsoft.de> <20080305173822.GA1219@srotta.homeip.net> <47CF0CCB.70309@ventoso.org> <20080305223554.GA1916@srotta.homeip.net> <20080305235759.GB1916@srotta.homeip.net> <47CFACB0.8080604@ventoso.org> <47CFADDF.3070204@ventoso.org> X-LSpam-Score: 0.0 (/) Subject: Re: [vdr] DXR3 and subtitles in 1.5.x X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.9 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2008 17:53:05 -0000 Status: O X-Status: X-Keywords: X-UID: 15994 Hi Luca! 2008/3/6, Luca Olivetti : > En/na Luca Olivetti ha escrit: > > > >> ... and this went away when I changed the cDxr3SubpictureOsd constructor > >> to call the cOsd with proper level. Unless I'm missing something - and I > >> bet I am - the system seems to be working smoothly now. > > > > Mmh, it should be already doing it, look at line 39 > > > > http://dxr3plugin.cvs.sourceforge.net/dxr3plugin/dxr3/dxr3osd_subpicture.c?revision=1.1.2.18&view=markup&pathrev=vdr-dxr3-0-2 > > > (slaps on head), ok, that's calling it with 0, in my local copy I'm > calling it with Level (probably the problem was introduced when I made > the patch for the cvs version supporting older vdr releases). > Sorry for all the trouble. > > Ville, are you listening? ;-) If you meant me then yes I am =) I made the change locally here too and now it works correctly! Has been bugging me a long time but I've lived with it ;) Sami, I believe you already have it almost in order. I've been using the development VDR all the time, and the only problem has been that the OSD hijacked the OSD (and is now gone thanks to the osdlevel patch). Though, if you get the problem that the OSD doesn't clear between subtitles, then see the 2. patch I'm attaching for vdr-dxr3 plugin (though it could be in the CVS now, I'm using a tarball of the CVS that is somewhat aged now). For reference I'm attaching here all the patches I need to apply to VDR (1.5.15 but probably works with older ones too) and dxr3-vdr plugin on my setup to get it working properly. Are the Gentoo overlay guys listening? These could go into the overlay (but the VDR patch should of course only activate if the dxr3 use flag is set). - Ville diff -Naur vdr-1.5.10/dvbsubtitle.c vdr-1.5.10-new/dvbsubtitle.c --- vdr-1.5.10/dvbsubtitle.c 2007-10-14 17:02:35.000000000 +0300 +++ vdr-1.5.10-new/dvbsubtitle.c 2007-11-04 13:17:19.000000000 +0200 @@ -982,13 +982,13 @@ return; tArea *Areas = Page->GetAreas(); int NumAreas = Page->regions.Count(); - int Bpp = 8; + int Bpp = 4; bool Reduced = false; - while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) { +// while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) { int HalfBpp = Bpp / 2; if (HalfBpp >= 2) { for (int i = 0; i < NumAreas; i++) { - if (Areas[i].bpp >= Bpp) { + while (Areas[i].bpp >= Bpp) { Areas[i].bpp = HalfBpp; Reduced = true; } @@ -997,7 +997,7 @@ } else return; // unable to draw bitmaps - } +// } if (Reduced) { for (int i = 0; i < NumAreas; i++) { cSubtitleRegion *sr = Page->regions.Get(i);