[libcvd-members] libcvd cvd/videosource.h cvd_src/videosource.cpp

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      08/05/06 23:06:42

Modified files:
        cvd            : videosource.h 
        cvd_src        : videosource.cpp 

Log message:
        support for yuv422 (besides vuy422) for qtbuffer

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/videosource.h?cvsroot=libcvd&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/videosource.cpp?cvsroot=libcvd&r1=1.4&r2=1.5

Patches:
Index: cvd/videosource.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/videosource.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cvd/videosource.h   28 Feb 2008 00:27:22 -0000      1.8
+++ cvd/videosource.h   6 May 2008 23:06:42 -0000       1.9
@@ -62,6 +62,10 @@
     {
        throw VideoSourceException("DiskBuffer2 cannot handle type vuy422");
     }
+    template <> inline VideoBuffer<yuv422> * makeDiskBuffer2(const 
std::vector<std::string>& , double , VideoBufferFlags::OnEndOfBuffer )
+    {
+       throw VideoSourceException("DiskBuffer2 cannot handle type yuv422");
+    }
 #endif
 
     void get_files_options(const VideoSource& vs, int& fps, int& ra_frames, 
VideoBufferFlags::OnEndOfBuffer& eob);
@@ -114,6 +118,7 @@
        throw VideoSourceException("QTBuffer cannot handle types other than 
vuy422");
     }
     template <> VideoBuffer<vuy422> * makeQTBuffer( const ImageRef & size, int 
input, bool showsettings);
+    template <> VideoBuffer<yuv422> * makeQTBuffer( const ImageRef & size, int 
input, bool showsettings);
     
     void get_qt_options(const VideoSource & vs, ImageRef & size, bool & 
showsettings);
 #endif

Index: cvd_src/videosource.cpp
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/videosource.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd_src/videosource.cpp     24 Apr 2008 23:30:39 -0000      1.4
+++ cvd_src/videosource.cpp     6 May 2008 23:06:42 -0000       1.5
@@ -368,6 +368,11 @@
         return new CVD::QTBuffer<vuy422>(size, input, showsettings);
     }
     
+    template <> VideoBuffer<yuv422> * makeQTBuffer( const ImageRef & size, int 
input, bool showsettings)
+    {
+        return new CVD::QTBuffer<yuv422>(size, input, showsettings);
+    }
+    
     void get_qt_options(const VideoSource & vs, ImageRef & size, bool & 
showsettings){
        size = ImageRef(640, 480);
        showsettings = false;
@@ -389,7 +394,7 @@
                else if(it->first == "showsettings") {
                    showsettings = atoi(it->second.c_str());
            } else
-               throw VideoSourceException("invalid option for 'qt' protocol: 
"+it->first+"\n\t valid options: size");
+               throw VideoSourceException("invalid option for 'qt' protocol: 
"+it->first+"\n\t valid options: size, showsettings");
        }
     }
 #endif