comparison libvo/vo_x11.c @ 4718:c70b0c4b85f5

avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used

4717:b7054dadd2c0

static uint32_t image_width;
static uint32_t image_height;
static uint32_t in_format;
static uint32_t out_format=0;
static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing

static void check_events(){
  vo_x11_check_events(mDisplay);
}

 static uint32_t vm_width;
 static uint32_t vm_height;
#endif

 in_format=format;
 
 if( flags&0x03 ) fullscreen = 1;
 if( flags&0x02 ) vm = 1;
 if( flags&0x08 ) Flip_Flag = 1;
 zoomFlag = flags&0x04;

	 	     out_format= IMGFMT_BGR16;
          	  }break;
   	default:  draw_alpha_fnc=draw_alpha_null;
  }

  /* no scaling here, it will be changed during draw_slice if -zoom is on so we dont dupplicate the code */
  swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format );

//  printf( "X11 color mask:  R:%lX  G:%lX  B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );

  // If we have blue in the lowest bit then obviously RGB
  mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;

    old_vo_dwidth=  vo_dwidth;
    old_vo_dheight= vo_dheight;

    if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed

    swsContext= getSwsContextFromCmdLine(oldContext->srcW, oldContext->srcH, in_format, 
    					 newW, newH, out_format);
    if(swsContext)
    {
	image_width= (newW+7)&(~7);
	image_height= newH;

4718:c70b0c4b85f5

static uint32_t image_width;
static uint32_t image_height;
static uint32_t in_format;
static uint32_t out_format=0;
static int srcW=-1;
static int srcH=-1;
static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing

static void check_events(){
  vo_x11_check_events(mDisplay);
}

 static uint32_t vm_width;
 static uint32_t vm_height;
#endif

 in_format=format;
 srcW= width;
 srcH= height;
 
 if( flags&0x03 ) fullscreen = 1;
 if( flags&0x02 ) vm = 1;
 if( flags&0x08 ) Flip_Flag = 1;
 zoomFlag = flags&0x04;

	 	     out_format= IMGFMT_BGR16;
          	  }break;
   	default:  draw_alpha_fnc=draw_alpha_null;
  }

  /* we avoid unnecessary allocating the swsContext here as it is allocated during draw_slice if zoom is on */
  if(!zoomFlag)
	swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format );

//  printf( "X11 color mask:  R:%lX  G:%lX  B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask );

  // If we have blue in the lowest bit then obviously RGB
  mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR;

    old_vo_dwidth=  vo_dwidth;
    old_vo_dheight= vo_dheight;

    if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed

    swsContext= getSwsContextFromCmdLine(srcW, srcH, in_format, 
    					 newW, newH, out_format);
    if(swsContext)
    {
	image_width= (newW+7)&(~7);
	image_height= newH;