Commit b59d0081 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

atmo filter: disable until it is fixed

parent fa7f6b7d
...@@ -5210,7 +5210,6 @@ AC_CONFIG_FILES([ ...@@ -5210,7 +5210,6 @@ AC_CONFIG_FILES([
modules/stream_out/Makefile modules/stream_out/Makefile
modules/video_chroma/Makefile modules/video_chroma/Makefile
modules/video_filter/Makefile modules/video_filter/Makefile
modules/video_filter/atmo/Makefile
modules/video_filter/dynamicoverlay/Makefile modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile modules/video_output/Makefile
modules/video_output/msw/Makefile modules/video_output/msw/Makefile
......
SUBDIRS = atmo dynamicoverlay SUBDIRS = dynamicoverlay
SOURCES_mosaic = mosaic.c mosaic.h SOURCES_mosaic = mosaic.c mosaic.h
SOURCES_transform = transform.c SOURCES_transform = transform.c
SOURCES_invert = invert.c SOURCES_invert = invert.c
......
...@@ -106,6 +106,7 @@ void CAtmoExternalCaptureInput::DeliverNewSourceDataPaket(BITMAPINFOHEADER *bmpI ...@@ -106,6 +106,7 @@ void CAtmoExternalCaptureInput::DeliverNewSourceDataPaket(BITMAPINFOHEADER *bmpI
memcpy(m_pCurrentFramePixels,pixelData,PixelDataSize); memcpy(m_pCurrentFramePixels,pixelData,PixelDataSize);
} }
#if defined(_ATMO_VLC_PLUGIN_) #if defined(_ATMO_VLC_PLUGIN_)
#error This makes no sense!
vlc_mutex_lock( &m_WakeupLock ); vlc_mutex_lock( &m_WakeupLock );
vlc_cond_signal( &m_WakeupCond ); vlc_cond_signal( &m_WakeupCond );
vlc_mutex_unlock( &m_WakeupLock ); vlc_mutex_unlock( &m_WakeupLock );
...@@ -173,8 +174,10 @@ DWORD CAtmoExternalCaptureInput::Execute(void) { ...@@ -173,8 +174,10 @@ DWORD CAtmoExternalCaptureInput::Execute(void) {
void CAtmoExternalCaptureInput::WaitForNextFrame(DWORD timeout) void CAtmoExternalCaptureInput::WaitForNextFrame(DWORD timeout)
{ {
this->m_FrameArrived = ATMO_FALSE; 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++) for(DWORD i=0;(i<timeout) && !m_FrameArrived;i++)
#if defined (_ATMO_VLC_PLUGIN_) #if defined (_ATMO_VLC_PLUGIN_)
#error A condition variable or a semaphore is needed.
msleep(1000); msleep(1000);
#else #else
Sleep(1); Sleep(1);
......
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