[vlc-devel] commit: atmo filter: disable until it is fixed ( Rémi Denis-Courmont )
git version control
git at videolan.org
Tue Aug 25 16:53:47 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 25 17:53:32 2009 +0300| [b59d0081f056925f90e9f5b850f13ad416904617] | committer: Rémi Denis-Courmont
atmo filter: disable until it is fixed
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b59d0081f056925f90e9f5b850f13ad416904617
---
configure.ac | 1 -
modules/video_filter/Modules.am | 2 +-
.../video_filter/atmo/AtmoExternalCaptureInput.cpp | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 827c811..b590d02 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 4c95f6a..c5ba9a3 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 4b87363..2df7ab7 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<timeout) && !m_FrameArrived;i++)
#if defined (_ATMO_VLC_PLUGIN_)
+#error A condition variable or a semaphore is needed.
msleep(1000);
#else
Sleep(1);
More information about the vlc-devel
mailing list