Changeset 3459 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/ios_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/ios_dev.m (modified) (4 diffs)

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

@@ -93 +93 @@
     UIImageView         *imgView;
     void                *buf;
+    
+    pj_timestamp         frame_ts;
+    unsigned             ts_inc;
 };
 
@@ -356 +359 @@
     frame.size = stream->frame_size;
     frame.bit_info = 0;
+    frame.timestamp.u64 = stream->frame_ts.u64;
+    
     if (stream->vid_cb.capture_cb)
         (*stream->vid_cb.capture_cb)(&stream->base, stream->user_data, &frame);
 
+    stream->frame_ts.u64 += stream->ts_inc;
+    
     /* Unlock the pixel buffer */
     CVPixelBufferUnlockBaseAddress(imageBuffer,0);
@@ -386 +393 @@
     pj_pool_t *pool;
     struct ios_stream *strm;
-    pjmedia_video_format_detail *vfd;
+    const pjmedia_video_format_detail *vfd;
     const pjmedia_video_format_info *vfi;
     pj_status_t status = PJ_SUCCESS;
@@ -419 +426 @@
     strm->bytes_per_row = strm->size.w * strm->bpp / 8;
     strm->frame_size = strm->bytes_per_row * strm->size.h;
+    strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
 
     /* Create capture stream here */