comparison libvo/vo_vesa.c @ 12926:6eb8d78e2d47

10l query format at least when used with vidix, disable colorkeying with vidix, should fix #38 and #33

12925:2abd8e24eb69

static uint32_t query_format(uint32_t format)
{
    if(verbose > 2)
        printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format));
    return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
}

static void paintBkGnd( void )
{

		  /* set colorkey */       
		  if (vidix_grkey_support())
		  {
		    vidix_grkey_get(&gr_key);
		    gr_key.key_op = KEYS_PUT;
		    if (!(vo_colorkey & 0xFF000000))
		    {
			gr_key.ckey.op = CKEY_TRUE;
			gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16;
			gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8;
			gr_key.ckey.blue = vo_colorkey & 0x000000FF;
		    } else
			gr_key.ckey.op = CKEY_FALSE;
		    vidix_grkey_set(&gr_key);
		  }         
		  vidix_opened = 1;
		}

12926:6eb8d78e2d47

static uint32_t query_format(uint32_t format)
{
    if(verbose > 2)
        printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format));
#ifdef CONFIG_VIDIX
    if(vidix_name)return(vidix_query_fourcc(format));
#endif
    return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
}

static void paintBkGnd( void )
{

		  /* set colorkey */       
		  if (vidix_grkey_support())
		  {
		    vidix_grkey_get(&gr_key);
		    gr_key.key_op = KEYS_PUT;
#if 0
		    if (!(vo_colorkey & 0xFF000000))
		    {
			gr_key.ckey.op = CKEY_TRUE;
			gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16;
			gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8;
			gr_key.ckey.blue = vo_colorkey & 0x000000FF;
		    } else
#endif
			gr_key.ckey.op = CKEY_FALSE;
		    vidix_grkey_set(&gr_key);
		  }         
		  vidix_opened = 1;
		}