rc4? Re: [MPlayer-dev-eng] TODO for release? bugs status...

[Arpi]

Hi,

> > > - Re: [Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.82,1.83
> > >   This patch makes mplayer unusable in console mode, always leaves the
> > >   console in graphic mode.
> > any ideas on this one?
> > otherwise we should ignore, it was only one bugreport, zero patch...
> 
> I reported this and just asked to revert this two line patch that fixed
> nothing at all but caused troubles, at least to me.


 uninit(void)
 {
+    // not inited
+    if (!init_state) return;
     vesa_term();
     if(verbose > 2)


ok this is we're talking about.

static void *init_state = NULL; /* state before run of mplayer */

config(...){
..
                if((err=vbeSaveState(&init_state)) != VBE_OK)
                {
                        PRINT_VBE_ERR("vbeSaveState",err);
                        return -1;
                }
..
}

static void vesa_term( void ){
..
  if((err=vbeRestoreState(init_state)) != VBE_OK) PRINT_VBE_ERR("vbeRestoreState",err);
  if((err=vbeSetMode(init_mode,NULL)) != VBE_OK) PRINT_VBE_ERR("vbeSetMode",err);
..
}

int vbeRestoreState(void *data)
{
  struct LRMI_regs r;
  int retval;
  memset(&r,0,sizeof(struct LRMI_regs));
  r.eax = 0x4f04;
  r.edx = 0x02;
  r.ecx = 0x0f;
  r.es  = VirtToPhysSeg(data);
  r.ebx = VirtToPhysOff(data);
  retval = VBE_LRMI_int(0x10,&r);
  LRMI_free_real(data);
  if(!retval) return VBE_VM86_FAIL;
  retval = r.eax & 0xffff;
  if(retval == 0x4f) retval = VBE_OK;
  return retval;
}

so, if i understand right, init_state==NULL will cause sig11 in
vbeRestoreState().

also, vbeSetMode(init_mode,NULL) may cause trouble, since:

static unsigned init_mode; /* mode before run of mplayer */

is uninitialized.

> BTW, if you are in a hurry for 0.90, plz revert as I did myself.

I want to see a better fix.
That 2-liner has definitely some sence, but it may break other things, at
your sys.


A'rpi / Astral & ESP-team

--
Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu
    "However, many people beg for its inclusion in Debian. Why?" - Gabucino
  "Because having new software in Debian is good." - Josselin Mouette
"Because having good software in Debian is new." - Gabucino