[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-video-cvs
Subject:    [Video-cvs] sitelib minisite.cpp, 1.23.2.1.38.3.32.3, 1.23.2.1.38.3.32.4
From:       lijianbj () helixcommunity ! org
Date:       2012-11-22 11:10:01
[Download RAW message or body]

Update of /cvsroot/video/sitelib
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11868/video/sitelib

Modified Files:
      Tag: hxclient_5_0_1_hebe
	minisite.cpp 
Log Message:
Commit for the capture in pause state and seek-pause state.



Index: minisite.cpp
===================================================================
RCS file: /cvsroot/video/sitelib/minisite.cpp,v
retrieving revision 1.23.2.1.38.3.32.3
retrieving revision 1.23.2.1.38.3.32.4
diff -u -d -r1.23.2.1.38.3.32.3 -r1.23.2.1.38.3.32.4
--- minisite.cpp	8 Nov 2012 11:11:34 -0000	1.23.2.1.38.3.32.3
+++ minisite.cpp	22 Nov 2012 11:09:48 -0000	1.23.2.1.38.3.32.4
@@ -68,7 +68,7 @@
        m_lRefCount(0),
        m_lZOrder(lZorder),
        m_pCaptureResponse(NULL),
-       m_bBgCaptureFlag(FALSE),
+       m_bBgCaptureFlag(E_TYPE_CAPUTRUE_FLAG_NO_CAPTURE),
        m_bShowImageFlag(TRUE),
        m_effectId(0),
        m_effectValue(0.5),
@@ -821,6 +821,7 @@
 	res = HXR_RETRY;
     }
 
+	
     return res;
 }
 
@@ -849,7 +850,7 @@
     if (res == HXR_OK && bCanCapture && pCaptureResponse != NULL)
     {
 	m_pCaptureResponse = pCaptureResponse;
-	m_pCaptureResponse->AddRef();
+	//m_pCaptureResponse->AddRef();
 	m_pCaptureBuffer = pCaptureBuffer;
 	if (pOutputSize)
 	{
@@ -865,11 +866,19 @@
 
       LOGI("CMiniBaseSite::Capture  tid %u", gettid());
       m_bShowImageFlag = TRUE;	  
-      m_bBgCaptureFlag = TRUE;	  // set the capture flag 
+	  if(pOutputSize->cx != E_TYPE_STATE_BEFORE_GRAP_MANUAL_PUASE_THEN_SEEK)
+	  {
+	      m_bBgCaptureFlag = E_TYPE_CAPUTRUE_FLAG_SYNC_CAPTURE;	  // set the capture flag 
       LOGI("CMiniBaseSite::Capture m_pEvent->Wait()");
       m_pEvent->Wait();
       LOGI("CMiniBaseSite::Capture m_pEvent->Wait() finished Wait");	  
-      HX_RELEASE(m_pCaptureResponse);	  
+	  }
+	  else
+	  {
+	  	m_bBgCaptureFlag = E_TYPE_CAPUTRUE_FLAG_ASYNC_CAPTURE;
+	  }
+	  
+	  //HX_RELEASE(m_pCaptureResponse);	  
     }
 
     return res;


_______________________________________________
Video-cvs mailing list
Video-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/video-cvs
[prev in list] [next in list] [prev in thread] [next in thread]