From b59d0081f056925f90e9f5b850f13ad416904617 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 25 Aug 2009 17:53:32 +0300 Subject: [PATCH] atmo filter: disable until it is fixed --- configure.ac | 1 - modules/video_filter/Modules.am | 2 +- modules/video_filter/atmo/AtmoExternalCaptureInput.cpp | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 827c81122c..b590d02563 100644 --- a/configure.ac +++ b/configure.ac @@ -5210,7 +5210,6 @@ AC_CONFIG_FILES([ modules/stream_out/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile - modules/video_filter/atmo/Makefile modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 4c95f6a603..c5ba9a3631 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = atmo dynamicoverlay +SUBDIRS = dynamicoverlay SOURCES_mosaic = mosaic.c mosaic.h SOURCES_transform = transform.c SOURCES_invert = invert.c diff --git a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp index 4b87363cfd..2df7ab7e44 100644 --- a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp +++ b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp @@ -106,6 +106,7 @@ void CAtmoExternalCaptureInput::DeliverNewSourceDataPaket(BITMAPINFOHEADER *bmpI memcpy(m_pCurrentFramePixels,pixelData,PixelDataSize); } #if defined(_ATMO_VLC_PLUGIN_) +#error This makes no sense! vlc_mutex_lock( &m_WakeupLock ); vlc_cond_signal( &m_WakeupCond ); vlc_mutex_unlock( &m_WakeupLock ); @@ -173,8 +174,10 @@ DWORD CAtmoExternalCaptureInput::Execute(void) { void CAtmoExternalCaptureInput::WaitForNextFrame(DWORD timeout) { this->m_FrameArrived = ATMO_FALSE; +#error m_FrameArrived is not protected (no, volatile does not work) for(DWORD i=0;(i