Changeset 31

Timestamp:

02/10/08 22:16:27 (6 months ago)

Author:

sip

Message:

Implemented mosaic position logic.

Files:

• media/Makefile (modified) (1 diff)
• media/include/log.h (modified) (5 diffs)
• media/include/mosaic.h (modified) (1 diff)
• media/include/multiconf.h (modified) (1 diff)
• media/include/partedmosaic.h (modified) (1 diff)
• media/include/videomixer.h (modified) (3 diffs)
• media/include/xmlhandler.h (modified) (1 diff)
• media/include/xmlrpcmcuclient.h (modified) (4 diffs)
• media/include/xmlrpcserver.h (modified) (1 diff)
• media/src/audiomixer.cpp (modified) (3 diffs)
• media/src/main.cpp (modified) (1 diff)
• media/src/multiconf.cpp (modified) (1 diff)
• media/src/partedmosaic.cpp (modified) (1 diff)
• media/src/videomixer.cpp (modified) (12 diffs)
• media/src/xmlhandler.cpp (modified) (1 diff)
• media/src/xmlrpcmcu.cpp (modified) (2 diffs)
• media/src/xmlrpcmcuclient.cpp (modified) (3 diffs)
• media/src/xmlrpcserver.cpp (modified) (6 diffs)

media/Makefile

@@ -3 +3 @@
-###########################################
-include ../config.mk
+
+OPTS+= -fPIC -DPIC
-
-#DEBUG

media/include/log.h

@@ -9 +9 @@
-#define log_error Error
-
-
+onst c
-{
-         
@@ -28 +28 @@
-}
-
-
+onst c
-{
-         va_list ap;
@@ -38 +38 @@
-}
-
-
+onst c
-{
-         va_list ap;
@@ -49 +49 @@
-}
-
-
+onst c
-{
-         va_list ap;
@@ -58 +58 @@
-}
-
-
+onst c
-{
-        va_list ap;

media/include/mosaic.h

@@ -12 +12 @@
-        virtual void Reset();
-
+        virtual int GetSlots()=0;
-        virtual BYTE* GetFrame() = 0;
-        virtual int GetWidth() = 0;

media/include/multiconf.h

@@ -18 +18 @@
-        int CreateParticipant();
-        int SetCompositionType(int comp,int size);
+        int SetMosaicSlot(int num,int id);
-
-        //Video

media/include/partedmosaic.h

@@ -11 +11 @@
-        PartedMosaic(int num, int size);
-        virtual ~PartedMosaic();
+
+        virtual int GetSlots();
-
-        virtual BYTE* GetFrame();

media/include/videomixer.h

@@ -33 +33 @@
-        VideoOutput* GetOutput(int id);
-        int GetCompositionType();
+        int SetSlot(int num,int id);
-        int SetCompositionType(CompositionType comp,int size);
-        int End();
@@ -38 +39 @@
-protected:
-        int MixVideo();
+        int CalculatePositions();
+        int GetPosition(int id);
-        
-private:
@@ -60 +63 @@
-        BYTE    *logo;
-        Mosaic  *mosaic;
+        int     *mosaicSlots;
+        int     *mosaicPos;
+        int     numSlots;
-
-        //Threads, mutex y condiciones

media/include/xmlhandler.h

@@ -4 +4 @@
-#include "xmlrpcserver.h"
-
-
+onst c
-xmlrpc_value* xmlok (xmlrpc_env *env,xmlrpc_value *array=NULL);
-

media/include/xmlrpcmcuclient.h

@@ -31 +31 @@
-        int CreateParticipant(int confId);
-        int SetCompositionType(int confId,int comp,int size);
+        int SetMosaicSlot(int confId,int num,int id);
-
-        //Video
@@ -54 +55 @@
-
-private:
-
+onst c
-        //Atributos
-        string serverUrl;
@@ -74 +75 @@
-int     SetCompositionType(void *mcu,int confId,int comp,int size)
-        { return ((XmlRpcMcuClient*)mcu)->SetCompositionType(confId,comp,size); }
+int     SetMosaicSlot(void *mcu,int confId,int num,int id)
+        { return ((XmlRpcMcuClient*)mcu)->SetCompositionType(confId,num,id);    }
-
-//Video
@@ -120 +123 @@
-int     CreateParticipant(void *mcu,int confId);
-int     SetCompositionType(void *mcu,int confId,int comp,int size);
+int     SetMosaicSlot(void *mcu,int confId,int num,int id);
-
-//Video

media/include/xmlrpcserver.h

@@ -16 +16 @@
-{
-public:
-
+int port
-
-        int AddHandler(string base,Handler* hnd);

media/src/audiomixer.cpp

@@ -139 +139 @@
-                 pthread_mutex_lock(&tickerMutex);
-        }
+
+        //Y desprotegemos
+        pthread_mutex_unlock(&tickerMutex);
-
-        //Logeamos
@@ -163 +166 @@
-void AudioMixer::Process(void)
-{
-
-        LstAudios::iterator     it;
-
@@ -338 +340 @@
-
-        //Si esta devolvemos el input
-;
+
-}
-

media/src/main.cpp

@@ -13 +13 @@
-#endif
-
-
+int argc,char **argv
-{
-
+
+
+
+
+
+
+
-        StatusHandler status;
-        MCU mcu;

media/src/multiconf.cpp

@@ -61 +61 @@
-        //POnemos el tipo de video mixer
-        return videoMixer.SetCompositionType((CompositionType)comp,size);
+}
+
+/************************
+* SetMosaicSlot
+*       Set slot position on mosaic
+*************************/
+int MultiConf::SetMosaicSlot(int num,int id)
+{
+        Log("-SetMosaicSlot [%d,%d]\n",num,id);
+
+        //Set it
+        return videoMixer.SetSlot(num,id);
-}
-

media/src/partedmosaic.cpp

@@ -64 +64 @@
-        //Free memory
-        free(resizer);
+}
+/*****************************
+* GetSlots
+*       Get number of slots
+*****************************/
+int PartedMosaic::GetSlots()
+{
+        return mosaicNum;
-}
-

