mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
a69b3211dc
- The EIT information is now gathered in a separate thread. - The sytem time can now be synchronized to the time broadcast in the DVB data stream. This can be enabled in the "Setup" menu by setting "SetSystemTime" to 1. Note that this works only if VDR is running under a user id that has permisson to set the system time. - The new item "Schedule" in the "Main" menu opens VDR's EPG (thanks to Robert Schneider). See the MANUAL file for a detailed description. - The new setup parameters MarginStart and MarginStop define how long (in minutes) before the official start time of a broadcast VDR shall begin recording, and how long after the official end time it shall stop recording. These are used when a recording is programmed from the "Schedules" menu. - The delay value in the dvb.c.071.diff patch to the driver has been increased to '3', because on some systems the OSD was not displayed correctly. If you are running an already patched version 0.71 driver and encounter problems with the OSD, please make sure the parameter in the ddelay call is '3', not '2'. - Fixed initializing the RCU remote control code (didn't work after switching on the system). - Problematic characters in recording names (which can come from timers that are programmed via the "Schedules" menu) are now replaced by suitable substitutes.
101 lines
4.4 KiB
Diff
101 lines
4.4 KiB
Diff
--- dvb.c.001 Sun Sep 17 22:02:37 2000
|
|
+++ dvb.c Tue Oct 3 12:11:46 2000
|
|
@@ -1143,6 +1143,8 @@
|
|
{
|
|
int bpp;
|
|
int i;
|
|
+ int d, delta; //XXX kls: additional variables for data compression
|
|
+ u8 c; //XXX kls: additional variables for data compression
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
|
if (dvb->bmp_state==BMP_LOADING) {
|
|
@@ -1160,27 +1162,38 @@
|
|
if (dvb->bmp_state==BMP_LOADING)
|
|
return -1;
|
|
dvb->bmp_state=BMP_LOADING;
|
|
- if (format==BITMAP8) bpp=8;
|
|
- else if (format==BITMAP4) bpp=4;
|
|
- else if (format==BITMAP2) bpp=2;
|
|
- else if (format==BITMAP1) bpp=1;
|
|
+ if (format==BITMAP8) { bpp=8; delta = 1; } //XXX kls: initialize 'delta', too
|
|
+ else if (format==BITMAP4) { bpp=4; delta = 2; }
|
|
+ else if (format==BITMAP2) { bpp=2; delta = 4; }
|
|
+ else if (format==BITMAP1) { bpp=1; delta = 8; }
|
|
else {
|
|
dvb->bmp_state=BMP_NONE;
|
|
return -1;
|
|
}
|
|
- dvb->bmplen= (dx*dy*bpp)/8;
|
|
+ dvb->bmplen= ((dx*dy*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
|
|
dvb->bmpp=0;
|
|
if (dvb->bmplen>32768) {
|
|
dvb->bmp_state=BMP_NONE;
|
|
return -1;
|
|
}
|
|
for (i=0; i<dy; i++) {
|
|
- if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, (dx*bpp)/8)) {
|
|
+ if (copy_from_user(dvb->bmpbuf+1024+i*dx, data+i*inc, dx)) { //XXX kls: incoming data is "1 byte per pixel"
|
|
dvb->bmp_state=BMP_NONE;
|
|
return -1;
|
|
}
|
|
|
|
}
|
|
+ // XXX kls: Incoming data is always "one byte per pixel", so we need to compress
|
|
+ // the data in case we have a lower resolution than 8 bpp:
|
|
+ if (format != BITMAP8) {
|
|
+ for (i=0; i<dx*dy/delta; i++) {
|
|
+ c = ((u8 *)dvb->bmpbuf)[1024+i*delta+delta-1];
|
|
+ for (d=delta-2; d>=0; d--) {
|
|
+ c |= (((u8 *)dvb->bmpbuf)[1024+i*delta+d] << ((delta-d-1)*bpp));
|
|
+ ((u8 *)dvb->bmpbuf)[1024+i] = c;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
dvb->bmplen+=1024;
|
|
return outcom(dvb, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
|
|
}
|
|
@@ -1256,24 +1269,25 @@
|
|
int i;
|
|
|
|
w=x1-x0+1; h=y1-y0+1;
|
|
- if (inc>0)
|
|
- w=inc;
|
|
- if (w>720 || h>576)
|
|
+ if (inc<=0)
|
|
+ inc=w; //XXX kls: see dvb_4l.h: "inc<=0 uses blockwidth as linewidth"
|
|
+ if (w<=0 || w>720 || h<=0 || h>576) //XXX kls: checking lower bounds, too
|
|
return -1;
|
|
- bpp=8; //dvb->osdbpp[dvb->osdwin];
|
|
- bpl=w*bpp/8;
|
|
+ bpp=dvb->osdbpp[dvb->osdwin]+1; //XXX kls: 'bpp' needs to be taken from the window
|
|
+ bpl=((w*bpp+7)&~7)/8; //XXX kls: need to round up to include partial bytes
|
|
size=h*bpl;
|
|
- lpb=(64*1024)/bpl;
|
|
+ lpb=(32*1024)/bpl; //XXX kls: apparently 32K is the maximum possible value
|
|
bnum=size/(lpb*bpl);
|
|
brest=size-bnum*lpb*bpl;
|
|
|
|
for (i=0; i<bnum; i++) {
|
|
- LoadBitmap(dvb, BITMAP8, w, lpb, inc, data);
|
|
+ LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, lpb, inc, data); //XXX kls: need to take the format from the actual window
|
|
BlitBitmap(dvb, dvb->osdwin, x0, y0+i*lpb, 1);
|
|
- data+=bpl;
|
|
+ data+=lpb*inc; //XXX kls: incrementing must be done in "one byte per pixel"
|
|
+ ddelay(3); //XXX kls: without this the block is sometimes not fully displayed - firmware bug?
|
|
}
|
|
if (brest) {
|
|
- LoadBitmap(dvb, BITMAP8, w, brest/bpl, inc, data);
|
|
+ LoadBitmap(dvb, bpp2bit[dvb->osdbpp[dvb->osdwin]], w, brest/bpl, inc, data); //XXX kls: need to take the format from the actual window
|
|
BlitBitmap(dvb, dvb->osdwin, x0, y0+bnum*lpb, 1);
|
|
}
|
|
ReleaseBitmap(dvb);
|
|
@@ -6141,7 +6155,7 @@
|
|
init_waitqueue_head(&dvb->bmpq);
|
|
spin_lock_init (&(dvb->bmplock));
|
|
dvb->bmpp=dvb->bmplen=0;
|
|
- dvb->bmpbuf=vmalloc(32768+1024);
|
|
+ dvb->bmpbuf=vmalloc(8*32768+1024); //XXX kls: '8*' to be prepared for the maximum possible incoming data at 1 bpp
|
|
|
|
init_waitqueue_head(&dvb->debiq);
|
|
dvb->debilock=SPIN_LOCK_UNLOCKED;
|