Changeset 3459 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/colorbar_dev.c

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/colorbar_dev.c (modified) (7 diffs)

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

@@ -92 +92 @@
     pjmedia_video_apply_fmt_param    vafp;
     pj_uint8_t                      *first_line[PJMEDIA_MAX_VIDEO_PLANES];
+    pj_timestamp                     ts;
+    unsigned                         ts_inc;
 };
 
@@ -186 +188 @@
     ddi = &cf->dev_info[0];
     pj_bzero(ddi, sizeof(*ddi));
-    strncpy(ddi->info.name, "Colorbar generator",
-            sizeof(ddi->info.name));
+    pj_ansi_strncpy(ddi->info.name, "Colorbar generator",
+                    sizeof(ddi->info.name));
     ddi->info.driver[sizeof(ddi->info.driver)-1] = '\0';
-    strncpy(ddi->info.driver, "Colorbar", sizeof(ddi->info.driver));
+    pj_ansi_strncpy(ddi->info.driver, "Colorbar", sizeof(ddi->info.driver));
     ddi->info.driver[sizeof(ddi->info.driver)-1] = '\0';
     ddi->info.dir = PJMEDIA_DIR_CAPTURE;
@@ -206 +208 @@
     }
 
-    PJ_LOG(4, (THIS_FILE, "Colorbar video src initialized with %d devices:",
+    PJ_LOG(4, (THIS_FILE, "Colorbar video src initialized with %d device(s):",
                cf->dev_count));
+    for (i = 0; i < cf->dev_count; i++) {
+        PJ_LOG(4, (THIS_FILE, "%2d: %s", i, cf->dev_info[i].info.name));
+    }
 
     return PJ_SUCCESS;
@@ -366 +371 @@
     pj_pool_t *pool;
     struct cbar_stream *strm;
+    const pjmedia_video_format_detail *vfd;
     const pjmedia_video_format_info *vfi;
     pjmedia_video_apply_fmt_param vafp;
@@ -378 +384 @@
     pj_bzero(&vafp, sizeof(vafp));
 
+    vfd = pjmedia_format_get_video_format_detail(&param->fmt, PJ_TRUE);
     vfi = pjmedia_get_video_format_info(NULL, param->fmt.id);
     cbfi = get_cbar_fmt_info(param->fmt.id);
@@ -399 +406 @@
     strm->cbfi = cbfi;
     pj_memcpy(&strm->vafp, &vafp, sizeof(vafp));
+    strm->ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
 
     for (i = 0; i < vfi->plane_cnt; ++i) {
@@ -560 +568 @@
     struct cbar_stream *stream = (struct cbar_stream*)strm;
 
+    frame->timestamp = stream->ts;
+    stream->ts.u64 += stream->ts_inc;
     return spectrum_run(stream, frame->buf, frame->size);
 }