[Sumover-dev] [svn commit] r4744 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Tue Mar 30 11:18:13 2010
New Revision: 4744

Modified:
   vic/branches/mpeg4/video/grabber-win32DS.cpp
   vic/branches/mpeg4/video/grabber-win32DS.h

Log:
Perform a 'scc.MaxOutputSize.cy > max_height' test instead of 'scc.MaxOutputSize.cx > max_width' as it will support more anamorphic square pixel resolutions that can be clipped if need be.


Modified: vic/branches/mpeg4/video/grabber-win32DS.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.cpp	Tue Mar 30 11:18:13 2010
@@ -830,7 +830,7 @@
 }
 //--------------------------------
 
-int DirectShowGrabber::getCaptureCapabilities(int preferred_max_width) {
+int DirectShowGrabber::getCaptureCapabilities(int preferred_max_height) {
    IAMStreamConfig          *pConfig;
    AM_MEDIA_TYPE            *pmtConfig;
    int                      iCount;
@@ -864,7 +864,7 @@
                    (pmtConfig->formattype == FORMAT_VideoInfo)         &&
                    (pmtConfig->cbFormat   >= sizeof (VIDEOINFOHEADER)) &&
                    (pmtConfig->pbFormat   != NULL)) {
-                       if(scc.MaxOutputSize.cx > max_width_ && scc.MaxOutputSize.cx <= preferred_max_width){
+                       if(scc.MaxOutputSize.cy > max_height_ && scc.MaxOutputSize.cy <= preferred_max_height){
                            max_width_  = scc.MaxOutputSize.cx;
                            max_height_ =  scc.MaxOutputSize.cy;
                        }
@@ -904,8 +904,8 @@
    }
    pConfig->Release();
 
-   if (min_height_>=NTSC_BASE_HEIGHT && preferred_max_width != 1920)
-       getCaptureCapabilities(1920);
+   if (min_height_>=NTSC_BASE_HEIGHT && preferred_max_height != 1080)
+       getCaptureCapabilities(1080);
 
    if (max_width_>0)
        return TRUE;

Modified: vic/branches/mpeg4/video/grabber-win32DS.h
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.h	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.h	Tue Mar 30 11:18:13 2010
@@ -137,7 +137,7 @@
       virtual void setsize();
       virtual int  grab();
       void         setport(const char *port);
-      int          getCaptureCapabilities(int preferred_max_width=1024);
+      int          getCaptureCapabilities(int preferred_max_height=720);
       virtual void setCaptureOutputFormat();
 
       int          useconfig_;