Changeset 3459 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

Timestamp:

Mar 17, 2011 11:25:19 AM (14 years ago)

Author:

bennylp

Message:

Re #1213 (video devices):

• fixed devices to correctly increment the frame timestamp
• minor fix in video port to set default "active" value to 1 in the param

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m (modified) (4 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/qt_dev.m

@@ -77 +77 @@
     pj_pool_t           *pool;              /**< Memory pool.          */
 
+    pj_timestamp         cap_frame_ts;      /**< Captured frame tstamp */
+    unsigned             cap_ts_inc;        /**< Increment             */
+    
     pjmedia_vid_cb       vid_cb;            /**< Stream callback.      */
     void                *user_data;         /**< Application data.     */
@@ -322 +325 @@
     frame.size = size;
     frame.bit_info = 0;
+    frame.timestamp.u64 = stream->cap_frame_ts.u64;
+    
     if (stream->vid_cb.capture_cb)
         (*stream->vid_cb.capture_cb)(&stream->base, stream->user_data,
                                      &frame);
+    
+    stream->cap_frame_ts.u64 += stream->cap_ts_inc;
 }
 @end
@@ -380 +387 @@
     /* Create capture stream here */
     if (param->dir & PJMEDIA_DIR_CAPTURE) {
-        pjmedia_video_format_detail *vfd;
+        const pjmedia_video_format_detail *vfd;
         qt_fmt_info *qfi = get_qt_format_info(param->fmt.id);
         
@@ -438 +445 @@
 
         pj_assert(vfd->fps.num);
+        strm->cap_ts_inc = PJMEDIA_SPF2(&strm->param.clock_rate, &vfd->fps, 1);
+        
         [strm->video_output setMinimumVideoFrameInterval:
                             (1.0f * vfd->fps.denum / (double)vfd->fps.num)];