[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58701] branches/soc-2013-vse/source/ blender/sequencer: Sequencer C++ clean up first stage from yesterday:

Alexander Kuznetsov kuzsasha at gmail.com
Mon Jul 29 04:36:54 CEST 2013 

Revision: 58701
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58701
Author:   alexk
Date:     2013-07-29 02:36:52 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Sequencer C++ clean up first stage from yesterday:

Each structure moved to correspondent class file.
Some clean up with main file:
Allocation moved to classes
Removed many C mallocs

Encapsulation to follow

Modified Paths:
--------------
    branches/soc-2013-vse/source/blender/sequencer/CMakeLists.txt
    branches/soc-2013-vse/source/blender/sequencer/sequencer_common.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_main.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_main.h

Added Paths:
-----------
    branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqBucket.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqBucket.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCLProgram.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCLProgram.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCanvas.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCanvas.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqChannel.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqChannel.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCommand.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCommand.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDevice.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDevice.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDeviceCL.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDeviceCL.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDeviceCPU.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqDeviceCPU.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqEffect.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqEffect.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqEngine.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqEngine.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqFrame.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqFrame.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqImageStackInfo.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqImageStackInfo.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqImageStorage.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqImageStorage.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqOutput.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqOutput.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqOutputImage.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqOutputImage.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqPlayer.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqPlayer.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqRenderNode.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_seqRenderNode.h

Removed Paths:
-------------
    branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_command.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_command.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_device.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_device.h
    branches/soc-2013-vse/source/blender/sequencer/sequencer_effect.cpp
    branches/soc-2013-vse/source/blender/sequencer/sequencer_effect.h

Modified: branches/soc-2013-vse/source/blender/sequencer/CMakeLists.txt
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/CMakeLists.txt	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/CMakeLists.txt	2013-07-29 02:36:52 UTC (rev 58701)
@@ -27,6 +27,7 @@
 	../../../intern/guardedalloc
 	../makesdna
 	../blenlib
+	../blenkernel
 	../cldm
 	../imbuf
 )
