Changeset 3617 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

Timestamp:

Jul 12, 2011 3:05:35 AM (13 years ago)

Author:

bennylp

Message:

Initial implementation of re #1284 (Event Framework). Current event has been converted to the new framework. Next to convert is codec event

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (9 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -148 +148 @@
     pjmedia_format              *new_fmt;
     pjmedia_rect_size           *new_disp_size;
+    pj_timestamp                 last_ts;
 
 #if SDL_VERSION_ATLEAST(1,3,0)
@@ -684 +685 @@
 {
     struct sdl_stream *strm = (struct sdl_stream*)data;
+    pj_bool_t notify_wnd_closed_event = PJ_FALSE;
+    pj_status_t saved_stream_status;
 #endif
 
@@ -734 +737 @@
     {
         SDL_Event sevent;
-        pjmedia_vid_event pevent;
+        pjmedia_event pevent;
 
 #if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL
@@ -752 +755 @@
          */
         while (SDL_PollEvent(&sevent)) {
-            pj_bzero(&pevent, sizeof(pevent));
+            pjmedia_event_init(&pevent, PJMEDIA_EVENT_NONE, &strm->last_ts,
+                               &strm->base.epub);
 
             switch(sevent.type) {
                 case SDL_MOUSEBUTTONDOWN:
-                    pevent.event_type = PJMEDIA_EVENT_MOUSEBUTTONDOWN;
+                    pevent.type = PJMEDIA_EVENT_MOUSE_BTN_DOWN;
                     break;
 #if SDL_VERSION_ATLEAST(1,3,0)
@@ -762 +766 @@
                     switch (sevent.window.event) {
                         case SDL_WINDOWEVENT_RESIZED:
-                            pevent.event_type = PJMEDIA_EVENT_WINDOW_RESIZE;
-                            pevent.event_desc.resize.new_size.w =
+                            pevent.type = PJMEDIA_EVENT_WND_RESIZED;
+                            pevent.data.wnd_resized.new_size.w =
                                 sevent.window.data1;
-                            pevent.event_desc.resize.new_size.h =
+                            pevent.data.wnd_resized.new_size.h =
                                 sevent.window.data2;
                             break;
@@ -772 +776 @@
 #else
                 case SDL_VIDEORESIZE:
-                    pevent.event_type = PJMEDIA_EVENT_WINDOW_RESIZE;
-                    pevent.event_desc.resize.new_size.w = sevent.resize.w;
-                    pevent.event_desc.resize.new_size.h = sevent.resize.h;
+                    pevent.type = PJMEDIA_EVENT_WND_RESIZED;
+                    pevent.data.wnd_resized.new_size.w = sevent.resize.w;
+                    pevent.data.wnd_resized.new_size.h = sevent.resize.h;
                     break;
                 case SDL_QUIT:
-                    pevent.event_type = PJMEDIA_EVENT_WINDOW_CLOSE;
+                    pevent.type = PJMEDIA_EVENT_WND_CLOSING;
+                    break;
 #endif
             }
 
-            switch (pevent.event_type) {
-                case PJMEDIA_EVENT_MOUSEBUTTONDOWN:
-                    if (strm->vid_cb.on_event_cb)
-                        if ((*strm->vid_cb.on_event_cb)(&strm->base,
-                                                        strm->user_data,
-                                                        &pevent) != PJ_SUCCESS)
-                        {
-                            /* Application wants us to ignore this event */
-                            break;
-                        }
-                    break;
-
-                case PJMEDIA_EVENT_WINDOW_RESIZE:
-                    if (strm->vid_cb.on_event_cb) {
-                        if ((*strm->vid_cb.on_event_cb)(&strm->base,
-                                                        strm->user_data,
-                                                        &pevent) != PJ_SUCCESS)
-                        {
-                            break;
-                        }
-                    }
-                    strm->new_disp_size = &pevent.event_desc.resize.new_size;
+            if (pevent.type != PJMEDIA_EVENT_NONE) {
+                pj_status_t status;
+
+                status = pjmedia_event_publish(&strm->base.epub, &pevent);
+
+                switch (pevent.type) {
+                case PJMEDIA_EVENT_WND_RESIZED:
+                    strm->new_disp_size = &pevent.data.wnd_resized.new_size;
                     detect_fmt_change(strm);
-                    break;
-
-                case PJMEDIA_EVENT_WINDOW_CLOSE:
-                    /**
-                     * To process PJMEDIA_EVENT_WINDOW_CLOSE event,
-                     * application should do this in the on_event_cb callback:
-                     * 1. stop further calls to 
-                     *    #pjmedia_vid_dev_stream_put_frame()
-                     * 2. return PJ_SUCCESS
-                     * Upon returning from the callback, SDL will destroy its
-                     * own stream.
-                     *
-                     * Returning non-PJ_SUCCESS will cause SDL to ignore
-                     * the event
-                     */
-                    if (strm->vid_cb.on_event_cb) {
-                        strm->is_quitting = PJ_TRUE;
-                        if ((*strm->vid_cb.on_event_cb)(&strm->base,
-                                                        strm->user_data,
-                                                        &pevent) != PJ_SUCCESS)
-                        {
-                            /* Application wants us to ignore this event */
-                            strm->is_quitting = PJ_FALSE;
-                            break;
-                        }
-
-                        /* Destroy the stream */
-                        sdl_stream_destroy(&strm->base);
-                        goto on_return;
-                    }
-
-                    /**
-                     * Default event-handler when there is no user-specified
-                     * callback: close the renderer window. We cannot destroy
-                     * the stream here since there is no callback to notify
-                     * the application.
-                     */
-                    sdl_stream_stop(&strm->base);
-                    goto on_return;
-
-                default:
-                    break;
+                    break;
+
+                case PJMEDIA_EVENT_WND_CLOSING:
+                    if (pevent.data.wnd_closing.cancel) {
+                        /* Cancel the closing operation */
+                        break;
+                    }
+
+                    /* Proceed to cleanup SDL. App must still call
+                     * pjmedia_dev_stream_destroy() when getting WND_CLOSED
+                     * event
+                     */
+                    strm->is_quitting = PJ_TRUE;
+                    notify_wnd_closed_event = PJ_TRUE;
+                    sdl_stream_stop(&strm->base);
+                    goto on_return;
+
+                default:
+                    /* Just to prevent gcc warning about unused enums */
+                    break;
+                }
             }
         }
@@ -859 +829 @@
 #endif
     strm->screen = NULL;
-
-    return strm->status;
+    saved_stream_status = strm->status;
+
+    if (notify_wnd_closed_event) {
+        pjmedia_event pevent;
+
+        pjmedia_event_init(&pevent, PJMEDIA_EVENT_WND_CLOSED, &strm->last_ts,
+                           &strm->base.epub);
+        pjmedia_event_publish(&strm->base.epub, &pevent);
+    }
+
+    /*
+     * Note: don't access the stream after this point, it  might have
+     * been destroyed
+     */
+
+    return saved_stream_status;
+}
+
+static void hello_world()
+{
 }
 
@@ -901 +889 @@
     struct sdl_stream *stream = (struct sdl_stream*)strm;
     pj_status_t status = PJ_SUCCESS;
+
+    stream->last_ts.u64 = frame->timestamp.u64;
 
     if (!stream->is_running) {
@@ -1024 +1014 @@
     pj_memcpy(&strm->vid_cb, cb, sizeof(*cb));
     strm->user_data = user_data;
+    pjmedia_event_publisher_init(&strm->base.epub);
 
     /* Create render stream here */