From ad96dacbc5a7cc61ccf74405927847f243a955b5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 17 Dec 2011 00:52:36 +0000 Subject: style edit only - move parenthesis onto second line of function definition (in keeping with most of blenders code) also split some long lines in own code. --- source/blender/avi/intern/avi.c | 57 +++++++++++++++++++++++++------------ source/blender/avi/intern/codecs.c | 15 ++++++---- source/blender/avi/intern/endian.c | 30 ++++++++++++------- source/blender/avi/intern/mjpeg.c | 57 ++++++++++++++++++++++++------------- source/blender/avi/intern/options.c | 3 +- source/blender/avi/intern/rgb32.c | 6 ++-- 6 files changed, 113 insertions(+), 55 deletions(-) (limited to 'source/blender/avi') diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index a021695b7c9..c6fdd2e1adc 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -63,7 +63,8 @@ char *tcc_to_char (unsigned int tcc); /* implemetation */ -unsigned int GET_FCC (FILE *fp) { +unsigned int GET_FCC (FILE *fp) +{ unsigned char tmp[4]; tmp[0] = getc(fp); @@ -74,7 +75,8 @@ unsigned int GET_FCC (FILE *fp) { return FCC (tmp); } -unsigned int GET_TCC (FILE *fp) { +unsigned int GET_TCC (FILE *fp) +{ char tmp[5]; tmp[0] = getc(fp); @@ -85,7 +87,8 @@ unsigned int GET_TCC (FILE *fp) { return FCC (tmp); } -char *fcc_to_char (unsigned int fcc) { +char *fcc_to_char (unsigned int fcc) +{ DEBUG_FCC[0]= (fcc)&127; DEBUG_FCC[1]= (fcc>>8)&127; DEBUG_FCC[2]= (fcc>>16)&127; @@ -94,7 +97,8 @@ char *fcc_to_char (unsigned int fcc) { return DEBUG_FCC; } -char *tcc_to_char (unsigned int tcc) { +char *tcc_to_char (unsigned int tcc) +{ DEBUG_FCC[0]= (tcc)&127; DEBUG_FCC[1]= (tcc>>8)&127; DEBUG_FCC[2]= 0; @@ -103,7 +107,8 @@ char *tcc_to_char (unsigned int tcc) { return DEBUG_FCC; } -int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num) { +int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num) +{ int cur_stream; if (movie == NULL) @@ -121,7 +126,8 @@ int AVI_get_stream (AviMovie *movie, int avist_type, int stream_num) { return -AVI_ERROR_FOUND; } -static int fcc_get_stream (int fcc) { +static int fcc_get_stream (int fcc) +{ char fccs[4]; fccs[0] = fcc; @@ -132,7 +138,8 @@ static int fcc_get_stream (int fcc) { return 10*(fccs[0]-'0') + (fccs[1]-'0'); } -static int fcc_is_data (int fcc) { +static int fcc_is_data (int fcc) +{ char fccs[4]; fccs[0] = fcc; @@ -148,7 +155,8 @@ static int fcc_is_data (int fcc) { return 1; } -AviError AVI_print_error (AviError in_error) { +AviError AVI_print_error (AviError in_error) +{ int error; if ((int) in_error < 0) @@ -190,12 +198,14 @@ AviError AVI_print_error (AviError in_error) { return in_error; } /* -void AVI_set_debug (int mode) { +void AVI_set_debug (int mode) +{ AVI_DEBUG= mode; } */ /* -int AVI_is_avi (char *name) { +int AVI_is_avi (char *name) +{ FILE *fp; int ret; @@ -216,7 +226,8 @@ int AVI_is_avi (char *name) { } */ -int AVI_is_avi (const char *name) { +int AVI_is_avi (const char *name) +{ int temp, fcca, j; AviMovie movie= {NULL}; AviMainHeader header; @@ -407,7 +418,8 @@ int AVI_is_avi (const char *name) { } -AviError AVI_open_movie (const char *name, AviMovie *movie) { +AviError AVI_open_movie (const char *name, AviMovie *movie) +{ int temp, fcca, size, j; DEBUG_PRINT("opening movie\n"); @@ -619,7 +631,11 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) { movie->entries[temp].Offset = GET_FCC (movie->fp); movie->entries[temp].Size = GET_FCC (movie->fp); - if (AVI_DEBUG) printf ("Index entry %04d: ChunkId:%s Flags:%d Offset:%d Size:%d\n", temp, fcc_to_char(movie->entries[temp].ChunkId), movie->entries[temp].Flags, movie->entries[temp].Offset, movie->entries[temp].Size); + if (AVI_DEBUG) { + printf("Index entry %04d: ChunkId:%s Flags:%d Offset:%d Size:%d\n", + temp, fcc_to_char(movie->entries[temp].ChunkId), movie->entries[temp].Flags, + movie->entries[temp].Offset, movie->entries[temp].Size); + } } /* Some AVI's have offset entries in absolute coordinates @@ -637,7 +653,8 @@ AviError AVI_open_movie (const char *name, AviMovie *movie) { return AVI_ERROR_NONE; } -void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) { +void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) +{ int cur_frame=-1, temp, i=0, rewind=1; void *buffer; @@ -681,7 +698,8 @@ void *AVI_read_frame (AviMovie *movie, AviFormat format, int frame, int stream) return buffer; } -AviError AVI_close (AviMovie *movie) { +AviError AVI_close (AviMovie *movie) +{ int i; fclose (movie->fp); @@ -703,7 +721,8 @@ AviError AVI_close (AviMovie *movie) { return AVI_ERROR_NONE; } -AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) { +AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) +{ va_list ap; AviList list; AviChunk chunk; @@ -892,7 +911,8 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) { return AVI_ERROR_NONE; } -AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) { +AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) +{ AviList list; AviChunk chunk; AviIndexEntry *temp; @@ -999,7 +1019,8 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) { return AVI_ERROR_NONE; } -AviError AVI_close_compress (AviMovie *movie) { +AviError AVI_close_compress (AviMovie *movie) +{ int temp, movi_size, i; fseek (movie->fp, 0L, SEEK_END); diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c index 78d8d4a32b2..73af7097994 100644 --- a/source/blender/avi/intern/codecs.c +++ b/source/blender/avi/intern/codecs.c @@ -40,7 +40,8 @@ #include "mjpeg.h" #include "rgb32.h" -void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) { +void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) +{ if (from == to) return buffer; @@ -82,7 +83,8 @@ void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat f return buffer; } -int avi_get_data_id (AviFormat format, int stream) { +int avi_get_data_id (AviFormat format, int stream) +{ char fcc[5]; if (avi_get_format_type (format) == FCC("vids")) @@ -95,7 +97,8 @@ int avi_get_data_id (AviFormat format, int stream) { return FCC(fcc); } -int avi_get_format_type (AviFormat format) { +int avi_get_format_type (AviFormat format) +{ switch (format) { case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB32: @@ -109,7 +112,8 @@ int avi_get_format_type (AviFormat format) { } } -int avi_get_format_fcc (AviFormat format) { +int avi_get_format_fcc (AviFormat format) +{ switch (format) { case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB32: @@ -125,7 +129,8 @@ int avi_get_format_fcc (AviFormat format) { } } -int avi_get_format_compression (AviFormat format) { +int avi_get_format_compression (AviFormat format) +{ switch (format) { case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB32: diff --git a/source/blender/avi/intern/endian.c b/source/blender/avi/intern/endian.c index 194880605b6..29b3047eca4 100644 --- a/source/blender/avi/intern/endian.c +++ b/source/blender/avi/intern/endian.c @@ -43,7 +43,8 @@ #include "avi_intern.h" #ifdef __BIG_ENDIAN__ -static void invert (int *num) { +static void invert (int *num) +{ int new=0,i,j; for (j=0; j < 4; j++) { @@ -55,7 +56,8 @@ static void invert (int *num) { *num = new; } -static void sinvert (short int *num) { +static void sinvert (short int *num) +{ short int new=0; int i,j; @@ -68,20 +70,23 @@ static void sinvert (short int *num) { *num = new; } -static void Ichunk (AviChunk *chunk) { +static void Ichunk (AviChunk *chunk) +{ invert (&chunk->fcc); invert (&chunk->size); } #endif #ifdef __BIG_ENDIAN__ -static void Ilist (AviList *list){ +static void Ilist (AviList *list) +{ invert (&list->fcc); invert (&list->size); invert (&list->ids); } -static void Imainh (AviMainHeader *mainh) { +static void Imainh (AviMainHeader *mainh) +{ invert (&mainh->fcc); invert (&mainh->size); invert (&mainh->MicroSecPerFrame); @@ -100,7 +105,8 @@ static void Imainh (AviMainHeader *mainh) { invert (&mainh->Reserved[3]); } -static void Istreamh (AviStreamHeader *streamh) { +static void Istreamh (AviStreamHeader *streamh) +{ invert (&streamh->fcc); invert (&streamh->size); invert (&streamh->Type); @@ -122,7 +128,8 @@ static void Istreamh (AviStreamHeader *streamh) { sinvert (&streamh->bottom); } -static void Ibitmaph (AviBitmapInfoHeader *bitmaph) { +static void Ibitmaph (AviBitmapInfoHeader *bitmaph) +{ invert (&bitmaph->fcc); invert (&bitmaph->size); invert (&bitmaph->Size); @@ -138,7 +145,8 @@ static void Ibitmaph (AviBitmapInfoHeader *bitmaph) { invert (&bitmaph->ClrImportant); } -static void Imjpegu (AviMJPEGUnknown *mjpgu) { +static void Imjpegu (AviMJPEGUnknown *mjpgu) +{ invert (&mjpgu->a); invert (&mjpgu->b); invert (&mjpgu->c); @@ -148,7 +156,8 @@ static void Imjpegu (AviMJPEGUnknown *mjpgu) { invert (&mjpgu->g); } -static void Iindexe (AviIndexEntry *indexe) { +static void Iindexe (AviIndexEntry *indexe) +{ invert (&indexe->ChunkId); invert (&indexe->Flags); invert (&indexe->Offset); @@ -156,7 +165,8 @@ static void Iindexe (AviIndexEntry *indexe) { } #endif /* __BIG_ENDIAN__ */ -void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int type) { +void awrite (AviMovie *movie, void *datain, int block, int size, FILE *fp, int type) +{ #ifdef __BIG_ENDIAN__ void *data; diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/mjpeg.c index e55549bd05e..dab0b213d95 100644 --- a/source/blender/avi/intern/mjpeg.c +++ b/source/blender/avi/intern/mjpeg.c @@ -50,7 +50,8 @@ static void jpegmemsrcmgr_build (j_decompress_ptr dinfo, unsigned char *buffer, static int numbytes; -static void add_huff_table (j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) { +static void add_huff_table (j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) +{ if (*htblptr == NULL) *htblptr = jpeg_alloc_huff_table((j_common_ptr) dinfo); @@ -64,7 +65,8 @@ static void add_huff_table (j_decompress_ptr dinfo, JHUFF_TBL **htblptr, const U /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ /* IMPORTANT: these are only valid for 8-bit data precision! */ -static void std_huff_tables (j_decompress_ptr dinfo) { +static void std_huff_tables (j_decompress_ptr dinfo) +{ static const UINT8 bits_dc_luminance[17] = { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; @@ -142,7 +144,8 @@ static void std_huff_tables (j_decompress_ptr dinfo) { bits_ac_chrominance, val_ac_chrominance); } -static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsigned int width, unsigned int height, int bufsize) { +static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsigned int width, unsigned int height, int bufsize) +{ int rowstride; unsigned int y; struct jpeg_decompress_struct dinfo; @@ -194,7 +197,8 @@ static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsign return 1; } -static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char *inBuffer, int width, int height, int bufsize) { +static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char *inBuffer, int width, int height, int bufsize) +{ int i, rowstride; unsigned int y; struct jpeg_compress_struct cinfo; @@ -255,7 +259,8 @@ static void Compress_JPEG(int quality, unsigned char *outbuffer, unsigned char * jpeg_destroy_compress(&cinfo); } -static void interlace(unsigned char *to, unsigned char *from, int width, int height) { +static void interlace(unsigned char *to, unsigned char *from, int width, int height) +{ int i, rowstride= width*3; for (i=0; idest->free_in_buffer; MEM_freeN(cinfo->dest); } -static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, int bufsize) { +static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, int bufsize) +{ cinfo->dest= MEM_mallocN(sizeof(*(cinfo->dest)), "avi.jpegmemdestmgr_build"); cinfo->dest->init_destination= jpegmemdestmgr_init_destination; @@ -410,11 +424,13 @@ static void jpegmemdestmgr_build(j_compress_ptr cinfo, unsigned char *buffer, in /* Decompression from memory */ -static void jpegmemsrcmgr_init_source(j_decompress_ptr dinfo) { +static void jpegmemsrcmgr_init_source(j_decompress_ptr dinfo) +{ (void)dinfo; } -static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo) { +static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo) +{ unsigned char *buf= (unsigned char*) dinfo->src->next_input_byte-2; /* if we get called, must have run out of data */ @@ -429,7 +445,8 @@ static boolean jpegmemsrcmgr_fill_input_buffer(j_decompress_ptr dinfo) { return TRUE; } -static void jpegmemsrcmgr_skip_input_data(j_decompress_ptr dinfo, long skipcnt) { +static void jpegmemsrcmgr_skip_input_data(j_decompress_ptr dinfo, long skipcnt) +{ if (dinfo->src->bytes_in_buffersrc->bytes_in_buffer; @@ -437,13 +454,15 @@ static void jpegmemsrcmgr_skip_input_data(j_decompress_ptr dinfo, long skipcnt) dinfo->src->bytes_in_buffer-= skipcnt; } -static void jpegmemsrcmgr_term_source(j_decompress_ptr dinfo) { +static void jpegmemsrcmgr_term_source(j_decompress_ptr dinfo) +{ numbytes-= dinfo->src->bytes_in_buffer; MEM_freeN(dinfo->src); } -static void jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize) { +static void jpegmemsrcmgr_build(j_decompress_ptr dinfo, unsigned char *buffer, int bufsize) +{ dinfo->src= MEM_mallocN(sizeof(*(dinfo->src)), "avi.jpegmemsrcmgr_build"); dinfo->src->init_source= jpegmemsrcmgr_init_source; diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/options.c index bda153d0cd3..483b708bee6 100644 --- a/source/blender/avi/intern/options.c +++ b/source/blender/avi/intern/options.c @@ -43,7 +43,8 @@ /* avi_set_compress_options gets its own file... now don't WE feel important? */ -AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) { +AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, AviOption option, void *opt_data) +{ int i; int useconds; diff --git a/source/blender/avi/intern/rgb32.c b/source/blender/avi/intern/rgb32.c index 4d088377c9e..e3be082cca6 100644 --- a/source/blender/avi/intern/rgb32.c +++ b/source/blender/avi/intern/rgb32.c @@ -40,7 +40,8 @@ #include "MEM_guardedalloc.h" #include "rgb32.h" -void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size) { +void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size) +{ int y, x, rowstridea, rowstrideb; unsigned char *buf; @@ -65,7 +66,8 @@ void *avi_converter_from_rgb32 (AviMovie *movie, int stream, unsigned char *buff return buf; } -void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size) { +void *avi_converter_to_rgb32 (AviMovie *movie, int stream, unsigned char *buffer, int *size) +{ int i; unsigned char *buf; unsigned char *to, *from; -- cgit v1.2.3