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

Timestamp:

Mar 22, 2011 9:46:04 AM (13 years ago)

Author:

nanang

Message:

Re #1213:

• Added encoding format conversion (only format ID) in video port.
• Fixed few bugs in direct show capture device:
  • VIDEOINFOHEADER.AvgTimePerFrame? calculation overflow which caused failure in opening capture device.
  • AM_MEDIA_TYPE.formattype validation to avoid bad type casting (of VIDEOINFOHEADER).

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/dshowclasses.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#undef _DEBUG
-#undef DEBUG
+
+#include <pjmedia-videodev/config.h>
+
+#if PJMEDIA_VIDEO_DEV_HAS_DSHOW
 
 #include <streams.h>
 
-#pragma comment(lib, "Strmbase.lib")
+#if PJ_DEBUG
+#   pragma comment(lib, "Strmbasd.lib")
+#else
+#   pragma comment(lib, "Strmbase.lib")
+#endif
 
 typedef void (*input_callback)(void *user_data, IMediaSample *pMediaSample);
@@ -208 +214 @@
     ((OutputPin *)src->GetPin(0))->bufSize = size;
 }
+
+#endif  /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */