diff options
Diffstat (limited to 'source/gameengine/VideoTexture')
-rw-r--r-- | source/gameengine/VideoTexture/Exception.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/FilterBase.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/FilterColor.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageBase.cpp | 16 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageBase.h | 90 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageViewport.h | 12 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 4 |
9 files changed, 71 insertions, 71 deletions
diff --git a/source/gameengine/VideoTexture/Exception.cpp b/source/gameengine/VideoTexture/Exception.cpp index 89d95d26971..0f571550205 100644 --- a/source/gameengine/VideoTexture/Exception.cpp +++ b/source/gameengine/VideoTexture/Exception.cpp @@ -48,7 +48,7 @@ ExpDesc errNFoundDesc(ErrNotFound, "Error description not found"); // implementation of ExpDesc // constructor -ExpDesc::ExpDesc (ExceptionID & exp, const char * desc, RESULT hres) +ExpDesc::ExpDesc (ExceptionID & exp, const char *desc, RESULT hres) : m_expID(exp), m_hRslt(hres), m_description(desc) { } @@ -105,7 +105,7 @@ const char * Exception::what() // debug version - with file and line of exception -Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int lin) +Exception::Exception (ExceptionID & expID, RESULT rslt, const char *fil, int lin) : m_expID (&expID), m_hRslt (rslt) { // set file and line @@ -115,7 +115,7 @@ Exception::Exception (ExceptionID & expID, RESULT rslt, const char * fil, int li // set file and line -void Exception::setFileLine (const char * fil, int lin) +void Exception::setFileLine (const char *fil, int lin) { if (fil != NULL) m_fileName = fil; m_line = lin; diff --git a/source/gameengine/VideoTexture/FilterBase.cpp b/source/gameengine/VideoTexture/FilterBase.cpp index 66552cde928..77d12ddc9e6 100644 --- a/source/gameengine/VideoTexture/FilterBase.cpp +++ b/source/gameengine/VideoTexture/FilterBase.cpp @@ -124,7 +124,7 @@ PyObject *Filter_getPrevious (PyFilter *self, void *closure) if (self->m_filter != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast<PyObject*>(self->m_filter->getPrevious()); + PyObject *filt = reinterpret_cast<PyObject*>(self->m_filter->getPrevious()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index 5efb59efe4c..26b5303e365 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -141,7 +141,7 @@ static int setMatrix(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 5; // check items @@ -274,7 +274,7 @@ static int setLevels(PyFilter *self, PyObject *value, void *closure) for (int r = 0; valid && r < 4; ++r) { // get row object - PyObject * row = PySequence_Fast_GET_ITEM(value, r); + PyObject *row = PySequence_Fast_GET_ITEM(value, r); // check sequence valid = PySequence_Check(row) && PySequence_Size(row) == 2; // check items diff --git a/source/gameengine/VideoTexture/ImageBase.cpp b/source/gameengine/VideoTexture/ImageBase.cpp index 4745ce784c0..5a11cd24bcf 100644 --- a/source/gameengine/VideoTexture/ImageBase.cpp +++ b/source/gameengine/VideoTexture/ImageBase.cpp @@ -364,7 +364,7 @@ PyTypeList pyImageTypes; // functions for python interface // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds) +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds) { // allocate object PyImage *self = reinterpret_cast<PyImage*>(type->tp_alloc(type, 0)); @@ -394,7 +394,7 @@ void Image_dealloc(PyImage *self) } // get image data -PyObject *Image_getImage (PyImage *self, char * mode) +PyObject *Image_getImage(PyImage *self, char *mode) { try { @@ -551,7 +551,7 @@ int Image_setFlip(PyImage *self, PyObject *value, void *closure) } // get zbuff -PyObject * Image_getZbuff (PyImage * self, void * closure) +PyObject *Image_getZbuff(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getZbuff()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -573,7 +573,7 @@ int Image_setZbuff(PyImage *self, PyObject *value, void *closure) } // get depth -PyObject * Image_getDepth (PyImage * self, void * closure) +PyObject *Image_getDepth(PyImage * self, void *closure) { if (self->m_image != NULL && self->m_image->getDepth()) Py_RETURN_TRUE; else Py_RETURN_FALSE; @@ -598,7 +598,7 @@ int Image_setDepth(PyImage *self, PyObject *value, void *closure) // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args) +PyObject *Image_getSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -622,7 +622,7 @@ PyObject *Image_getSource (PyImage *self, PyObject *args) // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args) +PyObject *Image_setSource(PyImage *self, PyObject *args) { // get arguments char * id; @@ -657,13 +657,13 @@ PyObject *Image_setSource (PyImage *self, PyObject *args) // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure) +PyObject *Image_getFilter(PyImage *self, void *closure) { // if image object is available if (self->m_image != NULL) { // pixel filter object - PyObject * filt = reinterpret_cast<PyObject*>(self->m_image->getFilter()); + PyObject *filt = reinterpret_cast<PyObject*>(self->m_image->getFilter()); // if filter is present if (filt != NULL) { diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h index 3bb9c8cb090..718191fd049 100644 --- a/source/gameengine/VideoTexture/ImageBase.h +++ b/source/gameengine/VideoTexture/ImageBase.h @@ -57,52 +57,52 @@ public: /// constructor ImageBase (bool staticSrc = false); /// destructor - virtual ~ImageBase (void); + virtual ~ImageBase(void); /// release contained objects, if returns true, object should be deleted - virtual bool release (void); + virtual bool release(void); /// is an image available bool isImageAvailable(void) { return m_avail; } /// get image - unsigned int * getImage (unsigned int texId = 0, double timestamp=-1.0); + unsigned int *getImage(unsigned int texId = 0, double timestamp=-1.0); /// get image size - short * getSize (void) { return m_size; } + short * getSize(void) { return m_size; } /// get image buffer size - unsigned long getBuffSize (void) + unsigned long getBuffSize(void) { return m_size[0] * m_size[1] * sizeof(unsigned int); } /// refresh image - invalidate its current content - virtual void refresh (void); + virtual void refresh(void); /// get scale - bool getScale (void) { return m_scale; } + bool getScale(void) { return m_scale; } /// set scale - void setScale (bool scale) { m_scale = scale; m_scaleChange = true; } + void setScale(bool scale) { m_scale = scale; m_scaleChange = true; } /// get vertical flip - bool getFlip (void) { return m_flip; } + bool getFlip(void) { return m_flip; } /// set vertical flip - void setFlip (bool flip) { m_flip = flip; } + void setFlip(bool flip) { m_flip = flip; } /// get Z buffer - bool getZbuff (void) { return m_zbuff; } + bool getZbuff(void) { return m_zbuff; } /// set Z buffer - void setZbuff (bool zbuff) { m_zbuff = zbuff; } + void setZbuff(bool zbuff) { m_zbuff = zbuff; } /// get depth - bool getDepth (void) { return m_depth; } + bool getDepth(void) { return m_depth; } /// set depth - void setDepth (bool depth) { m_depth = depth; } + void setDepth(bool depth) { m_depth = depth; } /// get source object - PyImage * getSource (const char * id); + PyImage * getSource(const char * id); /// set source object, return true, if source was set - bool setSource (const char * id, PyImage *source); + bool setSource(const char * id, PyImage *source); /// get pixel filter - PyFilter * getFilter (void) { return m_pyfilter; } + PyFilter * getFilter(void) { return m_pyfilter; } /// set pixel filter - void setFilter (PyFilter * filt); + void setFilter(PyFilter * filt); - /// calculate size (nearest power of 2) - static short calcSize (short size); + /// calculate size(nearest power of 2) + static short calcSize(short size); /// number of buffer pointing to m_image, public because not handled by this class int m_exports; @@ -137,25 +137,25 @@ protected: PyFilter * m_pyfilter; /// initialize image data - void init (short width, short height); + void init(short width, short height); /// find source - ImageSourceList::iterator findSource (const char * id); + ImageSourceList::iterator findSource(const char *id); /// create new source - virtual ImageSource * newSource (const char * id) { return NULL; } + virtual ImageSource *newSource(const char *id) { return NULL; } /// check source sizes - bool checkSourceSizes (void); + bool checkSourceSizes(void); /// calculate image from sources and set its availability - virtual void calcImage (unsigned int texId, double ts) {} + virtual void calcImage(unsigned int texId, double ts) {} /// perform loop detection - bool loopDetect (ImageBase * img); + bool loopDetect(ImageBase * img); /// template for image conversion - template<class FLT, class SRC> void convImage (FLT & filter, SRC srcBuff, + template<class FLT, class SRC> void convImage(FLT & filter, SRC srcBuff, short * srcSize) { // destination buffer @@ -328,7 +328,7 @@ extern PyTypeList pyImageTypes; // functions for python interface // object initialization -template <class T> static int Image_init (PyObject *pySelf, PyObject *args, PyObject *kwds) +template <class T> static int Image_init(PyObject *pySelf, PyObject *args, PyObject *kwds) { PyImage *self = reinterpret_cast<PyImage*>(pySelf); // create source object @@ -339,43 +339,43 @@ template <class T> static int Image_init (PyObject *pySelf, PyObject *args, PyOb } // object allocation -PyObject *Image_allocNew (PyTypeObject *type, PyObject *args, PyObject *kwds); +PyObject *Image_allocNew(PyTypeObject *type, PyObject *args, PyObject *kwds); // object deallocation -void Image_dealloc (PyImage *self); +void Image_dealloc(PyImage *self); // get image data -PyObject *Image_getImage (PyImage *self, char * mode); +PyObject *Image_getImage(PyImage *self, char * mode); // get image size -PyObject *Image_getSize (PyImage *self, void *closure); +PyObject *Image_getSize(PyImage *self, void *closure); // refresh image - invalidate current content -PyObject *Image_refresh (PyImage *self); +PyObject *Image_refresh(PyImage *self); // get scale -PyObject *Image_getScale (PyImage *self, void *closure); +PyObject *Image_getScale(PyImage *self, void *closure); // set scale -int Image_setScale (PyImage *self, PyObject *value, void *closure); +int Image_setScale(PyImage *self, PyObject *value, void *closure); // get flip -PyObject *Image_getFlip (PyImage *self, void *closure); +PyObject *Image_getFlip(PyImage *self, void *closure); // set flip -int Image_setFlip (PyImage *self, PyObject *value, void *closure); +int Image_setFlip(PyImage *self, PyObject *value, void *closure); // get filter source object -PyObject *Image_getSource (PyImage *self, PyObject *args); +PyObject *Image_getSource(PyImage *self, PyObject *args); // set filter source object -PyObject *Image_setSource (PyImage *self, PyObject *args); +PyObject *Image_setSource(PyImage *self, PyObject *args); // get Z buffer -PyObject * Image_getZbuff (PyImage * self, void * closure); +PyObject *Image_getZbuff(PyImage * self, void *closure); // set Z buffer -int Image_setZbuff (PyImage * self, PyObject * value, void * closure); +int Image_setZbuff(PyImage * self, PyObject *value, void *closure); // get depth -PyObject * Image_getDepth (PyImage * self, void * closure); +PyObject *Image_getDepth(PyImage * self, void *closure); // set depth -int Image_setDepth (PyImage * self, PyObject * value, void * closure); +int Image_setDepth(PyImage * self, PyObject *value, void *closure); // get pixel filter object -PyObject *Image_getFilter (PyImage *self, void *closure); +PyObject *Image_getFilter(PyImage *self, void *closure); // set pixel filter object -int Image_setFilter (PyImage *self, PyObject *value, void *closure); +int Image_setFilter(PyImage *self, PyObject *value, void *closure); // check if a buffer can be extracted PyObject *Image_valid(PyImage *self, void *closure); // for buffer access to PyImage objects diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 0b34824fd08..11ddec681c5 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -299,7 +299,7 @@ static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds) // parameters - scene object PyObject *scene; // camera object - PyObject * camera; + PyObject *camera; // parameter keywords static const char *kwlist[] = {"sceneObj", "cameraObj", NULL}; // get parameters diff --git a/source/gameengine/VideoTexture/ImageViewport.h b/source/gameengine/VideoTexture/ImageViewport.h index 5afd4654d62..10d894a9fb8 100644 --- a/source/gameengine/VideoTexture/ImageViewport.h +++ b/source/gameengine/VideoTexture/ImageViewport.h @@ -95,12 +95,12 @@ protected: GLint * getViewportSize (void) { return m_viewport + 2; } }; -PyObject *ImageViewport_getCaptureSize (PyImage *self, void *closure); -int ImageViewport_setCaptureSize (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getWhole (PyImage *self, void *closure); -int ImageViewport_setWhole (PyImage *self, PyObject *value, void *closure); -PyObject *ImageViewport_getAlpha (PyImage *self, void *closure); -int ImageViewport_setAlpha (PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getCaptureSize(PyImage *self, void *closure); +int ImageViewport_setCaptureSize(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getWhole(PyImage *self, void *closure); +int ImageViewport_setWhole(PyImage *self, PyObject *value, void *closure); +PyObject *ImageViewport_getAlpha(PyImage *self, void *closure); +int ImageViewport_setAlpha(PyImage *self, PyObject *value, void *closure); #endif diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 4e584cc89ad..be7f9392f39 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -504,7 +504,7 @@ void VideoFFmpeg::stopCache() } } -void VideoFFmpeg::releaseFrame(AVFrame* frame) +void VideoFFmpeg::releaseFrame(AVFrame *frame) { if (frame == m_frameRGB) { @@ -521,7 +521,7 @@ void VideoFFmpeg::releaseFrame(AVFrame* frame) } // open video file -void VideoFFmpeg::openFile (char * filename) +void VideoFFmpeg::openFile (char *filename) { if (openStream(filename, NULL, NULL) != 0) return; @@ -578,7 +578,7 @@ void VideoFFmpeg::openFile (char * filename) // open video capture device -void VideoFFmpeg::openCam (char * file, short camIdx) +void VideoFFmpeg::openCam (char *file, short camIdx) { // open camera source AVInputFormat *inputFormat; diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index 92043bb1f74..2f466eb5eeb 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -51,12 +51,12 @@ extern "C" { #endif #ifdef FFMPEG_CODEC_IS_POINTER -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return stream->codec; } #else -static inline AVCodecContext* get_codec_from_stream(AVStream* stream) +static inline AVCodecContext *get_codec_from_stream(AVStream* stream) { return &stream->codec; } |