[Phission-cvs] phission/examples/cpp/FLIROverlay_JavaModuleExample/src FLIROverlayTest.java,1.3,1.4
Brought to you by:
pthoren
Menu
▾
▴
[Phission-cvs] phission/examples/cpp/FLIROverlay_JavaModuleExample/src FLIROverlayTest.java,1.3,1.4 phEffectsThread.cpp,1.1,1.2
|
From: Philip T. <pt...@us...> - 2005-10-26 23:44:53
|
Update of /cvsroot/phission/phission/examples/cpp/FLIROverlay_JavaModuleExample/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4856/src Modified Files: FLIROverlayTest.java phEffectsThread.cpp Log Message: directors in the swig file sucked it up Added set/getOverlay(resizew,resizeh,x,y) Index: FLIROverlayTest.java =================================================================== RCS file: /cvsroot/phission/phission/examples/cpp/FLIROverlay_JavaModuleExample/src/FLIROverlayTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FLIROverlayTest.java 25 Oct 2005 22:51:54 -0000 1.3 --- FLIROverlayTest.java 26 Oct 2005 23:44:45 -0000 1.4 *************** *** 30,37 **** invert_Filter invert = new invert_Filter(); key_matte_threshold_Filter key_matte = new key_matte_threshold_Filter(120); ! //V4LCapture capture_one = new V4LCapture(); ! phAvcodecSource capture_one = new phAvcodecSource(); ! phAvcodecSource capture_two = new phAvcodecSource(); ! //V4LCapture capture_two = new V4LCapture(); phEffectsThread effects_thread = new phEffectsThread(pipeline.getLiveSourceOutput(), --- 30,37 ---- invert_Filter invert = new invert_Filter(); key_matte_threshold_Filter key_matte = new key_matte_threshold_Filter(120); ! V4LCapture capture_one = new V4LCapture(); ! //phAvcodecSource capture_one = new phAvcodecSource(); ! //phAvcodecSource capture_two = new phAvcodecSource(); ! V4LCapture capture_two = new V4LCapture(); phEffectsThread effects_thread = new phEffectsThread(pipeline.getLiveSourceOutput(), *************** *** 69,75 **** rc = system.add(capture_one); ! //capture_two.set ( 320, 240, "/dev/video2" ); ! capture_two.set( 320, 240, "./flircap.avi" ); ! capture_two.setPath("./flircap.avi"); //capture_two.setChannel ( 0 ); capture_two.setFormat ( phImageType.phImageGREY8.swigValue() ); --- 69,75 ---- rc = system.add(capture_one); ! capture_two.set ( 320, 240, "/dev/video2" ); ! //capture_two.setPath("./flircap.avi"); ! //capture_two.set( 320, 240, "./flircap.avi" ); //capture_two.setChannel ( 0 ); capture_two.setFormat ( phImageType.phImageGREY8.swigValue() ); Index: phEffectsThread.cpp =================================================================== RCS file: /cvsroot/phission/phission/examples/cpp/FLIROverlay_JavaModuleExample/src/phEffectsThread.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** phEffectsThread.cpp 23 Oct 2005 23:23:05 -0000 1.1 --- phEffectsThread.cpp 26 Oct 2005 23:44:45 -0000 1.2 *************** *** 15,21 **** this->m_input[1] = (phImage *)two; this->m_input_count = 2; ! this->m_alpha = 0.00; ! this->m_output_format = output_format; --- 15,21 ---- this->m_input[1] = (phImage *)two; this->m_input_count = 2; ! #if 0 this->m_alpha = 0.00; ! #endif this->m_output_format = output_format; *************** *** 25,28 **** --- 25,33 ---- this->m_buf_size = 0; + this->m_resize_width = 90; + this->m_resize_height = 70; + this->m_offset_x = 5; + this->m_offset_y = 45; + phTHIS_LOOSE_UNLOCK(locked); } *************** *** 169,173 **** phImageFormatToString(this->m_output_format)); ! two->resize(70,50); rc = two->convert(this->m_output_format); phPRINT_RC(rc,NULL,"two->convert(%s)", --- 174,178 ---- phImageFormatToString(this->m_output_format)); ! two->resize(this->m_resize_width,this->m_resize_height); rc = two->convert(this->m_output_format); phPRINT_RC(rc,NULL,"two->convert(%s)", *************** *** 306,315 **** phFUNCTION("phEffectsThread::run") phImage local_copy[2]; - int32_t offset_x = 5; - int32_t offset_y = -45; uint32_t i = 0; uint32_t counter = 0; int32_t direction = 1; ! for (i = 0; i < 2; i++ ) { --- 311,320 ---- phFUNCTION("phEffectsThread::run") phImage local_copy[2]; uint32_t i = 0; + #if 0 uint32_t counter = 0; int32_t direction = 1; ! #endif ! for (i = 0; i < 2; i++ ) { *************** *** 335,343 **** &(local_copy[1]), this->m_output, ! offset_x, ! offset_y ); phPRINT_RC(rc,NULL,"this->mosaic_images"); #endif if (counter == 0) { --- 340,349 ---- &(local_copy[1]), this->m_output, ! this->m_offset_x, ! this->m_offset_y ); phPRINT_RC(rc,NULL,"this->mosaic_images"); #endif + #if 0 if (counter == 0) { *************** *** 354,357 **** --- 360,364 ---- counter++; } + #endif } *************** *** 387,389 **** --- 394,453 ---- } + /* ------------------------------------------------------------------------ */ + int phEffectsThread::setOverlay( int32_t resize_width, int32_t resize_height, + int32_t x, int32_t y ) + { + phFUNCTION("phEffectsThread::setOverlay") + int locked = 0; + + phTHIS_LOCK(locked); + + this->m_resize_width = x; + this->m_resize_height = y; + this->m_offset_x = x; + this->m_offset_y = y; + + phTHIS_UNLOCK(locked); + + return phSUCCESS; + error: + + phTHIS_ERROR_UNLOCK(locked); + + return phFAIL; + } + + /* ------------------------------------------------------------------------ */ + int phEffectsThread::getOverlay( int32_t *resize_width, int32_t *resize_height, + int32_t *x, int32_t *y ) + { + phFUNCTION("phEffectsThread::getOverlay") + int locked = 0; + + phTHIS_LOCK(locked); + + if (resize_width != NULL) + *resize_width = this->m_resize_width; + if (resize_height != NULL) + *resize_height = this->m_resize_height; + if (x != NULL) + *x = this->m_offset_x; + if (y != NULL) + *y = this->m_offset_y; + + phTHIS_UNLOCK(locked); + + return phSUCCESS; + error: + + phTHIS_ERROR_UNLOCK(locked); + + return phFAIL; + + } + /* ------------------------------------------------------------------------ */ + phLiveObject *phEffectsThread::getLiveSourceOutput() + { + return this->m_output; + } |