Skip to content

V
vlc-2-2
Commit 922a7a8e authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/audio_output/waveout.c: compilation fix for --disable-plugins build.
* src/video_output/*, include/video.h: added a pf_lock/unlock fonction
   pointer that's used to lock the memory of a picture in vout_RenderPicture
   when required by the video output plugin.
* modules/video_output/directx/*: implemented pf_lock/unlock. That will fix
   the crash when pressing ctrl+alt+del.
parent f2de4386
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 92 deletions
include/video.h
View file @ 922a7a8e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* includes all common video types and constants. * includes all common video types and constants.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.61 2002/11/25 19:29:10 sam Exp $ * $Id: video.h,v 1.62 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -80,6 +80,10 @@ struct picture_t ...@@ -80,6 +80,10 @@ struct picture_t
/* The picture heap we are attached to */ /* The picture heap we are attached to */
picture_heap_t* p_heap; picture_heap_t* p_heap;
/* Some vouts require the picture to be locked before it can be modified */
int (* pf_lock) ( vout_thread_t *, picture_t * );
int (* pf_unlock) ( vout_thread_t *, picture_t * );
/* Private data - the video output plugin might want to put stuff here to /* Private data - the video output plugin might want to put stuff here to
* keep track of the picture */ * keep track of the picture */
picture_sys_t * p_sys; picture_sys_t * p_sys;
......
modules/audio_output/waveout.c
View file @ 922a7a8e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* waveout.c : Windows waveOut plugin for vlc * waveout.c : Windows waveOut plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: waveout.c,v 1.19 2003/02/20 16:07:38 gbazin Exp $ * $Id: waveout.c,v 1.20 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -93,14 +93,14 @@ typedef struct { ...@@ -93,14 +93,14 @@ typedef struct {
#endif #endif
#include <initguid.h> #include <initguid.h>
#ifndef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT #ifndef KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
#endif #endif
#ifndef KSDATAFORMAT_SUBTYPE_PCM #ifndef KKSDATAFORMAT_SUBTYPE_PCM
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
#endif #endif
#ifndef KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF #ifndef KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF
DEFINE_GUID( KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 ); DEFINE_GUID( KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
#endif #endif
/***************************************************************************** /*****************************************************************************
...@@ -480,7 +480,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format, ...@@ -480,7 +480,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
waveformat.Samples.wValidBitsPerSample = waveformat.Samples.wValidBitsPerSample =
waveformat.Format.wBitsPerSample; waveformat.Format.wBitsPerSample;
waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF; waveformat.Format.wFormatTag = WAVE_FORMAT_DOLBY_AC3_SPDIF;
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF; waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF;
break; break;
case VLC_FOURCC('f','l','3','2'): case VLC_FOURCC('f','l','3','2'):
...@@ -488,7 +488,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format, ...@@ -488,7 +488,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
waveformat.Samples.wValidBitsPerSample = waveformat.Samples.wValidBitsPerSample =
waveformat.Format.wBitsPerSample; waveformat.Format.wBitsPerSample;
waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; waveformat.Format.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_IEEE_FLOAT;
break; break;
case VLC_FOURCC('s','1','6','l'): case VLC_FOURCC('s','1','6','l'):
...@@ -496,7 +496,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format, ...@@ -496,7 +496,7 @@ static int OpenWaveOut( aout_instance_t *p_aout, int i_format,
waveformat.Samples.wValidBitsPerSample = waveformat.Samples.wValidBitsPerSample =
waveformat.Format.wBitsPerSample; waveformat.Format.wBitsPerSample;
waveformat.Format.wFormatTag = WAVE_FORMAT_PCM; waveformat.Format.wFormatTag = WAVE_FORMAT_PCM;
waveformat.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; waveformat.SubFormat = KKSDATAFORMAT_SUBTYPE_PCM;
break; break;
} }
......
modules/video_output/directx/directx.c
View file @ 922a7a8e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.c: Windows DirectX video output display method * vout.c: Windows DirectX video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: directx.c,v 1.14 2003/03/04 22:48:55 gbazin Exp $ * $Id: directx.c,v 1.15 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -83,7 +83,8 @@ static void DirectXCloseSurface ( vout_thread_t *p_vout, ...@@ -83,7 +83,8 @@ static void DirectXCloseSurface ( vout_thread_t *p_vout,
LPDIRECTDRAWSURFACE2 ); LPDIRECTDRAWSURFACE2 );
static int DirectXCreateClipper ( vout_thread_t *p_vout ); static int DirectXCreateClipper ( vout_thread_t *p_vout );
static void DirectXGetDDrawCaps ( vout_thread_t *p_vout ); static void DirectXGetDDrawCaps ( vout_thread_t *p_vout );
static int DirectXGetSurfaceDesc ( vout_thread_t *p_vout, picture_t *p_pic ); static int DirectXLockSurface ( vout_thread_t *p_vout, picture_t *p_pic );
static int DirectXUnlockSurface ( vout_thread_t *p_vout, picture_t *p_pic );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -100,12 +101,17 @@ static int DirectXGetSurfaceDesc ( vout_thread_t *p_vout, picture_t *p_pic ); ...@@ -100,12 +101,17 @@ static int DirectXGetSurfaceDesc ( vout_thread_t *p_vout, picture_t *p_pic );
"isn't recommended as usually using video memory allows to benefit from " \ "isn't recommended as usually using video memory allows to benefit from " \
"more hardware acceleration (like rescaling or YUV->RGB conversions). " \ "more hardware acceleration (like rescaling or YUV->RGB conversions). " \
"This option doesn't have any effect when using overlays." ) "This option doesn't have any effect when using overlays." )
#define TRIPLEBUF_TEXT N_("use triple buffering for overlays")
#define TRIPLEBUF_LONGTEXT N_( \
"Try to use triple bufferring when using YUV overlays. That results in " \
"much better video quality (no flickering)." )
vlc_module_begin(); vlc_module_begin();
add_category_hint( N_("Video"), NULL, VLC_FALSE ); add_category_hint( N_("Video"), NULL, VLC_FALSE );
add_bool( "directx-on-top", 0, NULL, ON_TOP_TEXT, ON_TOP_LONGTEXT, VLC_FALSE ); add_bool( "directx-on-top", 0, NULL, ON_TOP_TEXT, ON_TOP_LONGTEXT, VLC_FALSE );
add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT, VLC_TRUE ); add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT, VLC_TRUE );
add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT, VLC_TRUE ); add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT, VLC_TRUE );
add_bool( "directx-3buffering", 1, NULL, TRIPLEBUF_TEXT, TRIPLEBUF_LONGTEXT, VLC_TRUE );
set_description( _("DirectX video module") ); set_description( _("DirectX video module") );
set_capability( "video output", 100 ); set_capability( "video output", 100 );
add_shortcut( "directx" ); add_shortcut( "directx" );
...@@ -158,6 +164,7 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -158,6 +164,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->b_using_overlay = config_GetInt( p_vout, "overlay" ); p_vout->p_sys->b_using_overlay = config_GetInt( p_vout, "overlay" );
p_vout->p_sys->b_use_sysmem = config_GetInt( p_vout, "directx-use-sysmem"); p_vout->p_sys->b_use_sysmem = config_GetInt( p_vout, "directx-use-sysmem");
p_vout->p_sys->b_hw_yuv = config_GetInt( p_vout, "directx-hw-yuv" ); p_vout->p_sys->b_hw_yuv = config_GetInt( p_vout, "directx-hw-yuv" );
p_vout->p_sys->b_3buf_overlay = config_GetInt( p_vout, "directx-3buffering" );
p_vout->p_sys->b_cursor_hidden = 0; p_vout->p_sys->b_cursor_hidden = 0;
p_vout->p_sys->i_lastmoved = mdate(); p_vout->p_sys->i_lastmoved = mdate();
...@@ -518,6 +525,16 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -518,6 +525,16 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
return; return;
} }
/* Our surface can be lost so be sure to check this
* and restore it if need be */
if( IDirectDrawSurface2_IsLost( p_vout->p_sys->p_display )
== DDERR_SURFACELOST )
{
if( IDirectDrawSurface2_Restore( p_vout->p_sys->p_display ) == DD_OK &&
p_vout->p_sys->b_using_overlay )
DirectXUpdateOverlay( p_vout );
}
if( !p_vout->p_sys->b_using_overlay ) if( !p_vout->p_sys->b_using_overlay )
{ {
DDBLTFX ddbltfx; DDBLTFX ddbltfx;
...@@ -533,20 +550,6 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -533,20 +550,6 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
p_pic->p_sys->p_surface, p_pic->p_sys->p_surface,
&p_vout->p_sys->rect_src_clipped, &p_vout->p_sys->rect_src_clipped,
DDBLT_ASYNC, &ddbltfx ); DDBLT_ASYNC, &ddbltfx );
if ( dxresult == DDERR_SURFACELOST )
{
/* Our surface can be lost so be sure
* to check this and restore it if needed */
IDirectDrawSurface2_Restore( p_vout->p_sys->p_display );
/* Now that the surface has been restored try to display again */
dxresult = IDirectDrawSurface2_Blt( p_vout->p_sys->p_display,
&p_vout->p_sys->rect_dest_clipped,
p_pic->p_sys->p_surface,
&p_vout->p_sys->rect_src_clipped,
DDBLT_ASYNC, &ddbltfx );
}
if( dxresult != DD_OK ) if( dxresult != DD_OK )
{ {
msg_Warn( p_vout, "could not blit surface (error %i)", dxresult ); msg_Warn( p_vout, "could not blit surface (error %i)", dxresult );
...@@ -564,40 +567,22 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -564,40 +567,22 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
dxresult = IDirectDrawSurface2_Flip( p_pic->p_sys->p_front_surface, dxresult = IDirectDrawSurface2_Flip( p_pic->p_sys->p_front_surface,
NULL, DDFLIP_WAIT ); NULL, DDFLIP_WAIT );
if ( dxresult == DDERR_SURFACELOST )
{
/* Our surface can be lost so be sure
* to check this and restore it if needed */
IDirectDrawSurface2_Restore( p_vout->p_sys->p_display );
IDirectDrawSurface2_Restore( p_pic->p_sys->p_front_surface );
/* Now that the surface has been restored try to display again */
dxresult = IDirectDrawSurface2_Flip( p_pic->p_sys->p_front_surface,
NULL, DDFLIP_WAIT );
DirectXUpdateOverlay( p_vout );
}
if( dxresult != DD_OK ) if( dxresult != DD_OK )
{ {
msg_Warn( p_vout, "could not flip overlay (error %i)", dxresult ); msg_Warn( p_vout, "could not flip overlay (error %i)", dxresult );
} }
if( DirectXGetSurfaceDesc( p_vout, p_pic ) ) /* set currently displayed pic */
{ p_vout->p_sys->p_current_surface = p_pic->p_sys->p_front_surface;
/* AAARRGG */
msg_Err( p_vout, "cannot get surface desc" );
return;
}
if( UpdatePictureStruct( p_vout, p_pic, p_vout->output.i_chroma ) ) /* Lock surface to get all the required info */
if( DirectXLockSurface( p_vout, p_pic ) )
{ {
/* AAARRGG */ /* AAARRGG */
msg_Err( p_vout, "invalid pic chroma" ); msg_Warn( p_vout, "cannot lock surface" );
return; return;
} }
DirectXUnlockSurface( p_vout, p_pic );
/* set currently displayed pic */
p_vout->p_sys->p_current_surface = p_pic->p_sys->p_front_surface;
} }
} }
...@@ -949,14 +934,12 @@ void DirectXUpdateOverlay( vout_thread_t *p_vout ) ...@@ -949,14 +934,12 @@ void DirectXUpdateOverlay( vout_thread_t *p_vout )
&p_vout->p_sys->rect_src_clipped, &p_vout->p_sys->rect_src_clipped,
p_vout->p_sys->p_display, p_vout->p_sys->p_display,
&p_vout->p_sys->rect_dest_clipped, &p_vout->p_sys->rect_dest_clipped,
dwFlags, dwFlags, &ddofx );
&ddofx );
if(dxresult != DD_OK) if(dxresult != DD_OK)
{ {
msg_Warn( p_vout, msg_Warn( p_vout,
"DirectXUpdateOverlay cannot move or resize overlay" ); "DirectXUpdateOverlay cannot move or resize overlay" );
} }
} }
/***************************************************************************** /*****************************************************************************
...@@ -1048,13 +1031,13 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1048,13 +1031,13 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
/* Triple buffering rocks! it doesn't have any processing overhead /* Triple buffering rocks! it doesn't have any processing overhead
* (you don't have to wait for the vsync) and provides for a very nice * (you don't have to wait for the vsync) and provides for a very nice
* video quality (no tearing). */ * video quality (no tearing). */
if( p_vout->p_sys->b_3buf_overlay )
i_ret = DirectXCreateSurface( p_vout, &p_surface, i_ret = DirectXCreateSurface( p_vout, &p_surface,
p_vout->output.i_chroma, p_vout->output.i_chroma,
p_vout->p_sys->b_using_overlay, p_vout->p_sys->b_using_overlay,
2 /* number of backbuffers */ ); 2 /* number of backbuffers */ );
if( i_ret != VLC_SUCCESS ) if( !p_vout->p_sys->b_3buf_overlay || i_ret != VLC_SUCCESS )
{ {
/* Try to reduce the number of backbuffers */ /* Try to reduce the number of backbuffers */
i_ret = DirectXCreateSurface( p_vout, &p_surface, i_ret = DirectXCreateSurface( p_vout, &p_surface,
...@@ -1098,9 +1081,7 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1098,9 +1081,7 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
p_pic[0].p_sys->p_front_surface; p_pic[0].p_sys->p_front_surface;
/* Reset the front buffer memory */ /* Reset the front buffer memory */
if( !DirectXGetSurfaceDesc( p_vout, &front_pic ) && if( DirectXLockSurface( p_vout, &front_pic ) == VLC_SUCCESS )
!UpdatePictureStruct( p_vout, &front_pic,
p_vout->output.i_chroma ) )
{ {
int i,j; int i,j;
for( i = 0; i < front_pic.i_planes; i++ ) for( i = 0; i < front_pic.i_planes; i++ )
...@@ -1108,6 +1089,8 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1108,6 +1089,8 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
memset( front_pic.p[i].p_pixels + j * memset( front_pic.p[i].p_pixels + j *
front_pic.p[i].i_pitch, 127, front_pic.p[i].i_pitch, 127,
front_pic.p[i].i_visible_pitch ); front_pic.p[i].i_visible_pitch );
DirectXUnlockSurface( p_vout, &front_pic );
} }
DirectXUpdateOverlay( p_vout ); DirectXUpdateOverlay( p_vout );
...@@ -1197,6 +1180,7 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1197,6 +1180,7 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
DirectXCloseSurface( p_vout, p_surface ); DirectXCloseSurface( p_vout, p_surface );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
p_pic[0].p_sys->p_surface = p_pic[0].p_sys->p_front_surface p_pic[0].p_sys->p_surface = p_pic[0].p_sys->p_front_surface
= p_surface; = p_surface;
...@@ -1214,25 +1198,19 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1214,25 +1198,19 @@ static int NewPictureVec( vout_thread_t *p_vout, picture_t *p_pic,
{ {
p_pic[i].i_status = DESTROYED_PICTURE; p_pic[i].i_status = DESTROYED_PICTURE;
p_pic[i].i_type = DIRECT_PICTURE; p_pic[i].i_type = DIRECT_PICTURE;
p_pic[i].pf_lock = DirectXLockSurface;
p_pic[i].pf_unlock = DirectXUnlockSurface;
PP_OUTPUTPICTURE[i] = &p_pic[i]; PP_OUTPUTPICTURE[i] = &p_pic[i];
if( DirectXGetSurfaceDesc( p_vout, &p_pic[i] ) ) if( DirectXLockSurface( p_vout, &p_pic[i] ) != VLC_SUCCESS )
{ {
/* AAARRGG */ /* AAARRGG */
FreePictureVec( p_vout, p_pic, I_OUTPUTPICTURES ); FreePictureVec( p_vout, p_pic, I_OUTPUTPICTURES );
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
msg_Err( p_vout, "cannot lock surface" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
DirectXUnlockSurface( p_vout, &p_pic[i] );
if( UpdatePictureStruct(p_vout, &p_pic[i], p_vout->output.i_chroma) )
{
/* Unknown chroma, tell the guy to get lost */
msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)",
p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma );
FreePictureVec( p_vout, p_pic, I_OUTPUTPICTURES );
I_OUTPUTPICTURES = 0;
return VLC_EGENERIC;
}
} }
msg_Dbg( p_vout, "End NewPictureVec (%s)", msg_Dbg( p_vout, "End NewPictureVec (%s)",
...@@ -1370,7 +1348,10 @@ static int UpdatePictureStruct( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -1370,7 +1348,10 @@ static int UpdatePictureStruct( vout_thread_t *p_vout, picture_t *p_pic,
break; break;
default: default:
/* Not supported */ /* Unknown chroma, tell the guy to get lost */
msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)",
p_vout->output.i_chroma,
(char*)&p_vout->output.i_chroma );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -1431,12 +1412,12 @@ static void DirectXGetDDrawCaps( vout_thread_t *p_vout ) ...@@ -1431,12 +1412,12 @@ static void DirectXGetDDrawCaps( vout_thread_t *p_vout )
} }
/***************************************************************************** /*****************************************************************************
* DirectXGetSurfaceDesc: Get some more information about the surface * DirectXLockSurface: Lock surface and get picture data pointer
***************************************************************************** *****************************************************************************
* This function get and stores the surface descriptor which among things * This function locks a surface and get the surface descriptor which amongst
* has the pointer to the picture data. * other things has the pointer to the picture data.
*****************************************************************************/ *****************************************************************************/
static int DirectXGetSurfaceDesc( vout_thread_t *p_vout, picture_t *p_pic ) static int DirectXLockSurface( vout_thread_t *p_vout, picture_t *p_pic )
{ {
HRESULT dxresult; HRESULT dxresult;
...@@ -1461,20 +1442,46 @@ static int DirectXGetSurfaceDesc( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -1461,20 +1442,46 @@ static int DirectXGetSurfaceDesc( vout_thread_t *p_vout, picture_t *p_pic )
{ {
/* Your surface can be lost so be sure /* Your surface can be lost so be sure
* to check this and restore it if needed */ * to check this and restore it if needed */
dxresult = IDirectDrawSurface2_Restore( p_pic->p_sys->p_surface );
/* When using overlays with back-buffers, we need to restore
* the front buffer so the back-buffers get restored as well. */
if( p_vout->p_sys->b_using_overlay )
IDirectDrawSurface2_Restore( p_pic->p_sys->p_front_surface );
else
IDirectDrawSurface2_Restore( p_pic->p_sys->p_surface );
dxresult = IDirectDrawSurface2_Lock( p_pic->p_sys->p_surface, NULL, dxresult = IDirectDrawSurface2_Lock( p_pic->p_sys->p_surface, NULL,
&p_pic->p_sys->ddsd, &p_pic->p_sys->ddsd,
DDLOCK_WAIT, NULL); DDLOCK_WAIT, NULL);
if( dxresult == DDERR_SURFACELOST )
msg_Dbg( p_vout, "DirectXLockSurface: DDERR_SURFACELOST" );
} }
if( dxresult != DD_OK ) if( dxresult != DD_OK )
{ {
msg_Err( p_vout, "DirectXGetSurfaceDesc cannot lock surface" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
/* Unlock the Surface */ /* Now we have a pointer to the surface memory, we can update our picture
dxresult = IDirectDrawSurface2_Unlock( p_pic->p_sys->p_surface, NULL ); * structure. */
if( UpdatePictureStruct( p_vout, p_pic, p_vout->output.i_chroma )
!= VLC_SUCCESS )
{
DirectXUnlockSurface( p_vout, p_pic );
return VLC_EGENERIC;
}
else
return VLC_SUCCESS;
}
/*****************************************************************************
* DirectXUnlockSurface: Unlock a surface locked by DirectXLockSurface().
*****************************************************************************/
static int DirectXUnlockSurface( vout_thread_t *p_vout, picture_t *p_pic )
{
/* Unlock the Surface */
if( IDirectDrawSurface2_Unlock( p_pic->p_sys->p_surface, NULL ) == DD_OK )
return VLC_SUCCESS; return VLC_SUCCESS;
else
return VLC_EGENERIC;
} }
modules/video_output/directx/vout.h
View file @ 922a7a8e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.h: Windows DirectX video output header file * vout.h: Windows DirectX video output header file
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout.h,v 1.3 2002/10/25 18:17:59 sam Exp $ * $Id: vout.h,v 1.4 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -54,6 +54,7 @@ struct vout_sys_t ...@@ -54,6 +54,7 @@ struct vout_sys_t
vlc_bool_t b_using_overlay; /* Are we using an overlay surface */ vlc_bool_t b_using_overlay; /* Are we using an overlay surface */
vlc_bool_t b_use_sysmem; /* Should we use system memory for surfaces */ vlc_bool_t b_use_sysmem; /* Should we use system memory for surfaces */
vlc_bool_t b_hw_yuv; /* Should we use hardware YUV->RGB conversions */ vlc_bool_t b_hw_yuv; /* Should we use hardware YUV->RGB conversions */
vlc_bool_t b_3buf_overlay; /* Should we use triple buffered overlays */
/* size of the display */ /* size of the display */
RECT rect_display; RECT rect_display;
......
src/video_output/video_output.c
View file @ 922a7a8e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread. * thread, and destroy a previously oppened video output thread.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: video_output.c,v 1.216 2003/03/25 17:07:45 gbazin Exp $ * $Id: video_output.c,v 1.217 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -288,6 +288,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, ...@@ -288,6 +288,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
* will be initialized later in InitThread */ * will be initialized later in InitThread */
for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++) for( i_index = 0; i_index < 2 * VOUT_MAX_PICTURES; i_index++)
{ {
p_vout->p_picture[i_index].pf_lock = NULL;
p_vout->p_picture[i_index].pf_unlock = NULL;
p_vout->p_picture[i_index].i_status = FREE_PICTURE; p_vout->p_picture[i_index].i_status = FREE_PICTURE;
p_vout->p_picture[i_index].i_type = EMPTY_PICTURE; p_vout->p_picture[i_index].i_type = EMPTY_PICTURE;
} }
...@@ -796,7 +798,7 @@ static void RunThread( vout_thread_t *p_vout) ...@@ -796,7 +798,7 @@ static void RunThread( vout_thread_t *p_vout)
/* /*
* Call the plugin-specific rendering method if there is one * Call the plugin-specific rendering method if there is one
*/ */
if( p_picture != NULL && p_vout->pf_render ) if( p_picture != NULL && p_directbuffer != NULL && p_vout->pf_render )
{ {
/* Render the direct buffer returned by vout_RenderPicture */ /* Render the direct buffer returned by vout_RenderPicture */
p_vout->pf_render( p_vout, p_directbuffer ); p_vout->pf_render( p_vout, p_directbuffer );
...@@ -805,7 +807,7 @@ static void RunThread( vout_thread_t *p_vout) ...@@ -805,7 +807,7 @@ static void RunThread( vout_thread_t *p_vout)
/* /*
* Sleep, wake up * Sleep, wake up
*/ */
if( display_date != 0 ) if( display_date != 0 && p_directbuffer != NULL )
{ {
/* Store render time using a sliding mean */ /* Store render time using a sliding mean */
p_vout->render_time += mdate() - current_date; p_vout->render_time += mdate() - current_date;
...@@ -832,7 +834,7 @@ static void RunThread( vout_thread_t *p_vout) ...@@ -832,7 +834,7 @@ static void RunThread( vout_thread_t *p_vout)
/* /*
* Display the previously rendered picture * Display the previously rendered picture
*/ */
if( p_picture != NULL ) if( p_picture != NULL && p_directbuffer != NULL )
{ {
/* Display the direct buffer returned by vout_RenderPicture */ /* Display the direct buffer returned by vout_RenderPicture */
if( p_vout->pf_display ) if( p_vout->pf_display )
......
src/video_output/vout_pictures.c
View file @ 922a7a8e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_pictures.c : picture management functions * vout_pictures.c : picture management functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000 VideoLAN
* $Id: vout_pictures.c,v 1.35 2003/03/10 18:26:33 gbazin Exp $ * $Id: vout_pictures.c,v 1.36 2003/03/28 17:02:25 gbazin Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -330,10 +330,23 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -330,10 +330,23 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
/* Picture is not in a direct buffer, but is exactly the /* Picture is not in a direct buffer, but is exactly the
* same size as the direct buffers. A memcpy() is enough, * same size as the direct buffers. A memcpy() is enough,
* then render the subtitles. */ * then render the subtitles. */
if( PP_OUTPUTPICTURE[0]->pf_lock )
if( PP_OUTPUTPICTURE[0]->pf_lock( p_vout, PP_OUTPUTPICTURE[0] ) )
{
if( PP_OUTPUTPICTURE[0]->pf_unlock )
PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] );
return NULL;
}
CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] ); CopyPicture( p_vout, p_pic, PP_OUTPUTPICTURE[0] );
vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic ); vout_RenderSubPictures( p_vout, PP_OUTPUTPICTURE[0], p_subpic );
if( PP_OUTPUTPICTURE[0]->pf_unlock )
PP_OUTPUTPICTURE[0]->pf_unlock( p_vout, PP_OUTPUTPICTURE[0] );
return PP_OUTPUTPICTURE[0]; return PP_OUTPUTPICTURE[0];
} }
...@@ -342,12 +355,19 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic, ...@@ -342,12 +355,19 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
* well. This usually means software YUV, or hardware YUV with a * well. This usually means software YUV, or hardware YUV with a
* different chroma. */ * different chroma. */
if( p_vout->p_picture[0].pf_lock )
if( p_vout->p_picture[0].pf_lock( p_vout, &p_vout->p_picture[0] ) )
return NULL;
/* Convert image to the first direct buffer */ /* Convert image to the first direct buffer */
p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] ); p_vout->chroma.pf_convert( p_vout, p_pic, &p_vout->p_picture[0] );
/* Render subpictures on the first direct buffer */ /* Render subpictures on the first direct buffer */
vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], p_subpic ); vout_RenderSubPictures( p_vout, &p_vout->p_picture[0], p_subpic );
if( p_vout->p_picture[0].pf_unlock )
p_vout->p_picture[0].pf_unlock( p_vout, &p_vout->p_picture[0] );
return &p_vout->p_picture[0]; return &p_vout->p_picture[0];
} }
......
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