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

Timestamp:

Jun 9, 2011 4:08:47 AM (13 years ago)

Author:

ming

Message:

Re #1292: Make sure each video device and video port instance is always unidirectional

File:

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

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

@@ -66 +66 @@
     {PJMEDIA_FORMAT_YUY2, &MEDIASUBTYPE_YUY2} ,
     {PJMEDIA_FORMAT_RGB24, &MEDIASUBTYPE_RGB24} ,
-    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
+//    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
     //{PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV} ,
 };
@@ -114 +114 @@
         IBaseFilter         *rend_filter;
         AM_MEDIA_TYPE       *mediatype;
-    } dgraph[2];
+    } dgraph;
 
     pj_timestamp             cap_ts;
@@ -384 +384 @@
 
     pj_bzero(param, sizeof(*param));
-    if (di->info.dir & PJMEDIA_DIR_CAPTURE_RENDER) {
-        param->dir = PJMEDIA_DIR_CAPTURE_RENDER;
-        param->cap_id = index;
-        param->rend_id = index;
-    } else if (di->info.dir & PJMEDIA_DIR_CAPTURE) {
+    if (di->info.dir & PJMEDIA_DIR_CAPTURE) {
         param->dir = PJMEDIA_DIR_CAPTURE;
         param->cap_id = index;
@@ -402 +398 @@
     /* Set the device capabilities here */
     param->clock_rate = DEFAULT_CLOCK_RATE;
-    //param->frame_rate.num = DEFAULT_FPS;
-    //param->frame_rate.denum = 1;
     param->flags = PJMEDIA_VID_DEV_CAP_FORMAT;
 
@@ -451 +445 @@
 {
     struct dshow_stream *stream = (struct dshow_stream*)strm;
-    unsigned i;
+    HRESULT hr;
 
     if (stream->quit_flag) {
@@ -458 +452 @@
     }
 
-    for (i = 0; i < 2; i++) {
-        if (stream->dgraph[i].csource_filter) {
-            HRESULT hr = SourceFilter_Deliver(stream->dgraph[i].csource_filter,
-                                              frame->buf, frame->size);
-
-            if (FAILED(hr)) {
-                return hr;
-            }
-            break;
-        }
-    }
+    hr = SourceFilter_Deliver(stream->dgraph.csource_filter,
+                              frame->buf, frame->size);
+    if (FAILED(hr))
+        return hr;
 
     return PJ_SUCCESS;
@@ -728 +715 @@
 static void destroy_filter_graph(struct dshow_stream * stream)
 {
-    unsigned i;
-
-    for (i = 0; i < 2; i++) {
-        if (stream->dgraph[i].source_filter) {
-            IBaseFilter_Release(stream->dgraph[i].source_filter);
-            stream->dgraph[i].source_filter = NULL;
-        }
-        if (stream->dgraph[i].rend_filter) {
-            IBaseFilter_Release(stream->dgraph[i].rend_filter);
-            stream->dgraph[i].rend_filter = NULL;
-        }
-        if (stream->dgraph[i].media_filter) {
-            IMediaFilter_Release(stream->dgraph[i].media_filter);
-            stream->dgraph[i].media_filter = NULL;
-        }
-        if (stream->dgraph[i].filter_graph) {
-            IFilterGraph_Release(stream->dgraph[i].filter_graph);
-            stream->dgraph[i].filter_graph = NULL;
-        }
+    if (stream->dgraph.source_filter) {
+        IBaseFilter_Release(stream->dgraph.source_filter);
+        stream->dgraph.source_filter = NULL;
+    }
+    if (stream->dgraph.rend_filter) {
+        IBaseFilter_Release(stream->dgraph.rend_filter);
+        stream->dgraph.rend_filter = NULL;
+    }
+    if (stream->dgraph.media_filter) {
+        IMediaFilter_Release(stream->dgraph.media_filter);
+        stream->dgraph.media_filter = NULL;
+    }
+    if (stream->dgraph.filter_graph) {
+        IFilterGraph_Release(stream->dgraph.filter_graph);
+        stream->dgraph.filter_graph = NULL;
     }
 }
@@ -761 +744 @@
     pj_pool_t *pool;
     struct dshow_stream *strm;
-    unsigned ngraph = 0;
     pj_status_t status;
+
+    PJ_ASSERT_RETURN(param->dir == PJMEDIA_DIR_CAPTURE ||
+                     param->dir == PJMEDIA_DIR_RENDER, PJ_EINVAL);
 
     if (!get_dshow_format_info(param->fmt.id))
@@ -777 +762 @@
     strm->user_data = user_data;
 
-    /* Create capture stream here */
     if (param->dir & PJMEDIA_DIR_CAPTURE) {
         const pjmedia_video_format_detail *vfd;
 
+        /* Create capture stream here */
         status = create_filter_graph(PJMEDIA_DIR_CAPTURE, param->cap_id,
                                      PJ_FALSE, PJ_FALSE, df, strm,
-                                     &strm->dgraph[ngraph++]);
+                                     &strm->dgraph);
         if (status != PJ_SUCCESS) {
             destroy_filter_graph(strm);
@@ -790 +775 @@
             status = create_filter_graph(PJMEDIA_DIR_CAPTURE, param->cap_id,
                                          PJ_FALSE, PJ_TRUE, df, strm,
-                                         &strm->dgraph[ngraph]);
+                                         &strm->dgraph);
 
             if (status != PJ_SUCCESS) {
@@ -801 +786 @@
                                              param->cap_id,
                                              PJ_TRUE, PJ_TRUE, df, strm,
-                                             &strm->dgraph[ngraph]);
+                                             &strm->dgraph);
             }
 
@@ -811 +796 @@
         vfd = pjmedia_format_get_video_format_detail(&param->fmt, PJ_TRUE);
         strm->cap_ts_inc = PJMEDIA_SPF2(param->clock_rate, &vfd->fps, 1);
-    }
-
-    /* Create render stream here */
-    if (param->dir & PJMEDIA_DIR_RENDER) {
+    } else if (param->dir & PJMEDIA_DIR_RENDER) {
+        /* Create render stream here */
         status = create_filter_graph(PJMEDIA_DIR_RENDER, param->rend_id,
                                      PJ_FALSE, PJ_FALSE, df, strm,
-                                     &strm->dgraph[ngraph++]);
+                                     &strm->dgraph);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -903 +886 @@
 {
     struct dshow_stream *stream = (struct dshow_stream*)strm;
-    unsigned i;
+    HRESULT hr;
 
     stream->quit_flag = PJ_FALSE;
@@ -909 +892 @@
     stream->rend_thread_exited = PJ_FALSE;
 
-    for (i = 0; i < 2; i++) {
-        HRESULT hr;
-
-        if (!stream->dgraph[i].media_filter)
-            continue;
-        hr = IMediaFilter_Run(stream->dgraph[i].media_filter, 0);
-        if (FAILED(hr)) {
-            char msg[80];
-            if (AMGetErrorText(hr, msg, sizeof(msg))) {
-                PJ_LOG(4,(THIS_FILE, "Error starting media: %s", msg));
-            }
-            return PJ_EUNKNOWN;
+    hr = IMediaFilter_Run(stream->dgraph.media_filter, 0);
+    if (FAILED(hr)) {
+        char msg[80];
+        if (AMGetErrorText(hr, msg, sizeof(msg))) {
+            PJ_LOG(4,(THIS_FILE, "Error starting media: %s", msg));
         }
+        return PJ_EUNKNOWN;
     }
 
@@ -943 +920 @@
         pj_thread_sleep(10);
 
-    for (i = 0; i < 2; i++) {
-        if (!stream->dgraph[i].media_filter)
-            continue;
-        IMediaFilter_Stop(stream->dgraph[i].media_filter);
-    }
+    IMediaFilter_Stop(stream->dgraph.media_filter);
 
     PJ_LOG(4, (THIS_FILE, "Stopping dshow video stream"));