* #12475: video: added id parameter for newly decoded video streams

daemon/src/dbus/video_controls-introspec.xml

@@ -126,8 +126,11 @@
            <tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring>
         </signal>
 
-        <signal name="startedEvent" tp:name-for-bindings="startedEvent">
+        <signal name="startedDecoding" tp:name-for-bindings="startedDecoding">
             <tp:docstring>Signal triggered when video is available in a shared memory buffer.</tp:docstring>
+            <arg type="s" name="id">
+              <tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
+            </arg>
             <arg type="s" name="shmPath">
               <tp:docstring>The path of the newly created shared memory</tp:docstring>
             </arg>
@@ -139,9 +142,14 @@
             </arg>
         </signal>
 
-        <signal name="stoppedEvent" tp:name-for-bindings="stoppedEvent">
+        <signal name="stoppedDecoding" tp:name-for-bindings="stoppedDecoding">
             <tp:docstring>Signal triggered when video is no longer available in a shared memory buffer.</tp:docstring>
-            <arg type="s" name="shmPath"></arg>
+            <arg type="s" name="id">
+              <tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
+            </arg>
+            <arg type="s" name="shmPath">
+              <tp:docstring>The path of the newly created shared memory</tp:docstring>
+            </arg>
         </signal>
 
         <method name="getCurrentCodecName" tp:name-for-bindings="getCurrentCodecName">

daemon/src/sip/sipcall.cpp

@@ -49,7 +49,8 @@ SIPCall::SIPCall(const std::string& id, Call::CallType type,
     , inv(NULL)
     , audiortp_(this)
 #ifdef SFL_VIDEO
-    , videortp_(Manager::instance().getDbusManager()->getVideoControls()->getSettings())
+    // The ID is used to associate video streams to calls
+    , videortp_(id, Manager::instance().getDbusManager()->getVideoControls()->getSettings())
 #endif
     , pool_(pj_pool_create(&caching_pool->factory, id.c_str(), INITIAL_SIZE, INCREMENT_SIZE, NULL))
     , local_sdp_(new Sdp(pool_))

daemon/src/video/test/test_video_rtp.cpp

@@ -39,7 +39,7 @@
 int main ()
 {
     VideoPreference preference;
-    sfl_video::VideoRtpSession session(preference.getSettings());
+    sfl_video::VideoRtpSession session("test", preference.getSettings());
     session.start();
     sleep(10);
     session.stop();

daemon/src/video/video_preview.cpp

@@ -41,7 +41,8 @@ namespace sfl_video {
 VideoPreview::VideoPreview(const std::map<std::string, std::string> &args) :
     args_(args), receiveThread_()
 {
-    receiveThread_.reset(new VideoReceiveThread(args_));
+    const char * const LOCAL_ID = "local";
+    receiveThread_.reset(new VideoReceiveThread(LOCAL_ID, args_));
     receiveThread_->start();
 }
 

daemon/src/video/video_receive_thread.cpp

@@ -182,7 +182,7 @@ void VideoReceiveThread::setup()
     bufferSize_ = getBufferSize(dstWidth_, dstHeight_, VIDEO_RGB_FORMAT);
 
     EXIT_IF_FAIL(sink_.start(), "Cannot start shared memory sink");
-    Manager::instance().getVideoControls()->startedEvent(sink_.openedName(), dstWidth_, dstHeight_);
+    Manager::instance().getVideoControls()->startedDecoding(id_, sink_.openedName(), dstWidth_, dstHeight_);
 }
 
 void VideoReceiveThread::createScalingContext()
@@ -196,11 +196,11 @@ void VideoReceiveThread::createScalingContext()
     EXIT_IF_FAIL(imgConvertCtx_, "Cannot init the conversion context!");
 }
 
-VideoReceiveThread::VideoReceiveThread(const std::map<string, string> &args) :
+VideoReceiveThread::VideoReceiveThread(const std::string &id, const std::map<string, string> &args) :
     args_(args), frameNumber_(0), decoderCtx_(0), rawFrame_(0),
     scaledPicture_(0), streamIndex_(-1), inputCtx_(0), imgConvertCtx_(0),
     dstWidth_(0), dstHeight_(0), sink_(), receiving_(false), sdpFilename_(),
-    bufferSize_(0)
+    bufferSize_(0), id_(id)
 {}
 
 /// Copies and scales our rendered frame to the buffer pointed to by data
@@ -236,6 +236,7 @@ void VideoReceiveThread::run()
             ERROR("Couldn't read frame : %s\n", strerror(ret));
             break;
         }
+        // Guarantee that we free the packet every iteration
         PacketHandle inpacket_handle(inpacket);
 
         // is this a packet from the video stream?
