Changeset 17

Timestamp:

08/21/07 13:29:00 (1 year ago)

Author:

sip

Message:

Fist version of Flash playback support.

Files:

• config.mk (modified) (1 diff)
• media/Makefile (modified) (5 diffs)
• media/include/FlashPlayer.h (added)
• media/include/FlashSoundHandler.h (added)
• media/include/flash.h (added)
• media/include/log.h (modified) (1 diff)
• media/include/xmlhandler.h (modified) (2 diffs)
• media/include/xmlrpcflashclient.h (added)
• media/include/xmlrpcmcu.h (deleted)
• media/src/Flash.cpp (added)
• media/src/FlashPlayer.cpp (added)
• media/src/FlashSoundHandler.cpp (added)
• media/src/clientflash.cpp (added)
• media/src/flash.cpp (added)
• media/src/flashstreamer.cpp (added)
• media/src/h263/h263codec.cpp (modified) (3 diffs)
• media/src/main.cpp (modified) (3 diffs)
• media/src/videostream.cpp (modified) (2 diffs)
• media/src/xmlhandler.cpp (modified) (2 diffs)
• media/src/xmlrpcflash.cpp (added)
• media/src/xmlrpcflashclient.cpp (added)
• media/src/xmlrpcmcu.cpp (modified) (2 diffs)

config.mk

@@ -4 +4 @@
-LOG             = yes
-DEBUG           = yes
-
+
+
+
+
-TARGET          = /usr/local
+

media/Makefile

