Improve frame allocation
This commit is contained in:
1 parent
2dcdfaccf5
commit
b187bf6424
3 files changed
+107
-111
No files matched your search
+67
-27
@@ -52,7 +52,7 @@ typedef unsigned long long UInt64;
|
||||
static inline Void* xMallocMem( SizeT nitems )
|
||||
{
|
||||
Void *d;
|
||||
if ( (d = malloc( nitems )) == NULL )
|
||||
if( ( d = malloc( nitems ) ) == NULL )
|
||||
{
|
||||
printf( "malloc failed.\n" );
|
||||
return NULL;
|
||||
@@ -64,13 +64,13 @@ static inline Void* xCallocMem( SizeT nitems, SizeT size )
|
||||
{
|
||||
size_t padded_size = nitems * size;
|
||||
Void *d = xMallocMem( padded_size );
|
||||
memset( d, 0, (int) padded_size );
|
||||
memset( d, 0, ( int )padded_size );
|
||||
return d;
|
||||
}
|
||||
|
||||
static inline Void xFreePointer( Void *pointer )
|
||||
{
|
||||
if ( pointer != NULL )
|
||||
if( pointer != NULL )
|
||||
{
|
||||
free( pointer );
|
||||
pointer = NULL;
|
||||
@@ -96,15 +96,15 @@ Int getMem2D( T*** array2D, Int dim0, Int dim1 )
|
||||
{
|
||||
Int i;
|
||||
|
||||
if ( (*array2D = (T**) xMallocMem( dim0 * sizeof(T*) )) == NULL ) printf(
|
||||
"get_mem2Dint: array2D" );
|
||||
if ( (*(*array2D) = (T*) xCallocMem( dim0 * dim1, sizeof(T) )) == NULL ) printf(
|
||||
"get_mem2Dint: array2D" );
|
||||
if( ( *array2D = ( T** )xMallocMem( dim0 * sizeof(T*) ) ) == NULL )
|
||||
printf( "get_mem2Dint: array2D" );
|
||||
if( ( *( *array2D ) = ( T* )xCallocMem( dim0 * dim1, sizeof(T) ) ) == NULL )
|
||||
printf( "get_mem2Dint: array2D" );
|
||||
|
||||
for ( i = 1; i < dim0; i++ )
|
||||
(*array2D)[i] = (*array2D)[i - 1] + dim1;
|
||||
for( i = 1; i < dim0; i++ )
|
||||
( *array2D )[i] = ( *array2D )[i - 1] + dim1;
|
||||
|
||||
return dim0 * (sizeof(T*) + dim1 * sizeof(T));
|
||||
return dim0 * ( sizeof(T*) + dim1 * sizeof(T) );
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
@@ -112,13 +112,13 @@ Int getMem3D( T**** array3D, Int dim0, Int dim1, Int dim2 )
|
||||
{
|
||||
Int i, mem_size = dim0 * sizeof(T**);
|
||||
|
||||
if ( ((*array3D) = (T***) xMallocMem( dim0 * sizeof(T**) )) == NULL ) printf(
|
||||
"get_mem3Dint: array3D" );
|
||||
if( ( ( *array3D ) = ( T*** )xMallocMem( dim0 * sizeof(T**) ) ) == NULL )
|
||||
printf( "get_mem3Dint: array3D" );
|
||||
|
||||
mem_size += getMem2D( *array3D, dim0 * dim1, dim2 );
|
||||
|
||||
for ( i = 1; i < dim0; i++ )
|
||||
(*array3D)[i] = (*array3D)[i - 1] + dim1;
|
||||
for( i = 1; i < dim0; i++ )
|
||||
( *array3D )[i] = ( *array3D )[i - 1] + dim1;
|
||||
|
||||
return mem_size;
|
||||
}
|
||||
@@ -128,13 +128,13 @@ Int getMem4D( T***** array4D, Int dim0, Int dim1, Int dim2, Int dim3 )
|
||||
{
|
||||
int i, mem_size = dim0 * sizeof(int***);
|
||||
|
||||
if ( ((*array4D) = (T****) xMallocMem( dim0 * sizeof(T***) )) == NULL ) printf(
|
||||
"get_mem4Dint: array4D" );
|
||||
if( ( ( *array4D ) = ( T**** )xMallocMem( dim0 * sizeof(T***) ) ) == NULL )
|
||||
printf( "get_mem4Dint: array4D" );
|
||||
|
||||
mem_size += getMem3D( *array4D, dim0 * dim1, dim2, dim3 );
|
||||
|
||||
for ( i = 1; i < dim0; i++ )
|
||||
(*array4D)[i] = (*array4D)[i - 1] + dim1;
|
||||
for( i = 1; i < dim0; i++ )
|
||||
( *array4D )[i] = ( *array4D )[i - 1] + dim1;
|
||||
|
||||
return mem_size;
|
||||
}
|
||||
@@ -144,13 +144,40 @@ Int getMem5D( T****** array5D, Int dim0, Int dim1, Int dim2, Int dim3, Int dim4
|
||||
{
|
||||
int i, mem_size = dim0 * sizeof(T****);
|
||||
|
||||
if ( ((*array5D) = (T*****) xMallocMem( dim0 * sizeof(T****) )) == NULL ) printf(
|
||||
"get_mem5Dint: array5D" );
|
||||
if( ( ( *array5D ) = ( T***** )xMallocMem( dim0 * sizeof(T****) ) ) == NULL )
|
||||
printf( "get_mem5Dint: array5D" );
|
||||
|
||||
mem_size += getMem4D( *array5D, dim0 * dim1, dim2, dim3, dim4 );
|
||||
|
||||
for ( i = 1; i < dim0; i++ )
|
||||
(*array5D)[i] = (*array5D)[i - 1] + dim1;
|
||||
for( i = 1; i < dim0; i++ )
|
||||
( *array5D )[i] = ( *array5D )[i - 1] + dim1;
|
||||
|
||||
return mem_size;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
Int getMem3ImageComponents( T**** array3D, Int dim1, Int dim2, Int ratioDim1Chroma, Int ratioDim2Chroma )
|
||||
{
|
||||
Int dim0 = 3;
|
||||
Int i, mem_size = ( dim1 * dim2 + dim1 / ratioDim1Chroma * dim2 / ratioDim2Chroma * 2 ) * sizeof(T);
|
||||
|
||||
mem_size += getMem2D<T*>( array3D, dim0, dim1 );
|
||||
|
||||
if( ( ( *array3D )[0][0] = ( T* )xCallocMem( dim1 * dim2 + dim1 / ratioDim1Chroma * dim2 / ratioDim2Chroma * 2, sizeof(T) ) ) == NULL )
|
||||
printf( "getMem3DImageComponents: array1D" );
|
||||
|
||||
// Luma
|
||||
for( i = 1; i < dim1; i++ )
|
||||
( *array3D )[0][i] = ( *array3D )[0][i - 1] + dim2;
|
||||
|
||||
// Chroma
|
||||
( *array3D )[1][0] = ( *array3D )[0][0] + dim2 * dim1;
|
||||
for( i = 1; i < dim1 / ratioDim1Chroma; i++ )
|
||||
( *array3D )[1][i] = ( *array3D )[1][i - 1] + dim2;
|
||||
|
||||
( *array3D )[2][0] = ( *array3D )[1][0] + dim2 / ratioDim2Chroma * dim1 / ratioDim1Chroma;
|
||||
for( i = 1; i < dim1 / ratioDim1Chroma; i++ )
|
||||
( *array3D )[2][i] = ( *array3D )[2][i - 1] + dim2 / ratioDim2Chroma;
|
||||
|
||||
return mem_size;
|
||||
}
|
||||
@@ -167,9 +194,9 @@ Void freeMem1D( T *array1D )
|
||||
template<typename T>
|
||||
Void freeMem2D( T** array2D )
|
||||
{
|
||||
if ( array2D )
|
||||
if( array2D )
|
||||
{
|
||||
if ( *array2D )
|
||||
if( *array2D )
|
||||
xFreeMem( *array2D );
|
||||
else
|
||||
printf( "free_mem2Dint: trying to free unused memory" );
|
||||
@@ -185,7 +212,7 @@ Void freeMem2D( T** array2D )
|
||||
template<typename T>
|
||||
Void freeMem3D( T*** array3D )
|
||||
{
|
||||
if ( array3D )
|
||||
if( array3D )
|
||||
{
|
||||
freeMem2D( *array3D );
|
||||
xFreeMem( array3D );
|
||||
@@ -199,7 +226,7 @@ Void freeMem3D( T*** array3D )
|
||||
template<typename T>
|
||||
Void freeMem4D( T**** array4D )
|
||||
{
|
||||
if ( array4D )
|
||||
if( array4D )
|
||||
{
|
||||
freeMem3D( *array4D );
|
||||
xFreeMem( array4D );
|
||||
@@ -213,7 +240,7 @@ Void freeMem4D( T**** array4D )
|
||||
template<typename T>
|
||||
Void freeMem5D( T***** array5D )
|
||||
{
|
||||
if ( array5D )
|
||||
if( array5D )
|
||||
{
|
||||
freeMem4D( *array5D );
|
||||
xFreeMem( array5D );
|
||||
@@ -224,6 +251,19 @@ Void freeMem5D( T***** array5D )
|
||||
}
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
Void freeMem3ImageComponents( T*** array3D )
|
||||
{
|
||||
if( array3D )
|
||||
{
|
||||
if( **array3D )
|
||||
xFreeMem( **array3D );
|
||||
|
||||
freeMem2D<T*>( array3D );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // NAMESPACE
|
||||
|
||||
#endif // __LIBMEMORY_H__
|
||||
Reference in new issue
Block a user