Changeset 3582

Timestamp:

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

Author:

ming

Message:

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

Location:

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev

Files:

• dshow_dev.c (modified) (3 diffs)
• dshowclasses.cpp (modified) (5 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,

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/dshowclasses.cpp

@@ -22 +22 @@
 #if PJMEDIA_VIDEO_DEV_HAS_DSHOW
 
+#include <assert.h>
 #include <streams.h>
 
@@ -63 +64 @@
                                      ALLOCATOR_PROPERTIES *ppropInputRequest);
 
+    CMediaType mediaType;
     long bufSize;
 };
@@ -112 +114 @@
     HRESULT hr;
     IMediaSample *pSample;
+    VIDEOINFOHEADER *vi;
+    AM_MEDIA_TYPE *pmt;
     BYTE *dst_buf;
 
@@ -124 +128 @@
         goto on_error;
 
+    pSample->GetMediaType(&pmt);
+    if (pmt) {
+        mediaType.Set(*pmt);
+        bufSize = pmt->lSampleSize;
+    }
+
     pSample->GetPointer(&dst_buf);
-    memcpy(dst_buf, buf, size);
+    vi = (VIDEOINFOHEADER *)mediaType.pbFormat;
+    if (vi->rcSource.right == vi->bmiHeader.biWidth) {
+        assert(pSample->GetSize() >= size);
+        memcpy(dst_buf, buf, size);
+    } else {
+        unsigned i, bpp;
+        unsigned dststride, srcstride;
+        BYTE *src_buf = (BYTE *)buf;
+
+        bpp = size / abs(vi->bmiHeader.biHeight) / vi->rcSource.right;
+        dststride = vi->bmiHeader.biWidth * bpp;
+        srcstride = vi->rcSource.right * bpp;
+        for (i = abs(vi->bmiHeader.biHeight); i > 0; i--) {
+            memcpy(dst_buf, src_buf, srcstride);
+            dst_buf += dststride;
+            src_buf += srcstride;
+        }
+    }
     pSample->SetActualDataLength(size);
 
@@ -209 +236 @@
 }
 
-extern "C" void SourceFilter_SetBufferSize(SourceFilter *src,
-                                           long size)
-{
-    ((OutputPin *)src->GetPin(0))->bufSize = size;
+extern "C" void SourceFilter_SetMediaType(SourceFilter *src,
+                                          AM_MEDIA_TYPE *pmt)
+{
+    ((OutputPin *)src->GetPin(0))->mediaType.Set(*pmt);
+    ((OutputPin *)src->GetPin(0))->bufSize = pmt->lSampleSize;
 }