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

Timestamp:

Jun 13, 2011 11:48:37 AM (13 years ago)

Author:

ming

Message:

Fixed #1286: Stride issue in dshow renderer (Video Mixing Renderer)

File:

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

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

@@ -54 +54 @@
 IBaseFilter* SourceFilter_Create(SourceFilter **pSrc);
 HRESULT SourceFilter_Deliver(SourceFilter *src, void *buf, long size);
-void SourceFilter_SetBufferSize(SourceFilter *src, long size);
+void SourceFilter_SetMediaType(SourceFilter *src, AM_MEDIA_TYPE *pmt);
 
 typedef struct dshow_fmt_info
@@ -66 +66 @@
     {PJMEDIA_FORMAT_YUY2, &MEDIASUBTYPE_YUY2} ,
     {PJMEDIA_FORMAT_RGB24, &MEDIASUBTYPE_RGB24} ,
-//    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
-    //{PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV} ,
+    {PJMEDIA_FORMAT_RGB32, &MEDIASUBTYPE_RGB32} ,
+    {PJMEDIA_FORMAT_IYUV, &MEDIASUBTYPE_IYUV} ,
 };
 
@@ -675 +675 @@
     mediatype->lSampleSize = DIBSIZE(video_info->bmiHeader);
     if (graph->csource_filter)
-        SourceFilter_SetBufferSize(graph->csource_filter,
-                                   mediatype->lSampleSize);
+        SourceFilter_SetMediaType(graph->csource_filter,
+                                  mediatype);
 
     hr = IFilterGraph_AddFilter(graph->filter_graph,