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

List:       helix-server-cvs
Subject:    [Server-cvs] protocol/http httpprot.cpp, 1.132.2.8.4.4.8.2, 1.132.2.8.4.4.8.3
From:       henryxing () helixcommunity ! org
Date:       2013-10-18 14:48:00
[Download RAW message or body]

Update of /cvsroot/server/protocol/http
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv15902

Modified Files:
      Tag: Cobra_MVP
	httpprot.cpp 
Log Message:
Project
=====
Cobra(Server)

Overview
========
  Integrate sconverter into transfspln.so, setup sconverter to do \
transformat/transcoder when live streaming request, when switch a new channel, kill \
the previous sconverter process and setup a new one. Redirect the hls live streaming \
request, provide a real hls live to client. Setup the sconverter process and wait for \
the m3u8 file is ready before send the live hls response. 1 save transcoderĄ¯s \
information in a global variable g_pSessionProcs,  process id saved when create the \
sconverter process;  channel name and channelĄ¯s program id comes from clientĄ¯s \
request;  input port, output port and stream name was read from configure file \
mercury.cfg, they was used when setup playback response and kill existing process to \
release encoder resource. 2 the new live streaming request will break the current \
live streaming 3 add a property watcher to listen live feed broadcast, if the live \
feed is ok, transobj will receive the message to do some process(send response after \
delay 5 seconds) 4 control the process of Sconverter, when the request come, setup a \
new one to do transformat/transcode, and kill the working one 5, add an class \
IngressHandler to redirect this live streaming request and do some related process  

Cobra_MVP

Files Modified
===========
server_rn/nucleus/fs/transfs/Attic/childproc.cpp
server_rn/nucleus/fs/transfs/Attic/make_transfs
server_rn/nucleus/fs/transfs/Attic/transfob.cpp
server_rn/nucleus/fs/transfs/Attic/transfspln.cpp
server_rn/nucleus/fs/transfs/Attic/transprocs.cpp
server_rn/nucleus/fs/transfs/Attic/urlsettings.cpp
server_rn/nucleus/fs/transfs/platform/unix/Attic/childprocunix.cpp
server_rn/nucleus/fs/transfs/pub/Attic/childproc.h
server_rn/nucleus/fs/transfs/pub/Attic/transfob.h
server_rn/nucleus/fs/transfs/pub/Attic/transfspln.h
server_rn/nucleus/fs/transfs/pub/Attic/transprocs.h
server_rn/nucleus/fs/transfs/pub/Attic/urlsettings.h
server_rn/nucleus/fs/transfs/pub/platform/unix/Attic/childprocunix.h
server_rn/nucleus/installer/nucleus_inst.cpp

www/home.html
www/js/home.js

Files Addeded
===========
server_rn/nucleus/fs/transfs/Attic/ingresshandler.cpp
server_rn/nucleus/fs/transfs/pub/Attic/ingresshandler.h


Index: httpprot.cpp
===================================================================
RCS file: /cvsroot/server/protocol/http/httpprot.cpp,v
retrieving revision 1.132.2.8.4.4.8.2
retrieving revision 1.132.2.8.4.4.8.3
diff -u -d -r1.132.2.8.4.4.8.2 -r1.132.2.8.4.4.8.3
--- httpprot.cpp	25 Jul 2013 07:22:14 -0000	1.132.2.8.4.4.8.2
+++ httpprot.cpp	18 Oct 2013 14:47:55 -0000	1.132.2.8.4.4.8.3
@@ -3484,8 +3484,10 @@
     {
         INT32 val = 0;
         pClient->m_pProc->pc->registry->GetInt(m_ulRegIndex, &val, \
                pClient->m_pProc);
-
-        HX_ASSERT(val > 0);
+        //ignore this assert, 0 value of val is right if live feed registry was \
cleared early than socket close,  +        //when live feed release, the registry \
will be cleared immediatelly, if we read the value of httpclients this time, 0 will \
be returned   +        //currently do not find it will ignore other logic/functions. 
+        //HX_ASSERT(val > 0);
         if (val > 0)
         {
             val = 0;


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


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