/*****************************************************************************
* win32.c: Screen capture module.
*****************************************************************************
- * Copyright (C) 2004-2008 the VideoLAN team
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "screen.h"
-#ifndef CAPTUREBLT
-# define CAPTUREBLT (DWORD)0x40000000 /* Include layered windows */
-#endif
-
struct screen_data_t
{
HDC hdc_src;
return VLC_ENOMEM;
/* Get the device context for the whole screen */
- p_data->hdc_src = CreateDC( "DISPLAY", NULL, NULL, NULL );
+ p_data->hdc_src = CreateDC( TEXT("DISPLAY"), NULL, NULL, NULL );
if( !p_data->hdc_src )
{
msg_Err( p_demux, "cannot get device context" );
case 32:
i_chroma = VLC_CODEC_RGB32; break;
default:
- msg_Err( p_demux, "unknown screen depth %i",
- p_sys->fmt.video.i_bits_per_pixel );
+ msg_Err( p_demux, "unknown screen depth %i", i_bits_per_pixel );
DeleteDC( p_data->hdc_dst );
ReleaseDC( 0, p_data->hdc_src );
free( p_data );
}
es_format_Init( &p_sys->fmt, VIDEO_ES, i_chroma );
- p_sys->fmt.video.i_visible_width =
- p_sys->fmt.video.i_width = GetDeviceCaps( p_data->hdc_src, HORZRES );
+ p_sys->fmt.video.i_visible_width =
+ p_sys->fmt.video.i_width = GetDeviceCaps( p_data->hdc_src, HORZRES );
p_sys->fmt.video.i_visible_height =
- p_sys->fmt.video.i_height = GetDeviceCaps( p_data->hdc_src, VERTRES );
+ p_sys->fmt.video.i_height = GetDeviceCaps( p_data->hdc_src, VERTRES );
p_sys->fmt.video.i_bits_per_pixel = i_bits_per_pixel;
- p_sys->fmt.video.i_chroma = i_chroma;
+ p_sys->fmt.video.i_chroma = i_chroma;
switch( i_chroma )
{
break;
}
-
return VLC_SUCCESS;
}
static void CaptureBlockRelease( block_t *p_block )
{
- DeleteObject( ((block_sys_t *)p_block)->hbmp );
+ DeleteObject( ((struct block_sys_t *)p_block)->hbmp );
free( p_block );
}
{
demux_sys_t *p_sys = p_demux->p_sys;
screen_data_t *p_data = p_sys->p_data;
- block_sys_t *p_block;
+ struct block_sys_t *p_block;
void *p_buffer;
int i_buffer;
HBITMAP hbmp;
{
int i_val;
/* Create the bitmap info header */
- p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
- p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width;
- p_data->bmi.bmiHeader.biHeight = - p_sys->fmt.video.i_height;
- p_data->bmi.bmiHeader.biPlanes = 1;
- p_data->bmi.bmiHeader.biBitCount = p_sys->fmt.video.i_bits_per_pixel;
- p_data->bmi.bmiHeader.biCompression = BI_RGB;
- p_data->bmi.bmiHeader.biSizeImage = 0;
- p_data->bmi.bmiHeader.biXPelsPerMeter =
- p_data->bmi.bmiHeader.biYPelsPerMeter = 0;
- p_data->bmi.bmiHeader.biClrUsed = 0;
- p_data->bmi.bmiHeader.biClrImportant = 0;
+ p_data->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+ p_data->bmi.bmiHeader.biWidth = p_sys->fmt.video.i_width;
+ p_data->bmi.bmiHeader.biHeight = - p_sys->fmt.video.i_height;
+ p_data->bmi.bmiHeader.biPlanes = 1;
+ p_data->bmi.bmiHeader.biBitCount = p_sys->fmt.video.i_bits_per_pixel;
+ p_data->bmi.bmiHeader.biCompression = BI_RGB;
+ p_data->bmi.bmiHeader.biSizeImage = 0;
+ p_data->bmi.bmiHeader.biXPelsPerMeter = 0;
+ p_data->bmi.bmiHeader.biYPelsPerMeter = 0;
+ p_data->bmi.bmiHeader.biClrUsed = 0;
+ p_data->bmi.bmiHeader.biClrImportant = 0;
i_val = var_CreateGetInteger( p_demux, "screen-fragment-size" );
- p_data->i_fragment_size = i_val > 0 ? i_val : p_sys->fmt.video.i_height;
- p_data->i_fragment_size = i_val > p_sys->fmt.video.i_height ?
- p_sys->fmt.video.i_height :
+ p_data->i_fragment_size = i_val > 0 ? i_val : (int)p_sys->fmt.video.i_height;
+ p_data->i_fragment_size = i_val > (int)p_sys->fmt.video.i_height ?
+ (int)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;
if( !hbmp || !p_buffer )
{
msg_Err( p_demux, "cannot create bitmap" );
- if( hbmp ) DeleteObject( hbmp );
- return NULL;
+ goto error;
}
/* Select the bitmap into the compatible DC */
if( !p_data->hgdi_backup )
{
msg_Err( p_demux, "cannot select bitmap" );
- DeleteObject( hbmp );
- return NULL;
+ goto error;
}
/* Build block */
- if( !(p_block = malloc( sizeof( block_t ) + sizeof( block_sys_t ) )) )
- {
- DeleteObject( hbmp );
- return NULL;
- }
+ if( !(p_block = malloc( sizeof( block_t ) + sizeof( struct block_sys_t ) )) )
+ goto error;
+
/* Fill all fields */
i_buffer = (p_sys->fmt.video.i_bits_per_pixel + 7) / 8 *
p_sys->fmt.video.i_width * p_sys->fmt.video.i_height;
p_block->hbmp = hbmp;
return &p_block->self;
+
+error:
+ if( hbmp ) DeleteObject( hbmp );
+ return NULL;
}
block_t *screen_Capture( demux_t *p_demux )
projects / vlc / blobdiff