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

Timestamp:

Dec 7, 2011 10:43:28 AM (13 years ago)

Author:

nanang

Message:

Re #1234: Initial version of keyframe request/response via SIP INFO.

File:

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

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

@@ -69 +69 @@
 #endif
 
+
 /**
  * Media channel.
@@ -124 +125 @@
     pjmedia_event            fmt_event;     /**< Buffered fmt_changed event
                                                  to avoid deadlock          */
+    pjmedia_event            miss_keyframe_event; 
+                                            /**< Buffered missing keyframe
+                                                 event for delayed republish*/
 
     unsigned                 frame_size;    /**< Size of encoded base frame.*/
@@ -131 +135 @@
     pjmedia_frame           *rx_frames;     /**< Temp. buffer for incoming
                                                  frame assembly.            */
+
+    pj_bool_t                force_keyframe;/**< Forced to encode keyframe? */
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
@@ -352 +358 @@
             pj_memcpy(&stream->fmt_event, event, sizeof(*event));
             return PJ_SUCCESS;
+
+        case PJMEDIA_EVENT_KEYFRAME_MISSING:
+            /* Republish this event later from get_frame(). */
+            pj_memcpy(&stream->miss_keyframe_event, event, sizeof(*event));
+            return PJ_SUCCESS;
+
         default:
             break;
@@ -764 +776 @@
     pj_bool_t has_more_data = PJ_FALSE;
     pj_size_t total_sent = 0;
-
+    pjmedia_vid_encode_opt enc_opt;
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
@@ -797 +809 @@
     frame_out.size = 0;
 
+    /* Init encoding option */
+    pj_bzero(&enc_opt, sizeof(enc_opt));
+    if (stream->force_keyframe) {
+        /* Force encoder to generate keyframe */
+        enc_opt.force_keyframe = PJ_TRUE;
+        stream->force_keyframe = PJ_FALSE;
+        TRC_((channel->port.info.name.ptr,
+              "Forcing encoder to generate keyframe"));
+    }
+
     /* Encode! */
-    status = pjmedia_vid_codec_encode_begin(stream->codec, frame,
+    status = pjmedia_vid_codec_encode_begin(stream->codec, &enc_opt, frame,
                                             channel->buf_size -
                                                sizeof(pjmedia_rtp_hdr),
@@ -1080 +1102 @@
     }
 
+    if (stream->miss_keyframe_event.type != PJMEDIA_EVENT_NONE) {
+        pjmedia_event_publish(NULL, port, &stream->miss_keyframe_event,
+                              PJMEDIA_EVENT_PUBLISH_POST_EVENT);
+        stream->miss_keyframe_event.type = PJMEDIA_EVENT_NONE;
+    }
+
     pj_mutex_lock( stream->jb_mutex );
 
@@ -1425 +1453 @@
 
     /* Set up jitter buffer */
-    pjmedia_jbuf_set_adaptive( stream->jb, jb_init, jb_min_pre, jb_max_pre);
-    //pjmedia_jbuf_enable_discard(stream->jb, PJ_FALSE);
+    pjmedia_jbuf_set_adaptive(stream->jb, jb_init, jb_min_pre, jb_max_pre);
+    pjmedia_jbuf_set_discard(stream->jb, PJMEDIA_JB_DISCARD_NONE);
 
     /* Init RTCP session: */
@@ -2091 +2119 @@
 }
 
+
+/*
+ * Force stream to send video keyframe.
+ */
+PJ_DEF(pj_status_t) pjmedia_vid_stream_send_keyframe(
+                                                pjmedia_vid_stream *stream)
+{
+    PJ_ASSERT_RETURN(stream, PJ_EINVAL);
+
+    if (!pjmedia_vid_stream_is_running(stream, PJMEDIA_DIR_ENCODING))
+        return PJ_EINVALIDOP;
+
+    stream->force_keyframe = PJ_TRUE;
+
+    return PJ_SUCCESS;
+}
+
+
 #endif /* PJMEDIA_HAS_VIDEO */