@@ -37,16 +38,45 @@
 
 set(SRC
 	sequencer_main.cpp
-	sequencer_command.cpp
-	sequencer_device.cpp
-	sequencer_effect.cpp
-	sequencer_bucket.cpp
+	sequencer_seqCommand.cpp
+	sequencer_seqDevice.cpp
+	sequencer_seqDeviceCL.cpp
+	sequencer_seqDeviceCPU.cpp
+	sequencer_seqEffect.cpp
+	sequencer_seqBucket.cpp
+	sequencer_seqOutput.cpp
+	sequencer_seqOutputImage.cpp
+	sequencer_seqFrame.cpp
+	sequencer_SimpleRef.cpp
+	sequencer_seqChannel.cpp
+	sequencer_seqRenderNode.cpp
+	sequencer_seqImageStorage.cpp
+	sequencer_seqImageStackInfo.cpp
+	sequencer_seqEngine.cpp
+	sequencer_seqPlayer.cpp
+	sequencer_seqCLProgram.cpp
+	sequencer_seqCanvas.cpp
 
+
 	sequencer_main.h
-	sequencer_command.h
-	sequencer_device.h
-	sequencer_effect.h
-	sequencer_bucket.h
+	sequencer_seqCommand.h
+	sequencer_seqDevice.h
+	sequencer_seqDeviceCL.h
+	sequencer_seqDeviceCPU.h
+	sequencer_seqEffect.h
+	sequencer_seqBucket.h
+	sequencer_seqOutput.h
+	sequencer_seqOutputImage.h
+	sequencer_seqFrame.h
+	sequencer_SimpleRef.h
+	sequencer_seqChannel.h
+	sequencer_seqRenderNode.h
+	sequencer_seqImageStorage.h
+	sequencer_seqImageStackInfo.h
+	sequencer_seqEngine.h
+	sequencer_seqPlayer.h
+	sequencer_seqCLProgram.h
+	sequencer_seqCanvas.h
 
 	sequencer_common.h
 

Added: branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.cpp
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.cpp	                        (rev 0)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.cpp	2013-07-29 02:36:52 UTC (rev 58701)
@@ -0,0 +1 @@
+ 

Added: branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.h
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.h	                        (rev 0)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_SimpleRef.h	2013-07-29 02:36:52 UTC (rev 58701)
@@ -0,0 +1,47 @@
+#ifndef __SEQUENCER_SIMPLEREF_H__
+#define __SEQUENCER_SIMPLEREF_H__
+
+#include "MEM_guardedalloc.h"
+
+class SimpleRef
+{
+private:
+
+	int ref_count;
+
+public:
+
+	SimpleRef()
+	{
+		ref_count = 0;
+	}
+
+	virtual ~SimpleRef()
+	{
+		BLI_assert(!ref_count);
+	}
+
+	virtual void Retain(void)
+	{
+		ref_count++;
+	}
+
+	virtual void Release(void)
+	{
+		ref_count--;
+
+		if(ref_count == 0)
+			delete this;
+		else if(ref_count < 0)
+		{
+			BLI_assert(0);
+		}
+
+
+	}
+
+
+
+};
+
+#endif /* __SEQUENCER_SIMPLEREF_H__*/

Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.cpp
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.cpp	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.cpp	2013-07-29 02:36:52 UTC (rev 58701)
@@ -1 +0,0 @@
- 

Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.h
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.h	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_bucket.h	2013-07-29 02:36:52 UTC (rev 58701)
@@ -1,8 +0,0 @@
-#ifndef __SEQUENCER_BUCKET_H__
-#define __SEQUENCER_BUCKET_H__
-
-
-
-
-
-#endif /* __SEQUENCER_BUCKET_H__ */

Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_command.cpp
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_command.cpp	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_command.cpp	2013-07-29 02:36:52 UTC (rev 58701)
@@ -1,106 +0,0 @@
- 
-#include "sequencer_command.h"
-#include "sequencer_bucket.h"
-#include "sequencer_common.h"
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "MEM_guardedalloc.h"
-
-
-#include "IMB_imbuf.h"
-#include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
-
-
-#ifdef __cplusplus
-}
-#endif
-extern ImBuf * maintestimg;;
-
-
-
-int seq_CommandGenTest::exec_cpu(seqBucket *bucket)
-{
-	uint size[2];
-	uint i, j;
-
-
-	float *ri;
-
-	unsigned char *rect = (unsigned char *)maintestimg->rect;
-
-
-	size[0] = bucket->ImStack[this->outimgid].size[0];
-	size[1] = bucket->ImStack[this->outimgid].size[1];
-
-	bucket->internalImg[this->outimgid].pointer =
-	ri = (float*)MEM_callocN(sizeof(float)*4*size[0]*size[1], "seqTempImg");
-
-	bucket->internalImg[this->outimgid].memtype |= SEQ_DATA_STORAGE_MAINMEMORY;
-
-
-	for(i = 0; i < size[0]; i++)
-	{
-		for(j = 0; j < size[1]; j++)
-		{
-			ri[4*(j*size[0]+i)] = 1.0f/255.0f*rect[4*(j*maintestimg->y/size[1]*maintestimg->x+i*maintestimg->x/size[0])];
-			ri[4*(j*size[0]+i)+1] = 1.0f/255.0f*rect[4*(j*maintestimg->y/size[1]*maintestimg->x+i*maintestimg->x/size[0])+1];
-			ri[4*(j*size[0]+i)+2] = 1.0f/255.0f*rect[4*(j*maintestimg->y/size[1]*maintestimg->x+i*maintestimg->x/size[0])+2];
-			ri[4*(j*size[0]+i)+3] = 1.0f;
-
-		}
-
-	}
-
-
-	return 7;
-}
-
-
-
-
-
-
-int seq_CommandBrightenssAndContrast::exec_cpu(seqBucket * bucket)
-{
-
-	uint size[2];
-	uint i;
-
-
-
-float constrast = 1;
-float brightness = 0;
-
-
-	float *rio, *rii;
-
-
-
-	size[0] = bucket->ImStack[this->outimgid].size[0];
-	size[1] = bucket->ImStack[this->outimgid].size[1];
-
-	bucket->internalImg[this->outimgid].pointer =
-	rio = (float*)MEM_callocN(sizeof(float)*4*size[0]*size[1], "seqTempImg");
-
-	bucket->internalImg[this->outimgid].memtype |= SEQ_DATA_STORAGE_MAINMEMORY;
-
-	rii = (float*)bucket->internalImg[this->inimgid].pointer;
-
-
-	for(i=0; i < 4 * size[0] * size[1]; i+=4)
-	{
-		rio[i] = (rii[i]+brightness-0.5f)*constrast+0.5f;
-		rio[i+1] = (rii[i+1]+brightness-0.5f)*constrast+0.5f;
-		rio[i+2] = (rii[i+2]+brightness-0.5f)*constrast+0.5f;
-		rio[i+3] = rii[i+3];
-
-	}
-
-
-	return 7;
-}

Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_command.h
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_command.h	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_command.h	2013-07-29 02:36:52 UTC (rev 58701)
@@ -1,147 +0,0 @@
-#ifndef __SEQUENCER_COMMAND_H__
-#define __SEQUENCER_COMMAND_H__
-
-#include "sequencer_common.h"
-
-
-class seq_CommandBase
-{
-public:
-
-	virtual  int get_number_input(void)
-	{
-		return 0;
-	}
-
-
-	virtual int get_input_id(int imputn)
-	{
-		return -1;
-	}
-
-
-
-	virtual int exec_cpu(seqBucket *bucket)
-	{
-		return 5;
-	}
-		;
-
-
-};
-
-
-
-
-class seq_CommandAlphaOver : public seq_CommandBase
-{
-public:
-
-	int get_number_input(void)
-	{
-		return 1;
-	}
-
-
-	int get_input_id(int imputn)
-	{
-		return -1;
-	}
-
-
-	int exec_cpu(seqBucket *bucket);
-
-
-	int get_implementation_devies(void);
-
-};
-
-
-
-class seq_CommandBrightenssAndContrast : public seq_CommandBase
-{
-public:
-
-
-	int outimgid;
-	int inimgid;
-
-
-	int get_number_input(void)
-	{
-		return 1;
-	}
-
-
-	int get_input_id(int imputn)
-	{
-		return -1;
-	}
-
-
-	int exec_cpu(seqBucket * bucket);
-
-
-	int get_implementation_devies(void);
-
-
-};
-
-
-
-
-class seq_CommandGenTest : public seq_CommandBase
-{
-public:
-
-	int outimgid;
-
-	int get_number_input(void)
-	{
-		return 0;
-	}
-
-
-	int get_input_id(int imputn)
-	{
-		return -1;
-	}
-
-
-	int exec_cpu(seqBucket *bucket);
-
-
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif /* __SEQUENCER_COMMAND_H__ */

Modified: branches/soc-2013-vse/source/blender/sequencer/sequencer_common.h
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_common.h	2013-07-28 22:12:19 UTC (rev 58700)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_common.h	2013-07-29 02:36:52 UTC (rev 58701)
@@ -2,185 +2,19 @@
 #ifndef __SEQUENCER_COMMON_H__
 #define __SEQUENCER_COMMON_H__
 
-#include <vector>
 
-
-#include "pthread.h"
 #include "sequencer_main.h"
-#include "MEM_guardedalloc.h"
 
 
-typedef struct seqFrame seqFrame;
 
+#include "sequencer_seqBucket.h"
+#include "sequencer_seqFrame.h"
+#include "sequencer_SimpleRef.h"
 
-class seq_CommandBase;
-class seqBucket;
+#include "sequencer_seqRenderNode.h"
 
+#include "sequencer_seqChannel.h"
+#include "sequencer_seqEffect.h"
 
-typedef struct seqBucket_deplist
-{
-	seqBucket *buck;
-	uint dataid;
 
-
-
-
-} seqBucket_deplist;
-
-
-
-
-class seqBucket
-{
-
-public:
-
-	seqBucket *next, *prev;
-
-
-	uint bid;
-
-
-	ThreadMutex bucket_mutex;
-	int refcount;
-
-
-	seqFrame *framep;
-	uint status;
-	uint devreq;
-
-	struct seqOutputImage * foi;
-
-	seqDevice *device_associated;
-
-
-
-	uint type; /* CPU or and GPU */
-
-	size_t dl_num;
-	seqBucket_deplist * dl;
-
-
-//	size_t imagest_num;
-//	seqImageStackInfo *ImStack;
-
-
-
-
-	seqImageStorage firstImgOutput;
-
-	seqImageStorage *internalImg;
-
-	void *commands;
-
-std::vector<seqImageStackInfo> ImStack_cpp;
-	std::vector<seq_CommandBase*> commands_cpp;
-
-	seqBucket(void)
-	{
-		pthread_mutex_init(&this->bucket_mutex, NULL);
-
-	}
-
-
-	void Retain(void)
-	{
-		pthread_mutex_lock(&this->bucket_mutex);
-		this->refcount++;
-		pthread_mutex_unlock(&this->bucket_mutex);
-	}
-
-	void Rlease(void)
-	{
-		seq_bucket_ref_dec(0, this);
-
-
-	}
-
-	void init(seqEngine *se, seqFrame *frm)
-	{
-
-		seq_bucket_ref_init(se, frm, this);
-
-	}
-
-
-
-
-
-
-	MEM_CXX_CLASS_ALLOC_FUNCS("seqBucket");
-
-
-
-
-};
-
-
-
-
-
-
-typedef enum seqOutput_Type
-{
-	SEQ_OUTPUT_TYPE_IMAGE = 1,
-	SEQ_OUTPUT_TYPE_SOUND = 2
-
-} seqOutput_Type;
-
-
-class seqOutput
-{
-	public:
-	seqOutput_Type type;
-
-	int channel;
-} ;
-
-
-class seqOutputImage : public seqOutput
-{
-
-public:
-
-	size_t num_buckets_no;
-	seqBucket *buckets_no;
-
-	std::vector<seqBucket*> buckets_cpp;
-
-
-	uint size[2];
-
-	uint textid;
-
-
-
-} ;
-
-
-
-
-typedef struct seqFrame
-{
-	struct seqFrame *next, *prev;
-
-
-	int refcount;
-
-	uint time;
-	uint id;
-
-	uchar dropflag;
-
-
-	uchar num_outputs;
-	seqOutput ** Outputs;
-
-
-
-
-
-} seqFrame;
-
-
 #endif /*__SEQUENCER_COMMON_H__*/

Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_device.cpp
===================================================================

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list