Changeset 3420 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c

Timestamp:

Feb 24, 2011 7:47:55 AM (13 years ago)

Author:

nanang

Message:

Re #1182:

• Added video stream interface in vid_stream.h, the video stream will be able to handle different video formats in encoding and decoding direction.
• Renamed video device stream class identifiers from 'pjmedia_vid_stream*' to 'pjmedia_vid_dev_stream*' as 'pjmedia_vid_stream' is used by video stream interface.
• Added ffmpeg video capability to be able to parse SDP format param for H263 and also decide video format for encoding direction based on remote preference and local format-capability setting.
• Added some new APIs in jitter buffer for handling video stream: pjmedia_jbuf_put_frame3(), pjmedia_jbuf_get_frame3(), pjmedia_jbuf_peek_frame(), and pjmedia_jbuf_remove_frame().
• Moved pjmedia_stream_info_from_sdp() from session to stream

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c (modified) (15 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/videoport.c

@@ -38 +38 @@
     pjmedia_dir          dir;
     pjmedia_rect_size    cap_size;
-    pjmedia_vid_stream  *strm;
+    pjmedia_vid_dev_stream      *strm;
     pjmedia_vid_cb       strm_cb;
     void                *strm_cb_data;
@@ -75 +75 @@
 };
 
-static pj_status_t vidstream_cap_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_cap_cb(pjmedia_vid_dev_stream *stream,
                                     void *user_data,
                                     pjmedia_frame *frame);
-static pj_status_t vidstream_render_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_render_cb(pjmedia_vid_dev_stream *stream,
                                        void *user_data,
                                        pjmedia_frame *frame);
-static pj_status_t vidstream_event_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_event_cb(pjmedia_vid_dev_stream *stream,
                                       void *user_data,
                                       pjmedia_vid_event *event);
@@ -171 +171 @@
     vid_cb.on_event_cb = &vidstream_event_cb;
 
-    status = pjmedia_vid_stream_create(&prm->vidparam, &vid_cb, vp,
-                                       &vp->strm);
+    status = pjmedia_vid_dev_stream_create(&prm->vidparam, &vid_cb, vp,
+                                           &vp->strm);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -278 +278 @@
 }
 
-PJ_DEF(pjmedia_vid_stream*)
+PJ_DEF(pjmedia_vid_dev_stream*)
 pjmedia_vid_port_get_stream(pjmedia_vid_port *vp)
 {
@@ -357 +357 @@
     PJ_ASSERT_RETURN(vp, PJ_EINVAL);
 
-    status = pjmedia_vid_stream_start(vp->strm);
+    status = pjmedia_vid_dev_stream_start(vp->strm);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -386 +386 @@
     PJ_ASSERT_RETURN(vp, PJ_EINVAL);
 
-    status = pjmedia_vid_stream_stop(vp->strm);
+    status = pjmedia_vid_dev_stream_stop(vp->strm);
 
     if (vp->enc_clock) {
@@ -414 +414 @@
     }
     if (vp->strm) {
-        pjmedia_vid_stream_destroy(vp->strm);
+        pjmedia_vid_dev_stream_destroy(vp->strm);
         vp->strm = NULL;
     }
@@ -478 +478 @@
         return;
 
-    status = pjmedia_vid_stream_get_frame(vp->strm, vp->enc_frm_buf);
+    status = pjmedia_vid_dev_stream_get_frame(vp->strm, vp->enc_frm_buf);
     if (status != PJ_SUCCESS)
         return;
@@ -581 +581 @@
                 } else
                     vp->rend_sync_clocksrc.nsync_progress += ndrop;
+
                 for (i = 0; i < ndrop; i++) {
                     status = pjmedia_port_get_frame(vp->client_port,
@@ -603 +604 @@
     pjmedia_clock_src_update(&vp->rend_clocksrc, NULL);
 
-    status = pjmedia_vid_stream_put_frame(vp->strm, vp->dec_frm_buf);
+    status = pjmedia_vid_dev_stream_put_frame(vp->strm, vp->dec_frm_buf);
 }
 
@@ -615 +616 @@
 }
 
-static pj_status_t vidstream_cap_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_cap_cb(pjmedia_vid_dev_stream *stream,
                                     void *user_data,
                                     pjmedia_frame *frame)
@@ -634 +635 @@
 }
 
-static pj_status_t vidstream_render_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_render_cb(pjmedia_vid_dev_stream *stream,
                                        void *user_data,
                                        pjmedia_frame *frame)
@@ -653 +654 @@
 }
 
-static pj_status_t vidstream_event_cb(pjmedia_vid_stream *stream,
+static pj_status_t vidstream_event_cb(pjmedia_vid_dev_stream *stream,
                                       void *user_data,
                                       pjmedia_vid_event *event)
@@ -671 +672 @@
 
     if (vp->stream_role==ROLE_PASSIVE) {
-        return pjmedia_vid_stream_put_frame(vp->strm, frame);
+        return pjmedia_vid_dev_stream_put_frame(vp->strm, frame);
     } else {
         pj_mutex_lock(vp->dec_frm_mutex);
@@ -688 +689 @@
 
     if (vp->stream_role==ROLE_PASSIVE) {
-        return pjmedia_vid_stream_get_frame(vp->strm, frame);
+        return pjmedia_vid_dev_stream_get_frame(vp->strm, frame);
     } else {
         pj_mutex_lock(vp->enc_frm_mutex);