Changeset 3893 for pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Dec 1, 2011 10:49:07 AM (12 years ago)

Author:

ming

Message:

Closed #1420: Add support for event manager

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -148 +148 @@
     pj_uint32_t              last_dec_ts;    /**< Last decoded timestamp.   */
     int                      last_dec_seq;   /**< Last decoded sequence.    */
-
-    pjmedia_event_subscription esub_codec;   /**< To subscribe codec events */
-    pjmedia_event_publisher    epub;         /**< To publish events         */
 };
 
@@ -340 +337 @@
  * Handle events from stream components.
  */
-static pj_status_t stream_event_cb(pjmedia_event_subscription *esub,
-                                   pjmedia_event *event)
-{
-    pjmedia_vid_stream *stream = (pjmedia_vid_stream*)esub->user_data;
-
-    if (esub == &stream->esub_codec) {
+static pj_status_t stream_event_cb(pjmedia_event *event,
+                                   void *user_data)
+{
+    pjmedia_vid_stream *stream = (pjmedia_vid_stream*)user_data;
+
+    if (event->epub == stream->codec) {
         /* This is codec event */
         switch (event->type) {
         case PJMEDIA_EVENT_FMT_CHANGED:
-            /* we process the event */
-            ++event->proc_cnt;
-
             /* Copy the event to avoid deadlock if we publish the event
              * now. This happens because fmt_event may trigger restart
@@ -363 +357 @@
     }
 
-    return pjmedia_event_publish(&stream->epub, event);
-}
-
-static pjmedia_event_publisher *port_get_epub(pjmedia_port *port)
-{
-    pjmedia_vid_stream *stream = (pjmedia_vid_stream*) port->port_data.pdata;
-    return &stream->epub;
+    return pjmedia_event_publish(NULL, stream, event, 0);
 }
 
@@ -1032 +1020 @@
 
                 /* Publish PJMEDIA_EVENT_FMT_CHANGED event */
-                if (pjmedia_event_publisher_has_sub(&stream->epub)) {
+                {
                     pjmedia_event event;
 
@@ -1038 +1026 @@
 
                     pjmedia_event_init(&event, PJMEDIA_EVENT_FMT_CHANGED,
-                                       &frame->timestamp, &stream->epub);
+                                       &frame->timestamp, &stream);
                     event.data.fmt_changed.dir = PJMEDIA_DIR_DECODING;
                     pj_memcpy(&event.data.fmt_changed.new_fmt,
                               &stream->info.codec_param->dec_fmt,
                               sizeof(pjmedia_format));
-                    pjmedia_event_publish(&stream->epub, &event);
+                    pjmedia_event_publish(NULL, stream, &event, 0);
                 }
             }
@@ -1087 +1075 @@
                       "changed");
 
-        pjmedia_event_publish(&stream->epub, &stream->fmt_event);
+        pjmedia_event_publish(NULL, stream, &stream->fmt_event, 0);
 
         stream->fmt_event.type = PJMEDIA_EVENT_NONE;
@@ -1212 +1200 @@
     /* Init port. */
     channel->port.port_data.pdata = stream;
-    channel->port.get_event_pub = &port_get_epub;
 
     PJ_LOG(5, (name.ptr,
@@ -1346 +1333 @@
         return status;
 
-    /* Init event publisher and subscribe to codec events */
-    pjmedia_event_publisher_init(&stream->epub, SIGNATURE);
-    pjmedia_event_subscription_init(&stream->esub_codec, &stream_event_cb,
-                                    stream);
-    pjmedia_event_subscribe(&stream->codec->epub, &stream->esub_codec);
+    /* Subscribe to codec events */
+    pjmedia_event_subscribe(NULL, pool, &stream_event_cb, stream,
+                            stream->codec);
 
     /* Estimate the maximum frame size */
@@ -1557 +1542 @@
     /* Free codec. */
     if (stream->codec) {
+        pjmedia_event_unsubscribe(NULL, &stream_event_cb, stream,
+                                  stream->codec);
         pjmedia_vid_codec_close(stream->codec);
         pjmedia_vid_codec_mgr_dealloc_codec(stream->codec_mgr, stream->codec);