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

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

Author: douglask
Date: Fri Feb 26 06:04:01 2010
New Revision: 4651

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

Log:
Change default fallback pixelformat from MEDIASUBTYPE_RGB24 to MEDIASUBTYPE_UYVY. Avoids excessive pixel format conversions (and intermediate filters) which was what was happening with 480i DV where flashing white line artefacts were occurring.


Modified: vic/branches/mpeg4/video/grabber-win32DS.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.cpp	Fri Feb 26 06:04:01 2010
@@ -353,7 +353,7 @@
 	   } else if (have_RGB24_) {
 		   mt_.subtype = MEDIASUBTYPE_RGB24; // RGB 24 bit
 	   } else {
-		   mt_.subtype = MEDIASUBTYPE_RGB24;
+		   mt_.subtype = MEDIASUBTYPE_UYVY;
 	   }
    } else {
 	   if (have_I420_) {
@@ -365,7 +365,7 @@
 	   } else if (have_RGB24_) {
 		   mt_.subtype = MEDIASUBTYPE_RGB24; // RGB 24 bit
 	   } else {
-		   mt_.subtype = MEDIASUBTYPE_RGB24;
+		   mt_.subtype = MEDIASUBTYPE_UYVY;
 	   }
    }
 
@@ -743,7 +743,7 @@
      else if (have_RGB24_)
        converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE);
 	 else
-       converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE);
+       packedUYVY422_to_planarYUYV420((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_);
      break;
 
    case CF_422:
@@ -756,7 +756,7 @@
      else if (have_RGB24_)
        converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE);
 	 else
-       converter_->convert((u_int8_t*)last_frame_, width_, height_, frame_, outw_, outh_, TRUE);
+       packedUYVY422_to_planarYUYV422((char *)frame_, outw_, outh_, (char *)last_frame_, inw_, inh_);
      break;
    }