@@ -36 +36 @@
-GSMOBJ=gsmcodec.o
-
-main.o 
+
-OBJS+= $(G711OBJ) $(H263OBJ) $(GSMOBJ) 
-OBJSCLIENT = xmlrpcclient.o xmlrpcmcuclient.o
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-###################################
@@ -53 +65 @@
-VPATH +=  %.cpp $(SRCDIR)/media/src/$(H263DIR)
-
-
+ $(GNASHINCLUDE)
-LDFLAGS+= -lavcodec -lgsm -lpthread -lswscale
-LDXMLFLAGS+= -lxmlrpc -lxmlrpc_xmlparse -lxmlrpc_xmltok -lxmlrpc_abyss -lxmlrpc_server -L$(SRCDIR)/xmlrpc/lib 
@@ -74 +86 @@
-#Targets
-############################################
-client test
+mcuclient test flashstreamer flashclient testflash
-
-mkdirs:  
@@ -80 +92 @@
-        mkdir -p $(BIN)
-clean:
-
-
+
+
+
+
-        rm -f "$(BIN)/mcu"
-        rm -f "$(BIN)/libmcuclient.so"
-        rm -f "$(BIN)/test"
+        rm -f "$(BIN)/flashstreamer"
+        rm -f "$(BIN)/libflashclient.so"
+        rm -f "$(BIN)/testflash"
-
-install:
@@ -97 +114 @@
-############################################
-
-
-
+MCU
+MCU
-
-client: $(OBJS
-
+mcuclient: $(OBJSMCU
+MCU
-
-test: client.o
-        $(CXX) $(LDXMLFLAGS) -lpthread -lcurl -o $(BIN)/test  -lmcuclient -L$(BIN) $(BUILD)/client.o
+
+ifeq ($(FLASHSTREAMER),yes)
+
+flashstreamer: $(OBJSFS) $(OBJS)
+        g++ $(LDFLAGS) $(GNASHLD) -o $(BIN)/$@ $(BUILDOBJSFS) $(BUILDOBJS) $(GNASHBASE)/backend/.libs/libgnashagg.a
+
+flashclient: $(OBJSFSCLIENT)
+        $(CXX) $(LDXMLFLAGS) -lpthread -lcurl -shared -o $(BIN)/libflashclient.so  $(BUILDOBJSFSCLIENT)
+
+testflash: clientflash.o
+        $(CXX) $(LDXMLFLAGS) -lpthread -lcurl -o $(BIN)/testflash  -lflashclient -L$(BIN) $(BUILD)/clientflash.o
+        
+
+else
+
+flashstreamer:
+
+flashclient:
+
+testflash:
+
+endif

media/include/log.h

@@ -5 +5 @@
-#include <unistd.h>
-#include <stdarg.h>
+
+#define log_msg Log
+#define log_error Error
-
-inline void LogFile(char *msg, ...)

media/include/xmlhandler.h

@@ -3 +3 @@
-#include <xmlrpc.h>
-#include "xmlrpcserver.h"
+
+xmlrpc_value* xmlerror (xmlrpc_env *env,char *msg);
+xmlrpc_value* xmlok (xmlrpc_env *env,xmlrpc_value *array=NULL);
+
+struct XmlHandlerCmd
+{
+        char * name;
+        xmlrpc_value* (*func) (xmlrpc_env *env, xmlrpc_value *param_array, void *user_data);
+};
-
-class XmlHandler :
@@ -9 +18 @@
-public:
-        XmlHandler();
+        XmlHandler(XmlHandlerCmd *cmd,void *user_data);
-        virtual int AddMethod(const char *name,xmlrpc_method method,void *user_data);
-        virtual int ProcessRequest(TSession * const r);

media/src/h263/h263codec.cpp

@@ -111 +111 @@
-int H263Encoder::OpenCodec()
-{
+        Log("-OpenCodec H263 [%dbps,%dfps]\n",bitrate,fps);
+
-        // Check
-        if (codec==NULL)
@@ -121 +123 @@
-        // Bitrate,fps
-        ctx->bit_rate           = bitrate;
-
+bitrate/fps+
-        ctx->time_base          = (AVRational){1,fps};
-2);        // about one Intra frame per second
+10);       // about one Intra frame per ten seconds
-        // Encoder quality
-        ctx->rc_min_rate        = bitrate;
@@ -132 +134 @@
-        ctx->mb_qmin = ctx->qmin= qMin;
-        ctx->mb_qmax = ctx->qmax= qMax;
-
-
-
+//
+//
+//
-        // Flags
-        ctx->flags |= CODEC_FLAG_PASS1;                 //PASS1 

media/src/main.cpp

@@ -3 +3 @@
-#include "xmlrpcserver.h"
-#include "xmlhandler.h"
-#include "xmlrpcmcu.h"
-#include "statushandler.h"
-#include "audiomixer.h"
-
-
+
+
+
+
+
+
-
-int main()
@@ -13 +17 @@
-        XmlRpcServer server;
-        StatusHandler status;
-        XmlHandler xmlrpc;
-        MCU mcu;
+        XmlHandler xmlrpc(mcuCmdList,(void*)&mcu);
+
+#ifdef FLASHSTREAMER
+        Flash flash;
+        XmlHandler xmlrpcFlash(flashCmdList,(void*)&flash);
+#endif
-
-        //Global Init
-        AudioMixer::GlobalInit();
-
-Los rpcs de la mcu
-McuCmd *cmd = (McuCmd *)mcuCmdList
+Append mcu cmd handler
+server.AddHandler(string("/mcu"),&xmlrpc)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        //Y el html
-        server.AddHandler(string("/status"),&status);
-
+#ifdef FLASHSTREAMER
+        //Init flash player
+        flash.Init();
+#endif
-        //Init de mcu
-        mcu.Init();
@@ -48 +54 @@
-        mcu.End();
-
+#ifdef FLASHSTREAMER
+        //End flash player
+        flash.End();
+#endif
+
-        //Global Init
-        AudioMixer::GlobalEnd();

media/src/videostream.cpp

@@ -47 +47 @@
-*       Fija el modo de envio de video 
-**********************************************/
-bitrate,int fps
-
-]\n",codec
+fps,int bitrate
+
+,%d]\n",codec,fps
-
-        //Comprobamos si soportamos el codec
@@ -532 +532 @@
-
-                        //Y obtenemos el siguiente tiempo
-
+frameTime+=
-                }
-

media/src/xmlhandler.cpp

