Changeset 44

Timestamp:

05/04/08 16:50:54 (4 months ago)

Author:

sip

Message:

Minor fix and add watcher ouput

Files:

• media/include/videomixer.h (modified) (2 diffs)
• media/src/videomixer.cpp (modified) (12 diffs)

media/include/videomixer.h

@@ -36 +36 @@
-        VideoInput*  GetInput(int id);
-        VideoOutput* GetOutput(int id);
+        int SetWatcher(VideoOutput* watcher);
-        int GetCompositionType();
-        int SetSlot(int num,int id);
@@ -71 +72 @@
-        int     numSlots;
-
+        //Watcher output
+        VideoOutput *watcher;
+
-        //Threads, mutex y condiciones
-        pthread_t       mixVideoThread;

media/src/videomixer.cpp

@@ -17 +17 @@
-        mosaicPos       = NULL;
-        numSlots        = 0;
+
+        //No watcher
+        watcher = NULL;
-
-        //Inciamos lso mutex y la condicion
@@ -97 +100 @@
-                                input->SetFrame(mosaic->GetFrame(),mosaic->GetWidth(),mosaic->GetHeight());
-                        }
+
+                        //If been watched
+                        if (watcher)
+                                //Put frame
+                                watcher->NextFrame(mosaic->GetFrame());
+                        
+                        //Reset
+                        mosaic->Reset();
-                }
-
-                //Reset
-                mosaic->Reset();
-
-                //Desprotege la lista
@@ -107 +116 @@
-                //Esperamos que nos señalicen
-                pthread_cond_wait(&mixVideoCond,&mixVideoMutex);
+
-
-                //Protegemos la lista
@@ -127 +137 @@
-
-                                //If it's visible
-
+-
-                                        //Change mosaic
-id-1
+pos
-                        }
-                }
-
+                //Desprotege la lista
+                lstVideosUse.DecUse();
+
-                //Desbloqueamos
-                pthread_mutex_unlock(&mixVideoMutex);
-                        
-                //Desprotege la lista
-                lstVideosUse.DecUse();
-        }
-
@@ -159 +169 @@
-        // Estamos mzclando
-        mixingVideo = true;
+
+        //Calculate Init position
+        CalculatePositions();
-
-        //Y arrancamoe el thread
@@ -199 +212 @@
-        Log("<End videomixer\n");
-        
+        return 1;
+}
+
+/***********************
+* CreateMixer
+*       Crea una nuevo source de video para mezclar
+***************************/
+int VideoMixer::SetWatcher(VideoOutput* w)
+{
+        //Protegemos la lista
+        lstVideosUse.WaitUnusedAndLock();
+
+        //Set watcher
+        watcher = w;
+
+        //If it's not null
+        if (watcher)
+                //Set width
+                watcher->SetVideoSize(mosaic->GetWidth(),mosaic->GetHeight());
+
+        //Desprotegemos la lista
+        lstVideosUse.Unlock();
+
+        //Ok
-        return 1;
-}
@@ -394 +431 @@
-                        }
-
+        //Signal for new video
+        pthread_cond_signal(&mixVideoCond);
+
-        //Desprotegemos la lista
-        lstVideosUse.Unlock();
@@ -552 +592 @@
-        CalculatePositions();
-
+        //If we have watcher
+        if (watcher)
+                //Set size
+                watcher->SetVideoSize(mosaic->GetWidth(),mosaic->GetHeight());
+
+        //Signal for new video
+        pthread_cond_signal(&mixVideoCond);
+
-        //Desprotegemos la lista
-        lstVideosUse.Unlock();
@@ -601 +649 @@
-                                        //Start after me next pass
-                                        first++;        
+                                //It's locked
+                                firstFree = -1;
-                                //Next
-                                break;
@@ -635 +685 @@
-        }       
-
-        //For each slot
-        for (int i=0;i<numSlots;i++)
-                //If we empty slot
-                if (mosaicPos[i]<=0)
-                        //Print it
-                        mosaic->Update(i,logo.GetFrame(),logo.GetWidth(),logo.GetHeight());
-
-        //Log Slots
-        for (int i=0;i<numSlots;i++)
@@ -658 +701 @@
-        Log("]\n");
-
+        //For each slot
+        for (int i=0;i<numSlots;i++)
+                //If we empty slot
+                if (mosaicPos[i]<=0)
+                        //Print it
+                        mosaic->Update(i,logo.GetFrame(),logo.GetWidth(),logo.GetHeight());
+
+
-        Log("<CalculatePositions\n");
-}
@@ -676 +727 @@
-        //Protegemos la lista
-        lstVideosUse.WaitUnusedAndLock();
+
+        //If we fix a participant
+        if (id!=-1)
+                //Chek if it was alredy a slot in use for this user
+                for (int i=0;i<numSlots;i++)
+                        //It was the user?
+                        if (mosaicSlots[i]==id)
+                        {
+                                //Set it free
+                                mosaicSlots[i] = 0;
+                                //Break
+                                break;
+                        } 
-
-        //Set it