From 05abdcd64f9904da3c6f08517006541c2b9c1ffc Mon Sep 17 00:00:00 2001 From: Alexander Reshetnikov Date: Mon, 9 Apr 2012 17:38:46 +0000 Subject: [PATCH] Changes of highgui structure --- modules/highgui/CMakeLists.txt | 20 +-- modules/highgui/src/cap_ffmpeg.cpp | 4 + modules/highgui/src/cap_ffmpeg_v2.cpp | 251 ---------------------------------- 3 files changed, 8 insertions(+), 267 deletions(-) delete mode 100644 modules/highgui/src/cap_ffmpeg_v2.cpp diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index f1b4231..828caef 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -52,33 +52,21 @@ set(grfmt_srcs src/bitstrm.cpp ${grfmt_srcs}) source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs}) -set(highgui_hdrs src/precomp.hpp src/utils.hpp) - if(NEW_FFMPEG) -set(highgui_srcs - src/cap.cpp - src/cap_images.cpp - src/cap_ffmpeg_v2.cpp - src/cap_ffmpeg_impl_v2.hpp - src/cap_ffmpeg_impl.hpp - src/loadsave.cpp - src/precomp.cpp - src/utils.cpp - src/window.cpp - ) +set(highgui_hdrs src/precomp.hpp src/utils.hpp src/cap_ffmpeg_impl_v2.hpp) else() +set(highgui_hdrs src/precomp.hpp src/utils.hpp src/cap_ffmpeg_impl.hpp) +endif() + set(highgui_srcs src/cap.cpp src/cap_images.cpp src/cap_ffmpeg.cpp - src/cap_ffmpeg_impl_v2.hpp - src/cap_ffmpeg_impl.hpp src/loadsave.cpp src/precomp.cpp src/utils.cpp src/window.cpp ) -endif() file(GLOB highgui_ext_hdrs "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h") diff --git a/modules/highgui/src/cap_ffmpeg.cpp b/modules/highgui/src/cap_ffmpeg.cpp index 251ddc4..5b98456 100644 --- a/modules/highgui/src/cap_ffmpeg.cpp +++ b/modules/highgui/src/cap_ffmpeg.cpp @@ -42,7 +42,11 @@ #include "precomp.hpp" #ifdef HAVE_FFMPEG +#ifdef NEW_FFMPEG +#include "cap_ffmpeg_impl_v2.hpp" +#else #include "cap_ffmpeg_impl.hpp" +#endif #else #include "cap_ffmpeg_api.hpp" #endif diff --git a/modules/highgui/src/cap_ffmpeg_v2.cpp b/modules/highgui/src/cap_ffmpeg_v2.cpp deleted file mode 100644 index cd972dd..0000000 --- a/modules/highgui/src/cap_ffmpeg_v2.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/*M/////////////////////////////////////////////////////////////////////////////////////// -// -// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. -// -// By downloading, copying, installing or using the software you agree to this license. -// If you do not agree to this license, do not download, install, -// copy or use the software. -// -// -// License Agreement -// For Open Source Computer Vision Library -// -// Copyright (C) 2000-2008, Intel Corporation, all rights reserved. -// Copyright (C) 2009, Willow Garage Inc., all rights reserved. -// Third party copyrights are property of their respective owners. -// -// Redistribution and use in source and binary forms, with or without modification, -// are permitted provided that the following conditions are met: -// -// * Redistribution's of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// * Redistribution's in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * The name of the copyright holders may not be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// This software is provided by the copyright holders and contributors "as is" and -// any express or implied warranties, including, but not limited to, the implied -// warranties of merchantability and fitness for a particular purpose are disclaimed. -// In no event shall the Intel Corporation or contributors be liable for any direct, -// indirect, incidental, special, exemplary, or consequential damages -// (including, but not limited to, procurement of substitute goods or services; -// loss of use, data, or profits; or business interruption) however caused -// and on any theory of liability, whether in contract, strict liability, -// or tort (including negligence or otherwise) arising in any way out of -// the use of this software, even if advised of the possibility of such damage. -// -//M*/ - -#include "precomp.hpp" - -#ifdef HAVE_FFMPEG -#include "cap_ffmpeg_impl_v2.hpp" -#else -#include "cap_ffmpeg_api.hpp" -#endif - -static CvCreateFileCapture_Plugin icvCreateFileCapture_FFMPEG_p = 0; -static CvReleaseCapture_Plugin icvReleaseCapture_FFMPEG_p = 0; -static CvGrabFrame_Plugin icvGrabFrame_FFMPEG_p = 0; -static CvRetrieveFrame_Plugin icvRetrieveFrame_FFMPEG_p = 0; -static CvSetCaptureProperty_Plugin icvSetCaptureProperty_FFMPEG_p = 0; -static CvGetCaptureProperty_Plugin icvGetCaptureProperty_FFMPEG_p = 0; -static CvCreateVideoWriter_Plugin icvCreateVideoWriter_FFMPEG_p = 0; -static CvReleaseVideoWriter_Plugin icvReleaseVideoWriter_FFMPEG_p = 0; -static CvWriteFrame_Plugin icvWriteFrame_FFMPEG_p = 0; - -static void -icvInitFFMPEG(void) -{ - static int ffmpegInitialized = 0; - if( !ffmpegInitialized ) - { - #if defined WIN32 || defined _WIN32 - const char* module_name = "opencv_ffmpeg" - #if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__) - "_64" - #endif - ".dll"; - - static HMODULE icvFFOpenCV = LoadLibrary( module_name ); - if( icvFFOpenCV ) - { - icvCreateFileCapture_FFMPEG_p = - (CvCreateFileCapture_Plugin)GetProcAddress(icvFFOpenCV, "cvCreateFileCapture_FFMPEG"); - icvReleaseCapture_FFMPEG_p = - (CvReleaseCapture_Plugin)GetProcAddress(icvFFOpenCV, "cvReleaseCapture_FFMPEG"); - icvGrabFrame_FFMPEG_p = - (CvGrabFrame_Plugin)GetProcAddress(icvFFOpenCV, "cvGrabFrame_FFMPEG"); - icvRetrieveFrame_FFMPEG_p = - (CvRetrieveFrame_Plugin)GetProcAddress(icvFFOpenCV, "cvRetrieveFrame_FFMPEG"); - icvSetCaptureProperty_FFMPEG_p = - (CvSetCaptureProperty_Plugin)GetProcAddress(icvFFOpenCV, "cvSetCaptureProperty_FFMPEG"); - icvGetCaptureProperty_FFMPEG_p = - (CvGetCaptureProperty_Plugin)GetProcAddress(icvFFOpenCV, "cvGetCaptureProperty_FFMPEG"); - icvCreateVideoWriter_FFMPEG_p = - (CvCreateVideoWriter_Plugin)GetProcAddress(icvFFOpenCV, "cvCreateVideoWriter_FFMPEG"); - icvReleaseVideoWriter_FFMPEG_p = - (CvReleaseVideoWriter_Plugin)GetProcAddress(icvFFOpenCV, "cvReleaseVideoWriter_FFMPEG"); - icvWriteFrame_FFMPEG_p = - (CvWriteFrame_Plugin)GetProcAddress(icvFFOpenCV, "cvWriteFrame_FFMPEG"); - -#if 0 - if( icvCreateFileCapture_FFMPEG_p != 0 && - icvReleaseCapture_FFMPEG_p != 0 && - icvGrabFrame_FFMPEG_p != 0 && - icvRetrieveFrame_FFMPEG_p != 0 && - icvSetCaptureProperty_FFMPEG_p != 0 && - icvGetCaptureProperty_FFMPEG_p != 0 && - icvCreateVideoWriter_FFMPEG_p != 0 && - icvReleaseVideoWriter_FFMPEG_p != 0 && - icvWriteFrame_FFMPEG_p != 0 ) - { - printf("Successfully initialized ffmpeg plugin!\n"); - } - else - { - printf("Failed to load FFMPEG plugin: module handle=%p\n", icvFFOpenCV); - } -#endif - } - #elif defined HAVE_FFMPEG - icvCreateFileCapture_FFMPEG_p = (CvCreateFileCapture_Plugin)cvCreateFileCapture_FFMPEG; - icvReleaseCapture_FFMPEG_p = (CvReleaseCapture_Plugin)cvReleaseCapture_FFMPEG; - icvGrabFrame_FFMPEG_p = (CvGrabFrame_Plugin)cvGrabFrame_FFMPEG; - icvRetrieveFrame_FFMPEG_p = (CvRetrieveFrame_Plugin)cvRetrieveFrame_FFMPEG; - icvSetCaptureProperty_FFMPEG_p = (CvSetCaptureProperty_Plugin)cvSetCaptureProperty_FFMPEG; - icvGetCaptureProperty_FFMPEG_p = (CvGetCaptureProperty_Plugin)cvGetCaptureProperty_FFMPEG; - icvCreateVideoWriter_FFMPEG_p = (CvCreateVideoWriter_Plugin)cvCreateVideoWriter_FFMPEG; - icvReleaseVideoWriter_FFMPEG_p = (CvReleaseVideoWriter_Plugin)cvReleaseVideoWriter_FFMPEG; - icvWriteFrame_FFMPEG_p = (CvWriteFrame_Plugin)cvWriteFrame_FFMPEG; - #endif - - ffmpegInitialized = 1; - } -} - - -class CvCapture_FFMPEG_proxy : public CvCapture -{ -public: - CvCapture_FFMPEG_proxy() { ffmpegCapture = 0; } - virtual ~CvCapture_FFMPEG_proxy() { close(); } - - virtual double getProperty(int propId) - { - return ffmpegCapture ? icvGetCaptureProperty_FFMPEG_p(ffmpegCapture, propId) : 0; - } - virtual bool setProperty(int propId, double value) - { - return ffmpegCapture ? icvSetCaptureProperty_FFMPEG_p(ffmpegCapture, propId, value)!=0 : false; - } - virtual bool grabFrame() - { - return ffmpegCapture ? icvGrabFrame_FFMPEG_p(ffmpegCapture)!=0 : false; - } - virtual IplImage* retrieveFrame(int) - { - unsigned char* data = 0; - int step=0, width=0, height=0, cn=0; - - if(!ffmpegCapture || - !icvRetrieveFrame_FFMPEG_p(ffmpegCapture,&data,&step,&width,&height,&cn)) - return 0; - cvInitImageHeader(&frame, cvSize(width, height), 8, cn); - cvSetData(&frame, data, step); - return &frame; - } - virtual bool open( const char* filename ) - { - close(); - - icvInitFFMPEG(); - if( !icvCreateFileCapture_FFMPEG_p ) - return false; - ffmpegCapture = icvCreateFileCapture_FFMPEG_p( filename ); - return ffmpegCapture != 0; - } - virtual void close() - { - if( ffmpegCapture && icvReleaseCapture_FFMPEG_p ) - icvReleaseCapture_FFMPEG_p( &ffmpegCapture ); - assert( ffmpegCapture == 0 ); - ffmpegCapture = 0; - } - -protected: - void* ffmpegCapture; - IplImage frame; -}; - - -CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename) -{ - CvCapture_FFMPEG_proxy* result = new CvCapture_FFMPEG_proxy; - if( result->open( filename )) - return result; - delete result; -#if defined WIN32 || defined _WIN32 - return cvCreateFileCapture_VFW(filename); -#else - return 0; -#endif -} - - -class CvVideoWriter_FFMPEG_proxy : public CvVideoWriter -{ -public: - CvVideoWriter_FFMPEG_proxy() { ffmpegWriter = 0; } - virtual ~CvVideoWriter_FFMPEG_proxy() { close(); } - - virtual bool writeFrame( const IplImage* image ) - { - if(!ffmpegWriter) - return false; - CV_Assert(image->depth == 8); - - return icvWriteFrame_FFMPEG_p(ffmpegWriter, (const uchar*)image->imageData, - image->widthStep, image->width, image->height, image->nChannels, image->origin) !=0; - } - virtual bool open( const char* filename, int fourcc, double fps, CvSize frameSize, bool isColor ) - { - close(); - icvInitFFMPEG(); - if( !icvCreateVideoWriter_FFMPEG_p ) - return false; - ffmpegWriter = icvCreateVideoWriter_FFMPEG_p( filename, fourcc, fps, frameSize.width, frameSize.height, isColor ); - return ffmpegWriter != 0; - } - - virtual void close() - { - if( ffmpegWriter && icvReleaseVideoWriter_FFMPEG_p ) - icvReleaseVideoWriter_FFMPEG_p( &ffmpegWriter ); - assert( ffmpegWriter == 0 ); - ffmpegWriter = 0; - } - -protected: - void* ffmpegWriter; -}; - - -CvVideoWriter* cvCreateVideoWriter_FFMPEG_proxy( const char* filename, int fourcc, - double fps, CvSize frameSize, int isColor ) -{ - CvVideoWriter_FFMPEG_proxy* result = new CvVideoWriter_FFMPEG_proxy; - - if( result->open( filename, fourcc, fps, frameSize, isColor != 0 )) - return result; - delete result; -#if defined WIN32 || defined _WIN32 - return cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, isColor); -#else - return 0; -#endif -} -- 2.7.4