@@ -4 +4 @@
-#include <log.h>
-#include "xmlhandler.h"
+
+xmlrpc_value* xmlerror (xmlrpc_env *env,char *msg)
+{
+        return xmlrpc_build_value(env,"{s:i,s:s}","returnCode",0,"errorMsg",msg);
+}
+
+xmlrpc_value* xmlok (xmlrpc_env *env,xmlrpc_value *array)
+{
+        //Si es null ponemos uno vacio
+        if (array==NULL)
+                array = xmlrpc_build_value(env,"()");
+
+        //Creamos el valor de retorno
+        xmlrpc_value *ret = xmlrpc_build_value(env,"{s:i,s:A}","returnCode",1,"returnVal",array);
+
+        //Decrementamos el contador
+        xmlrpc_DECREF(array);
+
+        //Y salimos
+        return ret;
+}
+
-
-/**************************************
@@ -18 +40 @@
-        //Creamos el registro
-        registry = xmlrpc_registry_new(&env);
+}
+
+/**************************************
+* XmlHandler
+*       Constructor
+*************************************/
+XmlHandler::XmlHandler(XmlHandlerCmd *cmd,void *user_data)
+{
+        xmlrpc_env env;
+
+        //Build the enviroment
+        xmlrpc_env_init(&env);
+
+        //Creamos el registro
+        registry = xmlrpc_registry_new(&env);
+
+        //Append commands
+        while (cmd && cmd->name)
+        {
+                //Append methods
+                AddMethod(cmd->name,cmd->func,user_data);
+                //Next
+                cmd++;
+        }
-}
-

media/src/xmlrpcmcu.cpp

@@ -1 @@
-rpcmcu
+handler
-#include "mcu.h"
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        {"CreateConference",CreateConference},
@@ -25 +623 @@
-        {NULL,NULL}
-};
-
-xmlrpc_value* xmlerror (xmlrpc_env *env,char *msg)
-{
-        return xmlrpc_build_value(env,"{s:i,s:s}","returnCode",0,"errorMsg",msg);
-}
-
-xmlrpc_value* xmlok (xmlrpc_env *env,xmlrpc_value *array=NULL)
-{
-
-        //Si es null ponemos uno vacio
-        if (array==NULL)
-                array = xmlrpc_build_value(env,"()");
-
-        //Creamos el valor de retorno
-        xmlrpc_value *ret = xmlrpc_build_value(env,"{s:i,s:A}","returnCode",1,"returnVal",array);
-
-        //Decrementamos el contador
-        xmlrpc_DECREF(array);   
-
-        //Y salimos
-        return ret;
-}
-
-//CreateConference
-xmlrpc_value* CreateConference(xmlrpc_env *env, xmlrpc_value *param_array, void *user_data)
-{
-        MCU *mcu = (MCU *)user_data;
-        MultiConf *conf = NULL;
-
-         //Parseamos
-        char *str;
-        xmlrpc_parse_value(env, param_array, "(s)", &str);
-         
-        //Creamos la conferencia
-        int confId = mcu->CreateConference(str);
-
-        //Si error
-        if (!confId>0)
-                return xmlerror(env,"No se puede crear la conferencia");
-
-        //Obtenemos la referencia
-        if(!mcu->GetConferenceRef(confId,&conf))
-                return xmlerror(env,"Conferencia borrada antes de poder iniciarse\n");
-
-        //La iniciamos
-        int res = conf->Init();
-
-        //Liberamos la referencia
-        mcu->ReleaseConferenceRef(confId);
-
-        //Salimos
-        if(!res)
-                return xmlerror(env,"No se ha podido iniciar la conferencia\n");
-
-        //Devolvemos el resultado
-        return xmlok(env,xmlrpc_build_value(env,"(i)",confId));
-}
-
-xmlrpc_value* DeleteConference(xmlrpc_env *env, xmlrpc_value *param_array, void *user_data)
-{
-        MCU *mcu = (MCU *)user_data;
-        MultiConf *conf = NULL;
-
-         //Parseamos
-        int confId;
-        xmlrpc_parse_value(env, param_array, "(i)", &confId);
-
-        //Comprobamos si ha habido error
-        if(env->fault_occurred)
-                return 0;
-
-        //Delete conference 
-        if (!mcu->DeleteConference(confId))
-                return xmlerror(env,"La conferencia no existe\n");
-
-        //Devolvemos el resultado
-        return xmlok(env);
-}
-
-xmlrpc_value* CreateParticipant(xmlrpc_env *env, xmlrpc_value *param_array, void *user_data)
-{
-        MCU *mcu = (MCU *)user_data;
-        MultiConf *conf = NULL;
-
-         //Parseamos
-        int confId;
-        xmlrpc_parse_value(env, param_array, "(i)", &confId);
-
-        //Comprobamos si ha habido error
-        if(env->fault_occurred)
-                return 0;
-         
-        //Obtenemos la referencia
-        if(!mcu->GetConferenceRef(confId,&conf))
-                return xmlerror(env,"La conferencia no existe\n");
-
-        //La borramos
-        int partId = conf->CreateParticipant();