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

Timestamp:

Mar 17, 2011 11:25:19 AM (13 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/dshow_dev.c (modified) (7 diffs)

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

@@ -66 +66 @@
     {PJMEDIA_FORMAT_RGB24, &MEDIASUBTYPE_RGB24} ,
     {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
+    //{PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV} ,
 };
 
@@ -113 +114 @@
         AM_MEDIA_TYPE       *mediatype;
     } dgraph[2];
+
+    pj_timestamp             cap_ts;
+    unsigned                 cap_ts_inc;
 };
 
@@ -287 +291 @@
     ddi = &df->dev_info[df->dev_count++];
     pj_bzero(ddi, sizeof(*ddi));
-    strncpy(ddi->info.name,  "Video Mixing Renderer",
-            sizeof(ddi->info.name));
+    pj_ansi_strncpy(ddi->info.name,  "Video Mixing Renderer",
+                    sizeof(ddi->info.name));
     ddi->info.name[sizeof(ddi->info.name)-1] = '\0';
-    strncpy(ddi->info.driver, "dshow", sizeof(ddi->info.driver));
+    pj_ansi_strncpy(ddi->info.driver, "dshow", sizeof(ddi->info.driver));
     ddi->info.driver[sizeof(ddi->info.driver)-1] = '\0';
     ddi->info.dir = PJMEDIA_DIR_RENDER;
@@ -410 +414 @@
     struct dshow_stream *strm = (struct dshow_stream*)user_data;
     unsigned char *buffer;
-    pjmedia_frame frame;
+    pjmedia_frame frame = {0};
 
     if (strm->quit_flag) {
@@ -435 +439 @@
     frame.size = IMediaSample_GetActualDataLength(pMediaSample);
     frame.bit_info = 0;
+    frame.timestamp = strm->cap_ts;
+    strm->cap_ts.u64 += strm->cap_ts_inc;
     if (strm->vid_cb.capture_cb)
         (*strm->vid_cb.capture_cb)(&strm->base, strm->user_data, &frame);
@@ -454 +460 @@
         if (stream->dgraph[i].csource_filter) {
             HRESULT hr = SourceFilter_Deliver(stream->dgraph[i].csource_filter,
-                frame->buf, frame->size);
+                                              frame->buf, frame->size);
 
             if (FAILED(hr)) {
@@ -727 +733 @@
     /* Create capture stream here */
     if (param->dir & PJMEDIA_DIR_CAPTURE) {
+        const pjmedia_video_format_detail *vfd;
+
         status = create_filter_graph(PJMEDIA_DIR_CAPTURE, param->cap_id,
                                      df, strm, &strm->dgraph[ngraph++]);
         if (status != PJ_SUCCESS)
             goto on_error;
+        
+        vfd = pjmedia_format_get_video_format_detail(&param->fmt, PJ_TRUE);
+        strm->cap_ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
     }