Commit 17d0f722 authored by Rémi Duraffort's avatar Rémi Duraffort

screen_win32: little cleaning.

parent 406a0154
...@@ -172,7 +172,7 @@ static block_t *CaptureBlockNew( demux_t *p_demux ) ...@@ -172,7 +172,7 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
if( p_data->bmi.bmiHeader.biSize == 0 ) if( p_data->bmi.bmiHeader.biSize == 0 )
{ {
vlc_value_t val; int i_val;
/* Create the bitmap info header */ /* Create the bitmap info header */
p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width; p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width;
...@@ -186,13 +186,10 @@ static block_t *CaptureBlockNew( demux_t *p_demux ) ...@@ -186,13 +186,10 @@ static block_t *CaptureBlockNew( demux_t *p_demux )
p_data->bmi.bmiHeader.biClrUsed = 0; p_data->bmi.bmiHeader.biClrUsed = 0;
p_data->bmi.bmiHeader.biClrImportant = 0; p_data->bmi.bmiHeader.biClrImportant = 0;
var_Create( p_demux, "screen-fragment-size", i_val = var_CreateGetInteger( p_demux, "screen-fragment-size" );
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); p_data->i_fragment_size = i_val > 0 ? i_val : p_sys->fmt.video.i_height;
var_Get( p_demux, "screen-fragment-size", &val ); p_data->i_fragment_size = i_val > p_sys->fmt.video.i_height ?
p_data->i_fragment_size = p_sys->fmt.video.i_height :
val.i_int > 0 ? val.i_int : p_sys->fmt.video.i_height;
p_data->i_fragment_size =
val.i_int > p_sys->fmt.video.i_height ? p_sys->fmt.video.i_height :
p_data->i_fragment_size; p_data->i_fragment_size;
p_sys->f_fps *= (p_sys->fmt.video.i_height/p_data->i_fragment_size); p_sys->f_fps *= (p_sys->fmt.video.i_height/p_data->i_fragment_size);
p_sys->i_incr = 1000000 / p_sys->f_fps; p_sys->i_incr = 1000000 / p_sys->f_fps;
...@@ -250,7 +247,7 @@ block_t *screen_Capture( demux_t *p_demux ) ...@@ -250,7 +247,7 @@ block_t *screen_Capture( demux_t *p_demux )
if( !( p_data->p_block = CaptureBlockNew( p_demux ) ) ) if( !( p_data->p_block = CaptureBlockNew( p_demux ) ) )
{ {
msg_Warn( p_demux, "cannot get block" ); msg_Warn( p_demux, "cannot get block" );
return 0; return NULL;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment