#include "AtmoExternalCaptureInput.h"
#include "AtmoTools.h"
+
+#if defined(_ATMO_VLC_PLUGIN_)
+
+
#ifndef INT64_C
#define INT64_C(c) c ## LL
#endif
-#if defined(_ATMO_VLC_PLUGIN_)
-
CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData) :
- CAtmoInput(pAtmoDynData),
- CThread(pAtmoDynData->getAtmoFilter())
+ CAtmoInput(pAtmoDynData)
{
- m_pCurrentFramePixels = NULL;
vlc_cond_init( &m_WakeupCond );
vlc_mutex_init( &m_WakeupLock );
- msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput created.");
-
+ m_pCurrentFramePixels = NULL;
}
#else
CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData) :
CAtmoInput(pAtmoDynData)
{
- m_hWakeupEvent = CreateEvent(NULL,ATMO_FALSE,ATMO_FALSE,NULL);
+ m_hWakeupEvent = CreateEvent(NULL,0,0,NULL);
+ InitializeCriticalSection( &m_BufferLock );
m_pCurrentFramePixels = NULL;
}
CAtmoExternalCaptureInput::~CAtmoExternalCaptureInput(void)
{
- /* if there is still an unprocessed bufferpicture do kill it */
- free( m_pCurrentFramePixels );
-
+ /* if there is still an unprocessed bufferpicture do kill it */
#if defined(_ATMO_VLC_PLUGIN_)
- vlc_cond_destroy( &m_WakeupCond );
- vlc_mutex_destroy(&m_WakeupLock);
- msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput destroyed.");
+ vlc_mutex_lock( &m_WakeupLock );
+ free( m_pCurrentFramePixels );
+ vlc_mutex_unlock( &m_WakeupLock );
+
+ vlc_cond_destroy( &m_WakeupCond );
+ vlc_mutex_destroy( &m_WakeupLock );
#else
- CloseHandle(m_hWakeupEvent);
+ EnterCriticalSection( &m_BufferLock );
+ free( m_pCurrentFramePixels );
+ LeaveCriticalSection( &m_BufferLock );
+ CloseHandle(m_hWakeupEvent);
+ DeleteCriticalSection( &m_BufferLock );
#endif
}
return ATMO_TRUE;
}
-tColorPacket CAtmoExternalCaptureInput::GetColorPacket(void)
-{
- return this->m_ColorPacket;
-}
/*
this method will be called from another thread or possible the COM Server to feed
so it's nearly impossible that two frames are delivert in the same time
the test needs and malloc needs...
*/
+#if defined(_ATMO_VLC_PLUGIN_)
+// msg_Dbg( m_pAtmoThread, "DeliverNewSourceDataPaket start...");
+ vlc_mutex_lock( &m_WakeupLock );
+#else
+ EnterCriticalSection( &m_BufferLock );
+#endif
if( !m_pCurrentFramePixels )
{
// Last Frame was processed... take this one...
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 );
+ vlc_cond_signal( &m_WakeupCond );
+ vlc_mutex_unlock( &m_WakeupLock );
+ // msg_Dbg( m_pAtmoThread, "DeliverNewSourceDataPaket done.");
#else
SetEvent(m_hWakeupEvent);
+ LeaveCriticalSection( &m_BufferLock );
#endif
}
DWORD CAtmoExternalCaptureInput::Execute(void)
{
- msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput::Execute(void)");
- int i = 0;
-
- vlc_mutex_lock( &m_WakeupLock );
+ while ((this->m_bTerminated == ATMO_FALSE) && (this->m_pAtmoThread->b_die == false)) {
+ vlc_mutex_lock( &m_WakeupLock );
+ vlc_cond_timedwait(&m_WakeupCond, &m_WakeupLock, mdate() + 75000 );
- while ((this->m_bTerminated == ATMO_FALSE) && (!vlc_object_alive (this->m_pAtmoThread) == false)) {
- int value = vlc_cond_timedwait(&m_WakeupCond, &m_WakeupLock, mdate() + INT64_C(75000));
- if(!value) {
- /* DeliverNewSourceDataPaket delivered new work for me... get it! */
+ /* DeliverNewSourceDataPaket delivered new work for me... get it! */
+ if(m_pCurrentFramePixels)
CalcColors(); // read picture and calculate colors
- this->m_FrameArrived = ATMO_TRUE;
- }
- i++;
- if(i == 100) {
- i = 0;
- }
+ vlc_mutex_unlock( &m_WakeupLock );
}
- vlc_mutex_unlock( &m_WakeupLock );
+
+ msg_Dbg( m_pAtmoThread, "DWORD CAtmoExternalCaptureInput::Execute(void) bailed out?");
return 0;
}
handles[1] = m_hWakeupEvent;
while (this->m_bTerminated == ATMO_FALSE) {
- DWORD event = WaitForMultipleObjects(2,handles,ATMO_FALSE,INFINITE);
+ DWORD event = WaitForMultipleObjects(2, &handles[0], FALSE, INFINITE);
if(event == WAIT_OBJECT_0) {
// Terminate Thread Event was set... say good bye...!
break;
}
if(event == (WAIT_OBJECT_0+1)) {
- CalcColors(); // read picture and calculate colors
- this->m_FrameArrived = ATMO_TRUE;
+ EnterCriticalSection( &m_BufferLock );
+ if(m_pCurrentFramePixels)
+ CalcColors(); // read picture and calculate colors
+ LeaveCriticalSection( &m_BufferLock );
}
}
return 0;
#endif
-void CAtmoExternalCaptureInput::WaitForNextFrame(DWORD timeout)
+void CAtmoExternalCaptureInput::CalcColors()
{
- 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);
-#endif
-
- if(this->m_pAtmoDynData)
- {
- CAtmoConfig *cfg = this->m_pAtmoDynData->getAtmoConfig();
- if(cfg)
- {
- int delay = cfg->getLiveView_FrameDelay();
- if(delay > 0)
- {
-#if defined (_ATMO_VLC_PLUGIN_)
- msleep(delay * 1000);
-#else
- Sleep(delay);
-#endif
- }
- }
- }
-}
-
-void CAtmoExternalCaptureInput::CalcColors() {
// take data from m_CurrentFrameHeader and m_pCurrentFramePixels .. process for atmo ...
tHSVColor HSV_Img[IMAGE_SIZE];
tRGBColor pixelColor;
int srcIndex,index = 0;
memset(&HSV_Img,0,sizeof(HSV_Img));
- // Convert Data to HSV values.. bla bla....
- if(m_pCurrentFramePixels!=NULL)
+ // msg_Dbg( m_pAtmoThread, "CalcColors start...");
+
+ if((m_CurrentFrameHeader.biWidth == CAP_WIDTH) && (m_CurrentFrameHeader.biHeight == CAP_HEIGHT))
{
- if((m_CurrentFrameHeader.biWidth == CAP_WIDTH) && (m_CurrentFrameHeader.biHeight == CAP_HEIGHT))
- {
- // HSVI = HSV Image allready in right format just copy the easiest task
- // und weiterverarbeiten lassen
+ // HSVI = HSV Image allready in right format just copy the easiest task
+ // und weiterverarbeiten lassen
#ifdef _ATMO_VLC_PLUGIN_
- if(m_CurrentFrameHeader.biCompression == VLC_FOURCC('H','S','V','I'))
+ if(m_CurrentFrameHeader.biCompression == VLC_FOURCC('H','S','V','I'))
#else
- if(m_CurrentFrameHeader.biCompression == MakeDword('H','S','V','I'))
+ if(m_CurrentFrameHeader.biCompression == MakeDword('H','S','V','I'))
#endif
- {
- memcpy( &HSV_Img, m_pCurrentFramePixels, CAP_WIDTH * CAP_HEIGHT * sizeof(tHSVColor));
- }
- else if(m_CurrentFrameHeader.biCompression == BI_RGB)
- {
- if(m_CurrentFrameHeader.biBitCount == 16)
- {
- unsigned short *buffer = (unsigned short *)m_pCurrentFramePixels;
-
- for(int y=0;y<CAP_HEIGHT;y++)
- {
- srcIndex = y * CAP_WIDTH;
- for(int x=0;x<CAP_WIDTH;x++)
- {
- pixelColor.b = (buffer[srcIndex] & 31) << 3;
- pixelColor.g = ((buffer[srcIndex] >> 5) & 31) << 3;
- pixelColor.r = ((buffer[srcIndex] >> 10) & 63) << 2;
- srcIndex++;
- HSV_Img[index++] = RGB2HSV(pixelColor);
- }
- }
- }
- else if(m_CurrentFrameHeader.biBitCount == 24)
- {
- for(int y=0;y<CAP_HEIGHT;y++)
- {
- srcIndex = y * (CAP_WIDTH*3);
- for(int x=0;x<CAP_WIDTH;x++)
- {
- pixelColor.b = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- pixelColor.g = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- pixelColor.r = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- HSV_Img[index++] = RGB2HSV(pixelColor);
- }
- }
- }
- else if(m_CurrentFrameHeader.biBitCount == 32)
- {
- for(int y=0;y<CAP_HEIGHT;y++)
- {
- srcIndex = y * (CAP_WIDTH*4);
- for(int x=0;x<CAP_WIDTH;x++)
- {
- pixelColor.b = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- pixelColor.g = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- pixelColor.r = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
- srcIndex++;
- HSV_Img[index++] = RGB2HSV(pixelColor);
- }
- }
- }
- }
- }
-
- /*
- if the image color format wasn't recognized - the output
- will be black (memset)
- */
-
- /*
- now convert the pixeldata into one RGB trippel for each channel,
- this is done by some very sophisticated methods and statistics ...
-
- the only thing I know - the pixel priority is controled by some
- gradients for each edge of the picture
-
- (sorry I don't know how it exactly works because the formulars
- are done by some one else...)
- */
- m_ColorPacket = CalcColorsAnalyzeHSV(this->m_pAtmoDynData->getAtmoConfig(), HSV_Img);
-
- /* remove the source buffe */
- free(m_pCurrentFramePixels);
- /*
- the buffer zereo so that deliver new data paket will wakeup the
- thread on the next frame again
- */
- m_pCurrentFramePixels = NULL;
+ {
+ memcpy( &HSV_Img, m_pCurrentFramePixels, CAP_WIDTH * CAP_HEIGHT * sizeof(tHSVColor));
+ }
+ else if(m_CurrentFrameHeader.biCompression == BI_RGB)
+ {
+ if(m_CurrentFrameHeader.biBitCount == 16)
+ {
+ unsigned short *buffer = (unsigned short *)m_pCurrentFramePixels;
+
+ for(int y=0;y<CAP_HEIGHT;y++)
+ {
+ srcIndex = y * CAP_WIDTH;
+ for(int x=0;x<CAP_WIDTH;x++)
+ {
+ pixelColor.b = (buffer[srcIndex] & 31) << 3;
+ pixelColor.g = ((buffer[srcIndex] >> 5) & 31) << 3;
+ pixelColor.r = ((buffer[srcIndex] >> 10) & 63) << 2;
+ srcIndex++;
+ HSV_Img[index++] = RGB2HSV(pixelColor);
+ }
+ }
+ }
+ else if(m_CurrentFrameHeader.biBitCount == 24)
+ {
+ for(int y=0;y<CAP_HEIGHT;y++)
+ {
+ srcIndex = y * (CAP_WIDTH*3);
+ for(int x=0;x<CAP_WIDTH;x++)
+ {
+ pixelColor.b = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ pixelColor.g = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ pixelColor.r = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ HSV_Img[index++] = RGB2HSV(pixelColor);
+ }
+ }
+ }
+ else if(m_CurrentFrameHeader.biBitCount == 32)
+ {
+ for(int y=0;y<CAP_HEIGHT;y++)
+ {
+ srcIndex = y * (CAP_WIDTH*4);
+ for(int x=0;x<CAP_WIDTH;x++)
+ {
+ pixelColor.b = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ pixelColor.g = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ pixelColor.r = ((unsigned char *)m_pCurrentFramePixels)[srcIndex++];
+ srcIndex++;
+ HSV_Img[index++] = RGB2HSV(pixelColor);
+ }
+ }
+ }
+ }
}
+ /*
+ else {
+ if the image color format wasn't recognized - the output
+ will be black (memset)
+ }
+ */
+
+ /* remove the source buffer */
+ free( m_pCurrentFramePixels );
+ m_pCurrentFramePixels = NULL;
+
+ /*
+ now convert the pixeldata into one RGB trippel for each channel,
+ this is done by some very sophisticated methods and statistics ...
+
+ the only thing I know - the pixel priority is controled by some
+ gradients for each edge of the picture
+
+ (sorry I don't know how it exactly works because the formulas
+ are done by some one else...)
+ */
+ //msg_Dbg( m_pAtmoThread, "CalcColors ende AddPacket...");
+ m_pAtmoDynData->getLivePacketQueue()->AddPacket( m_pAtmoColorCalculator->AnalyzeHSV( HSV_Img ) );
+ //msg_Dbg( m_pAtmoThread, "CalcColors ende AddPacket...done.");
}
projects / vlc / blobdiff