@@ -255,7 +256,7 @@ void VideoReceiveThread::run()
 
 VideoReceiveThread::~VideoReceiveThread()
 {
-    Manager::instance().getVideoControls()->stoppedEvent(sink_.openedName());
+    Manager::instance().getVideoControls()->stoppedDecoding(id_, sink_.openedName());
     receiving_ = false;
     ost::Thread::terminate();
 

daemon/src/video/video_receive_thread.h

@@ -70,13 +70,14 @@ class VideoReceiveThread : public ost::Thread {
         bool receiving_;
         std::string sdpFilename_;
         size_t bufferSize_;
+        const std::string id_;
         void setup();
         void createScalingContext();
         void loadSDP();
         void fill_buffer(void *data);
 
     public:
-        VideoReceiveThread(const std::map<std::string, std::string> &args);
+        VideoReceiveThread(const std::string &id, const std::map<std::string, std::string> &args);
         virtual ~VideoReceiveThread();
         virtual void run();
 };

daemon/src/video/video_rtp_session.cpp

@@ -44,9 +44,9 @@ namespace sfl_video {
 using std::map;
 using std::string;
 
-VideoRtpSession::VideoRtpSession(const map<string, string> &txArgs) :
+VideoRtpSession::VideoRtpSession(const string &callID, const map<string, string> &txArgs) :
     sendThread_(), receiveThread_(), txArgs_(txArgs),
-    rxArgs_(), sending_(false), receiving_(false)
+    rxArgs_(), sending_(false), receiving_(false), callID_(callID)
 {
     // FIXME: bitrate must be configurable
     txArgs_["bitrate"] = "500000";
@@ -142,7 +142,7 @@ void VideoRtpSession::start()
     if (receiving_) {
         if (receiveThread_.get())
             WARN("Restarting video receiver");
-        receiveThread_.reset(new VideoReceiveThread(rxArgs_));
+        receiveThread_.reset(new VideoReceiveThread(callID_, rxArgs_));
         receiveThread_->start();
     }
     else

daemon/src/video/video_rtp_session.h

@@ -44,8 +44,8 @@ class VideoReceiveThread;
 
 class VideoRtpSession {
     public:
-        VideoRtpSession(const std::map<std::string, std::string> &txArgs);
-
+        VideoRtpSession(const std::string &callID,
+                        const std::map<std::string, std::string> &txArgs);
         void start();
         void stop();
         void updateDestination(const std::string &destination,
@@ -59,6 +59,7 @@ class VideoRtpSession {
         std::map<std::string, std::string> rxArgs_;
         bool sending_;
         bool receiving_;
+        const std::string callID_;
 };
 }
 

gnome/src/dbus/dbus.c

@@ -735,16 +735,16 @@ gboolean dbus_connect(GError **error)
         g_cclosure_user_marshal_VOID__STRING_STRING_BOOL, G_TYPE_NONE,
         G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
 
-    /* Register STRING STRING INT Marshaller */
-    dbus_g_object_register_marshaller(
-        g_cclosure_user_marshal_VOID__STRING_STRING_INT, G_TYPE_NONE,
-        G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INVALID);
-
     /* Register STRING STRING STRING Marshaller */
     dbus_g_object_register_marshaller(
         g_cclosure_user_marshal_VOID__STRING_STRING_STRING, G_TYPE_NONE,
         G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
 
+    /* Register STRING STRING INT INT Marshaller */
+    dbus_g_object_register_marshaller(
+        g_cclosure_user_marshal_VOID__STRING_STRING_INT_INT, G_TYPE_NONE,
+        G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID);
+
     DEBUG("Adding callmanager Dbus signals");
 
     /* Incoming call */
@@ -892,7 +892,6 @@ gboolean dbus_connect(GError **error)
     const gchar *videocontrols_interface = "org.sflphone.SFLphone.VideoControls";
     video_proxy = dbus_g_proxy_new_for_name(connection, dbus_message_bus_name,
             videocontrols_object_instance, videocontrols_interface);
-    g_assert(video_proxy != NULL);
     if (video_proxy == NULL) {
         ERROR("Error: Failed to connect to %s", videocontrols_object_instance);
         return FALSE;
@@ -902,16 +901,16 @@ gboolean dbus_connect(GError **error)
     dbus_g_proxy_connect_signal(video_proxy, "deviceEvent",
             G_CALLBACK(video_device_event_cb), NULL, NULL);
 
-    dbus_g_proxy_add_signal(video_proxy, "startedEvent", G_TYPE_STRING,
-            G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal(video_proxy, "startedEvent",
-            G_CALLBACK(started_video_event_cb), NULL,
+    dbus_g_proxy_add_signal(video_proxy, "startedDecoding", G_TYPE_STRING,
+            G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INVALID);
+    dbus_g_proxy_connect_signal(video_proxy, "startedDecoding",
+            G_CALLBACK(started_decoding_video_cb), NULL,
             NULL);
 
-    dbus_g_proxy_add_signal(video_proxy, "stoppedEvent",
-            G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal(video_proxy, "stoppedEvent",
-            G_CALLBACK(stopped_video_event_cb),
+    dbus_g_proxy_add_signal(video_proxy, "stoppedDecoding",
+            G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+    dbus_g_proxy_connect_signal(video_proxy, "stoppedDecoding",
+            G_CALLBACK(stopped_decoding_video_cb),
             NULL, NULL);
 #endif
 

gnome/src/dbus/marshaller.list

@@ -6,5 +6,5 @@ VOID:STRING,DOUBLE
 VOID:STRING,STRING
 VOID:STRING,INT,INT
 VOID:STRING,STRING,BOOL
-VOID:STRING,STRING,INT
 VOID:STRING,STRING,STRING
+VOID:STRING,STRING,INT,INT

gnome/src/dbus/video_controls-introspec.xml

@@ -126,8 +126,11 @@
            <tp:docstring>Signal triggered by changes in the detected v4l2 devices, e.g. a camera being unplugged.</tp:docstring>
         </signal>
 
-        <signal name="startedEvent" tp:name-for-bindings="startedEvent">
+        <signal name="startedDecoding" tp:name-for-bindings="startedDecoding">
             <tp:docstring>Signal triggered when video is available in a shared memory buffer.</tp:docstring>
+            <arg type="s" name="id">
+              <tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
+            </arg>
             <arg type="s" name="shmPath">
               <tp:docstring>The path of the newly created shared memory</tp:docstring>
             </arg>
@@ -139,9 +142,14 @@
             </arg>
         </signal>
 
-        <signal name="stoppedEvent" tp:name-for-bindings="stoppedEvent">
+        <signal name="stoppedDecoding" tp:name-for-bindings="stoppedDecoding">
             <tp:docstring>Signal triggered when video is no longer available in a shared memory buffer.</tp:docstring>
-            <arg type="s" name="shmPath"></arg>
+            <arg type="s" name="id">
+              <tp:docstring>The ID of the call associated with the video, or "local" in the case of local video</tp:docstring>
+            </arg>
+            <arg type="s" name="shmPath">
+              <tp:docstring>The path of the newly created shared memory</tp:docstring>
+            </arg>
         </signal>
 
         <method name="getCurrentCodecName" tp:name-for-bindings="getCurrentCodecName">

gnome/src/video/video_renderer.c

@@ -477,9 +477,9 @@ try_clutter_init()
 #undef PRINT_ERR
 }
 
-void started_video_event_cb(DBusGProxy *proxy UNUSED, gchar *shm_path,
-                            gint width, gint height,
-                            GError *error UNUSED, gpointer userdata UNUSED)
+void started_decoding_video_cb(DBusGProxy *proxy UNUSED,
+        gchar *id, gchar *shm_path, gint width, gint height,
+        GError *error UNUSED, gpointer userdata UNUSED)
 {
     if (!video_window) {
         video_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -529,9 +529,9 @@ void started_video_event_cb(DBusGProxy *proxy UNUSED, gchar *shm_path,
 }
 
 void
-stopped_video_event_cb(DBusGProxy *proxy UNUSED, gchar *shm_path, GError *error UNUSED, gpointer userdata UNUSED)
+stopped_decoding_video_cb(DBusGProxy *proxy UNUSED, gchar *id, gchar *shm_path, GError *error UNUSED, gpointer userdata UNUSED)
 {
-    DEBUG("Video stopped for shm:%s", shm_path);
+    DEBUG("Video stopped for id %s, shm path %s", id, shm_path);
 
     if (video_renderer_global) {
         if (video_window) {

gnome/src/video/video_renderer.h

@@ -69,10 +69,11 @@ video_renderer_run(VideoRenderer *self);
 void
 video_renderer_stop(VideoRenderer *self);
 
-void started_video_event_cb(DBusGProxy *proxy, gchar *shm_path,
-                            gint width, gint height, GError *error,
-                            gpointer userdata);
-void stopped_video_event_cb(DBusGProxy *proxy, gchar *shm_path, GError *error, gpointer userdata);
+void started_decoding_video_cb(DBusGProxy *proxy, gchar *id, gchar *shm_path,
+                               gint width, gint height, GError *error,
+                               gpointer userdata);
+void stopped_decoding_video_cb(DBusGProxy *proxy, gchar *id, gchar *shm_path,
+                               GError *error, gpointer userdata);
 
 /* Try to init the gtk clutter backend, returns TRUE on success, FALSE otherwise */
 gboolean try_clutter_init();