[GEM-cvs] Gem/src/videoIO/plugins FRDummy.cpp, 1.1.2.4, 1.1.2.5 FRDummy.h, 1.1.2.2, 1.1.2.3 FileRea
Brought to you by:
zmoelnig
From: holzi1 <ho...@us...> - 2007-07-24 08:29:25
|
Update of /cvsroot/pd-gem/Gem/src/videoIO/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2643/plugins Modified Files: Tag: videoIO FRDummy.cpp FRDummy.h FileReadQT4L.cpp FileReadQT4L.h Log Message: Index: FileReadQT4L.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/videoIO/plugins/Attic/FileReadQT4L.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** FileReadQT4L.cpp 21 Jul 2007 09:08:45 -0000 1.1.2.1 --- FileReadQT4L.cpp 24 Jul 2007 08:29:25 -0000 1.1.2.2 *************** *** 33,44 **** ! bool FileReadQT4L::openFile(char *filename)///TODO doch const string & nehmen oder char * lassen { ! if(!(quicktime_check_sig(filename))) return false; ! if(!(qt_file_ = quicktime_open(filename, 1, 0))) return false; nr_of_tracks_ = quicktime_video_tracks(qt_file_); --- 33,47 ---- ! bool FileReadQT4L::openFile(string filename) ! throw (VIOException) { ! if(!(quicktime_check_sig((char *)filename.c_str())))/// TODO cast korrekt von const char* auf char* ??? return false; ! if(!(qt_file_ = quicktime_open((char *)filename.c_str(), 1, 0))) return false; + //throw VideoIO_::VIOException(string("File cannot be opened")); + nr_of_tracks_ = quicktime_video_tracks(qt_file_); *************** *** 49,52 **** --- 52,56 ---- has_video_file_ = true; + return true; *************** *** 54,57 **** --- 58,62 ---- + void FileReadQT4L::closeFile() { *************** *** 88,96 **** unsigned char **rows = new unsigned char*[frame_.getYSize()]; while(i--) ! rows[i] = frame_.getFrameData() + frame_.getXSize()*frame_.getColorspace()*(frame_.getYSize()-i-1); post("a"); // for(int i=0; i<frame_.getYSize(); i++) ! // rows[i] = frame_.getFrameData() + frame_.getXSize()*frame_.getColorspace()*i; post("b"); quicktime_set_cmodel(qt_file_, BC_RGBA8888); ///sets return type in RGBA --- 93,103 ---- unsigned char **rows = new unsigned char*[frame_.getYSize()]; + + while(i--) ! rows[i] = frame_.getFrameData() + frame_.getXSize()*frame_.getColorSize()*(frame_.getYSize()-i-1); post("a"); // for(int i=0; i<frame_.getYSize(); i++) ! // rows[i] = frame_.getFrameData() + frame_.getXSize()*frame_.getColorSize()*i; post("b"); quicktime_set_cmodel(qt_file_, BC_RGBA8888); ///sets return type in RGBA Index: FileReadQT4L.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/videoIO/plugins/Attic/FileReadQT4L.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** FileReadQT4L.h 21 Jul 2007 09:08:45 -0000 1.1.2.1 --- FileReadQT4L.h 24 Jul 2007 08:29:25 -0000 1.1.2.2 *************** *** 47,51 **** * @return true if open worked */ ! bool openFile(char *filename); /*! --- 47,52 ---- * @return true if open worked */ ! bool openFile(string filename) ! throw (VIOException); /*! Index: FRDummy.cpp =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/videoIO/plugins/Attic/FRDummy.cpp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** FRDummy.cpp 21 Jul 2007 09:08:45 -0000 1.1.2.4 --- FRDummy.cpp 24 Jul 2007 08:29:25 -0000 1.1.2.5 *************** *** 20,24 **** #include "FRDummy.h" ! bool FRDummy::openFile(char *filename) { --- 20,24 ---- #include "FRDummy.h" ! bool FRDummy::openFile(string filename) { *************** *** 31,35 **** int x = frame_.getXSize(); int y = frame_.getYSize(); ! int c = frame_.getColorspace(); post("x= %d, y= %d, c= %d",x,y,c); --- 31,35 ---- int x = frame_.getXSize(); int y = frame_.getYSize(); ! int c = frame_.getColorSize(); post("x= %d, y= %d, c= %d",x,y,c); Index: FRDummy.h =================================================================== RCS file: /cvsroot/pd-gem/Gem/src/videoIO/plugins/Attic/FRDummy.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** FRDummy.h 21 Jul 2007 09:08:45 -0000 1.1.2.2 --- FRDummy.h 24 Jul 2007 08:29:25 -0000 1.1.2.3 *************** *** 38,42 **** * @param filename the path of the file */ ! bool openFile(char *filename); /*! --- 38,42 ---- * @param filename the path of the file */ ! bool openFile(string filename); /*! |