Merge pull request #1 from aavogt/master

add a cvCreateVideo wrapper
acowley · Sep 7, 2013 · 8f6bfec · 8f6bfec
2 parents 0ad8f8f + 58b9c56
commit 8f6bfec
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/OpenCV/Core/HOpenCV_wrap.c b/src/OpenCV/Core/HOpenCV_wrap.c
@@ -111,6 +111,14 @@ void dilate(const CvArr *src, CvArr *dest, int iterations)
     cvDilate(src, dest, NULL, iterations);
 }
 
+CvVideoWriter* cvCreateVideoWriter2( const char* filename, int fourcc,
+                                           double fps, int frame_x, int frame_y,
+                                           int is_color CV_DEFAULT(1))
+{
+    return cvCreateVideoWriter(filename, fourcc, fps, cvSize(frame_x, frame_y), is_color);
+}
+
+
 /**********************************************************/
 
 void release_mem_storage(CvMemStorage *mem_store)

diff --git a/src/OpenCV/Core/HOpenCV_wrap.h b/src/OpenCV/Core/HOpenCV_wrap.h
@@ -31,6 +31,9 @@ void cv_free(void *obj);
 int seq_total(const CvSeq *seq);
 /* CvRect *c_rect_cvGetSeqElem(const CvSeq *seq, int index); */
 
+CvVideoWriter* cvCreateVideoWriter(const char* filename, int fourcc, 
+        double fps, int frame_x, int frame_y, int is_color);
+
 void c_cvRectangle(CvArr *img, int x, int y, int width, int height);
 
 void c_cvLine(CvArr *img, int x1, int y1, int x2, int y2, double r, double g, 

diff --git a/src/OpenCV/Core/HighGui.hsc b/src/OpenCV/Core/HighGui.hsc
@@ -21,6 +21,8 @@ import Foreign.C.String
 import Data.List (foldl') 
 import OpenCV.Core.CxCore
 
+import Foreign.Marshal.Array
+
 #include <opencv2/highgui/highgui_c.h>
 
 ------------------------------------------------
@@ -129,7 +131,7 @@ fourCC (a,b,c,d) = (c1 .&. 255) + shiftL (c2 .&. 255) 8 +
                    shiftL (c3 .&. 255) 16 + shiftL (c4 .&. 255) 24
     where [c1,c2,c3,c4] = map (fromIntegral . fromEnum) [a,b,c,d]
 
-foreign import ccall "opencv2/highgui/highgui_c.h cvCreateVideoWriter"
+foreign import ccall "HOpenCV_wrap.h cvCreateVideoWriter2"
   c_cvCreateVideoWriter :: CString -> CInt -> CDouble -> CInt -> CInt -> CInt ->
                            IO (Ptr CvVideoWriter)
 
@@ -138,20 +140,25 @@ foreign import ccall "HOpenCV_wrap.h &release_video_writer"
 
 cvCreateVideoWriter :: FilePath -> FourCC -> Double -> (Int, Int) -> 
                        IO (Ptr CvVideoWriter)
-cvCreateVideoWriter fname codec fps (w, h) = 
+cvCreateVideoWriter fname codec fps (w,h) = do
     withCString fname $ \str ->
         c_cvCreateVideoWriter str (fourCC codec) (realToFrac fps) 
-                              (fromIntegral w) (fromIntegral h) 1
-                              
+            (fromIntegral w) (fromIntegral h) 1
+
 -- |Create a video file writer.
 createVideoWriterF :: FilePath -> FourCC -> Double -> (Int, Int) -> 
                       IO (ForeignPtr CvVideoWriter)
-createVideoWriterF fname codec fps sz = createForeignPtr cp_release_writer $
-                                        cvCreateVideoWriter fname codec fps sz
+createVideoWriterF fname codec fps sz =
+    createForeignPtr cp_release_writer $ cvCreateVideoWriter fname codec fps sz
 
 foreign import ccall "opencv2/highgui/highgui_c.h cvWriteFrame"
   cvWriteFrame :: Ptr CvVideoWriter -> Ptr IplImage -> IO ()
 
+{-
+foreign import ccall "opencv2/core/types_c.h cvSize"
+  cvSize :: Int -> Int -> IO (Ptr ())
+-}
+
 -------------------------------------------------
 -- Windows
 foreign import ccall "HOpenCV_wrap.h new_window"
@@ -247,4 +254,4 @@ enumToEventFlags x = map fst . filter snd $
 -- Qt fonts
 -- foreign import ccall "opencv2/highgui/highgui_c.h cvFontQt"
 --   cvFontQt :: CString -> CInt -> CDouble -> CDouble -> CDouble -> 
---               CInt -> CInt -> CInt -> IO CvFont
+--               CInt -> CInt -> CInt -> IO CvFont