media/src/videomixer.cpp

@@ -12 +12 @@
-{
-        //Incializamos a cero
-
+
+
+
+
-
-        //Inciamos lso mutex y la condicion
@@ -25 +28 @@
-VideoMixer::~VideoMixer()
-{
+        //If we've got mosaic
+        if (mosaic)
+                //Delete it
+                delete mosaic;
+
+        //If already have slot list
+        if (mosaicSlots)
+                //Delete it
+                free(mosaicSlots);
+
+        //If already have position list
+        if (mosaicPos)
+                //Delete it
+                free(mosaicPos);
+
-         //Liberamos los mutex
-         pthread_mutex_destroy(&mixVideoMutex);
-         pthread_cond_destroy(&mixVideoCond);
+        
-}
-
@@ -54 +73 @@
-int VideoMixer::MixVideo()
-{
-
-
-
-
+
-        LstVideos::iterator it;
-
@@ -72 +88 @@
-                {
-                        //Nos recorremos los videos
-it++
+++it
-                        {
-
-
-
+
+
-
-                                //Colocamos el frame
-video->
+
-                        }
-                }
@@ -96 +111 @@
-                        
-                //Nos recorremos los videos
-it++
+++it
-                {
-
-
-
+
+
+
+
+
-                        
-                        //If we've got a new frame on source
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -175 +199 @@
-
-        //Recorremos la lista
-it++
+++it
-                //Borramos el video
-                DeleteMixer((*it).first);
-
-        //If we've got mosaic
-        if (mosaic)
-                //Delete it
-                delete mosaic;
-
-        //Y el logo
-        //free(logo);
-
-        Log("<End videomixer\n");
@@ -220 +236 @@
-        //Y lo añadimos a la lista
-        lstVideos[id] = video;
+
+        //Calculate it's position
+        for (int i=0; i<numSlots; i++)
+                //It's free? 
+                if(mosaicPos[i]==0 && mosaicSlots[i]==0)
+                {
+                        //Here we are
+                        mosaicPos[i]=id;
+                        //Exit
+                        break;
+                }
+
+        //Log Slots
+        for (int i=0;i<numSlots;i++)
+                if (i==0)
+                        Log("-Slots [%d",mosaicSlots[i]);
+                else
+                        Log(",%d",mosaicSlots[i]);
+        Log("]\n");
+
+        //Log postions
+        for (int i=0;i<numSlots;i++)
+                if (i==0)
+                        Log("-Pos   [%d",mosaicPos[i]);
+                else
+                        Log(",%d",mosaicPos[i]);
+        Log("]\n");
-
-        //Desprotegemos la lista
@@ -322 +365 @@
-        if (it == lstVideos.end())
-        {
-D
+
-                lstVideosUse.Unlock();
-                //Salimos
@@ -333 +376 @@
-        //Lo quitamos de la lista
-        lstVideos.erase(id);
+
+        //If still mixing video
+        if (mixingVideo)
+                //Reset positions
+                for (int i=0;i<numSlots;i++)
+                        //it's me?
+                        if (mosaicPos[i]==id)
+                        {
+                                //was fixed?
+                                if (mosaicSlots[i]==id)
+                                        //lock it
+                                        mosaicSlots[i]=-1;
+                                else 
+                                        //Recalculate participant positions
+                                        CalculatePositions();
+                                
+                                //Finish
+                                break;
+                        }
-
-        //Desprotegemos la lista
@@ -412 +474 @@
-int VideoMixer::SetCompositionType(CompositionType comp, int type)
-{
-
-        Log(">SetCompositionType [%d,%d]\n",comp,type);
-
@@ -446 +507 @@
-        compositionType = comp;
-
+        //Save old values
+        int oldNumSlots = numSlots;
+        int *oldSlots = mosaicSlots;
+        int *oldPos = mosaicPos;
+
+        //Get number of participants visible
+        numSlots = mosaic->GetSlots();
+        
+        //Malloc lists
+        mosaicSlots = (int*) malloc(numSlots*sizeof(int));
+        mosaicPos = (int*) malloc(numSlots*sizeof(int));
+
+        //Reset slot list
+        memset(mosaicSlots,0,numSlots*sizeof(int));
+
+        //If we have old slots
+        if (oldSlots)
+        {
+                //Which was bigger?
+                if (oldNumSlots<numSlots)
+                        //Copy
+                        memcpy(mosaicSlots,oldSlots,oldNumSlots*sizeof(int));
+                else
+                        //Copy
+                        memcpy(mosaicSlots,oldSlots,numSlots*sizeof(int));
+        }
+        
+        
+        //If already have slot list
+        if (oldSlots)
+                //Delete it
+                free(oldSlots);
+
+        //If already have position list
+        if (oldPos)
+                //Delete it
+                free(oldPos);
+
+        //Recalculate positions
+        CalculatePositions();
+
-        //Desprotegemos la lista
-        lstVideosUse.Unlock();
@@ -454 +556 @@
-}
-
+/************************
+* CalculatePosition
+*       Calculate positions for participants
+*************************/
+int VideoMixer::CalculatePositions()
+{
+        LstVideos::iterator it;
+
+        Log(">CalculatePositions\n");
+
+        //First erase positions
+        memset(mosaicPos,0,numSlots*sizeof(int));
+
+        //Start from the begining
+        int first = 0;
+
+
+        //Iterate Videos
+        for (it=lstVideos.begin(); it!=lstVideos.end(); ++it)
+        {
+                //Get id
+                int id = (*it).first;
+
+                //Not found the first free one
+                int firstFree = -1;
+
+                //Look in the slots 
+                for (int i=first;i<numSlots;i++)
+                {
+                        //It's lock for me?
+                        if (mosaicSlots[i]==id)
+                        {
+                                //Set our position
+                                mosaicPos[i]=id;
+                                //If we were the first one
+                                if (first==i)
+                                        //Start after me next pass
+                                        first++;        
+                                //Next
+                                break;
+                        } else if (mosaicSlots[i]==-1 && i==first) {
+                                //If the first one was a locked one skip it next time
+                                first++;
+                        } else if (mosaicSlots[i]==0 && mosaicPos[i]==0 && firstFree==-1) {
+                                //If it's free and we have still not a free one save it
+                                firstFree=i;
+                        } else if (mosaicPos[i]>0 && i==first) {
+                                //The first one was already calculated
+                                first++;
+                        }
+
+                }
+
+                //I have not fixed position check if there is any free slot
+                if (firstFree!=-1)
+                {
+                        //Here we are
+                        mosaicPos[firstFree]=id;
+                        //If we were the first one
+                        if (first==firstFree)
+                                //Start after me next pass
+                                first++;        
+                }
+
+                //If we have been over the end
+                if (first==numSlots)
+                        //Exit
+                        break;
+        }       
+
+        //Log Slots
+        for (int i=0;i<numSlots;i++)
+                if (i==0)
+                        Log("-Slots [%d",mosaicSlots[i]);
+                else
+                        Log(",%d",mosaicSlots[i]);
+        Log("]\n");
+
+        //Log postions
+        for (int i=0;i<numSlots;i++)
+                if (i==0)
+                        Log("-Pos   [%d",mosaicPos[i]);
+                else
+                        Log(",%d",mosaicPos[i]);
+        Log("]\n");
+
+        Log("<CalculatePositions\n");
+}
+
+/************************
+* SetSlot
+*       Set slot participant
+*************************/
+int VideoMixer::SetSlot(int num,int id)
+{
+        Log(">SetPosition");
+
+        //Check num
+        if (num>numSlots-1)
+                //Exit
+                return Error("Slot not in mosaic \n");
+
+        //Protegemos la lista
+        lstVideosUse.WaitUnusedAndLock();
+
+        //Set it
+        mosaicSlots[num] = id;
+
+        //Calculate positions
+        CalculatePositions();
+
+        //Desprotegemos la lista
+        lstVideosUse.Unlock();
+
+        Log("<SetPosition");
+
+        return 1;
+}
+
+/************************
+* GetPosition
+*       Get position for participant
+*************************/
+int VideoMixer::GetPosition(int id)
+{
+        //Check if it has a fixed position
+        for (int i=0;i<numSlots;i++)
+                //If it's this participant
+                if (mosaicPos[i]==id)
+                        //Return it
+                        return i;
+
+        //Not found
+        return -1;
+}
+

media/src/xmlhandler.cpp

@@ -5 +5 @@
-#include "xmlhandler.h"
-
-
+onst c
-{
-        return xmlrpc_build_value(env,"{s:i,s:s}","returnCode",0,"errorMsg",msg);

media/src/xmlrpcmcu.cpp

@@ -588 +588 @@
-        //La borramos
-        int res = conf->SetCompositionType(comp,size);
+
+        //Liberamos la referencia
+        mcu->ReleaseConferenceRef(confId);
+
+        //Salimos
+        if(!res)
+                return xmlerror(env,"Error\n");
+
+        //Devolvemos el resultado
+        return xmlok(env);
+}
+
+xmlrpc_value* SetMosaicSlot(xmlrpc_env *env, xmlrpc_value *param_array, void *user_data)
+{
+        MCU *mcu = (MCU *)user_data;
+        MultiConf *conf = NULL;
+
+         //Parseamos
+        int confId;
+        int num;
+        int id;
+        xmlrpc_parse_value(env, param_array, "(iii)", &confId,&num,&id);
+
+        //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");
+
+        //Set slot
+        int res = conf->SetMosaicSlot(num,id);
-
-        //Liberamos la referencia
@@ -621 +654 @@
-        {"IsReceivingAudio",IsReceivingAudio},
-        {"SetCompositionType",SetCompositionType},
+        {"SetMosaicSlot",SetMosaicSlot},
-        {NULL,NULL}
-};

media/src/xmlrpcmcuclient.cpp

@@ -29 +29 @@
-*       Realiza una llamada a un procedimiento remoto y parsea la respuesta
-***************************************/
-
+onst c
-{
-        Log(">MakeCall  [%s]\n",method);
@@ -149 +149 @@
-        return true;
-}
+
-/************************************
-* SetCompositionType
@@ -181 +182 @@
-}
-
+/************************************
+* SetMosaicSlot
+*       MosaicSlot
+***************************************/
+int XmlRpcMcuClient::SetMosaicSlot(int confId,int num,int id)
+{
+        //Logeamos
+        Log(">SetMosaicSlot [%d,%d,%d]\n",confId,num,id);
+
+        //Los parametros
+        xmlrpc_env env;
+        xmlrpc_env_init(&env);
+        xmlrpc_value *result = NULL;
+        xmlrpc_value *params = xmlrpc_build_value(&env,"(iii)",confId,num,id);
+
+        //Llamamos
+        if (!MakeCall(&env,"SetMosaicSlot",params,&result))
+                return Error("Error al realizar la operacion\n");
+
+        //Liberamos
+        if (result)
+                xmlrpc_DECREF(result);
+        if (params)
+                xmlrpc_DECREF(params);
+        xmlrpc_env_clean(&env);
+        
+        Log("<SetMosaicSlot\n",confId);
+
+        //Salimos
+        return true;
+}
-
-/************************************

media/src/xmlrpcserver.cpp

@@ -11 +11 @@
-*       Constructor
-**************************************/
-
+int port
-{
-        char name[65];
@@ -22 +22 @@
-
-        //Le pasamos como nombre un puntero a nosotros mismos
-0x%x
+%p
-
-        //Creamos el servidor
-8080
+port
-
-        //Leemos el fichero de configuracion
@@ -43 +43 @@
-int XmlRpcServer::Start()
-{
+        Log("-Start [%p]\n",this);
-
-        return 1;
@@ -53 +54 @@
-int XmlRpcServer::Run()
-{
-0x%x
+%p
-
-        //Vamos a buscar en orden inverso
@@ -77 +78 @@
-int XmlRpcServer::Stop()
-{
+        Log("-Stop [%p]\n",this);
+
-        return 1;
-}
@@ -99 +102 @@
-
-        //Get pointer
-x
+p
-
-        //Procesamos la llamada