From 1e9bf0cfdb6c925b28af6f0330467e7d9d798c05 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Mar 2010 09:30:00 +0000 Subject: spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text) --- source/blender/avi/AVI_avi.h | 2 +- source/blender/avi/intern/avi.c | 66 +++++++++++++-------------- source/blender/avi/intern/codecs.c | 90 ++++++++++++++++++------------------- source/blender/avi/intern/mjpeg.c | 8 ++-- source/blender/avi/intern/options.c | 14 +++--- 5 files changed, 90 insertions(+), 90 deletions(-) (limited to 'source/blender/avi') diff --git a/source/blender/avi/AVI_avi.h b/source/blender/avi/AVI_avi.h index 42493685ede..a3115e0543b 100644 --- a/source/blender/avi/AVI_avi.h +++ b/source/blender/avi/AVI_avi.h @@ -175,7 +175,7 @@ typedef struct _AviStreamRec { } AviStreamRec; typedef struct _AviMovie { - FILE *fp; + FILE *fp; int type; #define AVI_MOVIE_READ 0 diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 5be39557577..a73dec57a55 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -197,8 +197,8 @@ int AVI_is_avi (char *name) { return 0; if (GET_FCC (fp) != FCC("RIFF") || - !GET_FCC (fp) || - GET_FCC (fp) != FCC("AVI ")) { + !GET_FCC (fp) || + GET_FCC (fp) != FCC("AVI ")) { ret = 0; } else { ret = 1; @@ -228,19 +228,19 @@ int AVI_is_avi (char *name) { return 0; if (GET_FCC (movie.fp) != FCC("RIFF") || - !(movie.size = GET_FCC (movie.fp))) { - fclose(movie.fp); + !(movie.size = GET_FCC (movie.fp))) { + fclose(movie.fp); return 0; } movie.header = &header; if (GET_FCC (movie.fp) != FCC("AVI ") || - GET_FCC (movie.fp) != FCC("LIST") || - !GET_FCC (movie.fp) || - GET_FCC (movie.fp) != FCC("hdrl") || - (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") || - !(movie.header->size = GET_FCC (movie.fp))) { + GET_FCC (movie.fp) != FCC("LIST") || + !GET_FCC (movie.fp) || + GET_FCC (movie.fp) != FCC("hdrl") || + (movie.header->fcc = GET_FCC (movie.fp)) != FCC("avih") || + !(movie.header->size = GET_FCC (movie.fp))) { DEBUG("bad initial header info\n"); fclose(movie.fp); return 0; @@ -274,10 +274,10 @@ int AVI_is_avi (char *name) { for (temp=0; temp < movie.header->Streams; temp++) { if (GET_FCC(movie.fp) != FCC("LIST") || - !GET_FCC (movie.fp) || - GET_FCC (movie.fp) != FCC ("strl") || - (movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) != FCC ("strh") || - !(movie.streams[temp].sh.size = GET_FCC (movie.fp))) { + !GET_FCC (movie.fp) || + GET_FCC (movie.fp) != FCC ("strl") || + (movie.streams[temp].sh.fcc = GET_FCC (movie.fp)) != FCC ("strh") || + !(movie.streams[temp].sh.size = GET_FCC (movie.fp))) { DEBUG("bad stream header information\n"); MEM_freeN(movie.streams); @@ -357,7 +357,7 @@ int AVI_is_avi (char *name) { fcca = bi->Compression; - if ( movie.streams[temp].format == + if ( movie.streams[temp].format == AVI_FORMAT_AVI_RGB) { if (fcca == FCC ("DIB ") || fcca == FCC ("RGB ") || @@ -386,7 +386,7 @@ int AVI_is_avi (char *name) { MEM_freeN(movie.streams); fclose(movie.fp); - return 0; + return 0; } fseek(movie.fp, temp, SEEK_CUR); } @@ -417,17 +417,17 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { return AVI_ERROR_OPEN; if (GET_FCC (movie->fp) != FCC("RIFF") || - !(movie->size = GET_FCC (movie->fp))) + !(movie->size = GET_FCC (movie->fp))) return AVI_ERROR_FORMAT; movie->header = (AviMainHeader *) MEM_mallocN (sizeof (AviMainHeader), "movieheader"); if (GET_FCC (movie->fp) != FCC("AVI ") || - GET_FCC (movie->fp) != FCC("LIST") || - !GET_FCC (movie->fp) || - GET_FCC (movie->fp) != FCC("hdrl") || - (movie->header->fcc = GET_FCC (movie->fp)) != FCC("avih") || - !(movie->header->size = GET_FCC (movie->fp))) { + GET_FCC (movie->fp) != FCC("LIST") || + !GET_FCC (movie->fp) || + GET_FCC (movie->fp) != FCC("hdrl") || + (movie->header->fcc = GET_FCC (movie->fp)) != FCC("avih") || + !(movie->header->size = GET_FCC (movie->fp))) { DEBUG("bad initial header info\n"); return AVI_ERROR_FORMAT; } @@ -459,10 +459,10 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { for (temp=0; temp < movie->header->Streams; temp++) { if (GET_FCC(movie->fp) != FCC("LIST") || - !GET_FCC (movie->fp) || - GET_FCC (movie->fp) != FCC ("strl") || - (movie->streams[temp].sh.fcc = GET_FCC (movie->fp)) != FCC ("strh") || - !(movie->streams[temp].sh.size = GET_FCC (movie->fp))) { + !GET_FCC (movie->fp) || + GET_FCC (movie->fp) != FCC ("strl") || + (movie->streams[temp].sh.fcc = GET_FCC (movie->fp)) != FCC ("strh") || + !(movie->streams[temp].sh.size = GET_FCC (movie->fp))) { DEBUG("bad stream header information\n"); return AVI_ERROR_FORMAT; } @@ -535,7 +535,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { fcca = bi->Compression; - if ( movie->streams[temp].format == + if ( movie->streams[temp].format == AVI_FORMAT_AVI_RGB) { if (fcca == FCC ("DIB ") || fcca == FCC ("RGB ") || @@ -559,7 +559,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { temp= GET_FCC (movie->fp); if (temp<0 || ftell(movie->fp) > movie->size) { DEBUG("incorrect size in header or error in AVI\n"); - return AVI_ERROR_FORMAT; + return AVI_ERROR_FORMAT; } fseek(movie->fp, temp, SEEK_CUR); } @@ -584,7 +584,7 @@ AviError AVI_open_movie (char *name, AviMovie *movie) { } if (ftell(movie->fp) > movie->size) { DEBUG("incorrect size in header or error in AVI\n"); - return AVI_ERROR_FORMAT; + return AVI_ERROR_FORMAT; } } @@ -727,9 +727,9 @@ AviError AVI_open_compress (char *name, AviMovie *movie, int streams, ...) { movie->header->fcc = FCC("avih"); movie->header->size = 56; movie->header->MicroSecPerFrame = 66667; - movie->header->MaxBytesPerSec = 0; - movie->header->PaddingGranularity = 0; - movie->header->Flags = AVIF_HASINDEX | AVIF_MUSTUSEINDEX; + movie->header->MaxBytesPerSec = 0; + movie->header->PaddingGranularity = 0; + movie->header->Flags = AVIF_HASINDEX | AVIF_MUSTUSEINDEX; movie->header->TotalFrames = 0; movie->header->InitialFrames = 0; movie->header->Streams = streams; @@ -906,10 +906,10 @@ AviError AVI_write_frame (AviMovie *movie, int frame_num, ...) { if (frame_num+1 > movie->index_entries) { temp = (AviIndexEntry *) MEM_mallocN ((frame_num+1) * - (movie->header->Streams+1) * sizeof(AviIndexEntry),"newidxentry"); + (movie->header->Streams+1) * sizeof(AviIndexEntry),"newidxentry"); if (movie->entries != NULL) { memcpy (temp, movie->entries, movie->index_entries * (movie->header->Streams+1) - * sizeof(AviIndexEntry)); + * sizeof(AviIndexEntry)); MEM_freeN (movie->entries); } diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c index 9691c903027..4ebcb216012 100644 --- a/source/blender/avi/intern/codecs.c +++ b/source/blender/avi/intern/codecs.c @@ -44,41 +44,41 @@ void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) { if (from == to) - return buffer; + return buffer; if (from != AVI_FORMAT_RGB24 && - to != AVI_FORMAT_RGB24) - return avi_format_convert(movie, stream, - avi_format_convert (movie, stream, buffer, from, AVI_FORMAT_RGB24, size), - AVI_FORMAT_RGB24, to, size); + to != AVI_FORMAT_RGB24) + return avi_format_convert(movie, stream, + avi_format_convert (movie, stream, buffer, from, AVI_FORMAT_RGB24, size), + AVI_FORMAT_RGB24, to, size); switch (to) { case AVI_FORMAT_RGB24: - switch (from) { - case AVI_FORMAT_AVI_RGB: - buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size); - break; - case AVI_FORMAT_MJPEG: - buffer = avi_converter_from_mjpeg (movie, stream, buffer, size); - break; - case AVI_FORMAT_RGB32: - buffer = avi_converter_from_rgb32 (movie, stream, buffer, size); - break; - default: - break; - } - break; + switch (from) { + case AVI_FORMAT_AVI_RGB: + buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size); + break; + case AVI_FORMAT_MJPEG: + buffer = avi_converter_from_mjpeg (movie, stream, buffer, size); + break; + case AVI_FORMAT_RGB32: + buffer = avi_converter_from_rgb32 (movie, stream, buffer, size); + break; + default: + break; + } + break; case AVI_FORMAT_AVI_RGB: - buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size); - break; + buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size); + break; case AVI_FORMAT_MJPEG: - buffer = avi_converter_to_mjpeg (movie, stream, buffer, size); - break; + buffer = avi_converter_to_mjpeg (movie, stream, buffer, size); + break; case AVI_FORMAT_RGB32: - buffer = avi_converter_to_rgb32 (movie, stream, buffer, size); - break; + buffer = avi_converter_to_rgb32 (movie, stream, buffer, size); + break; default: - break; + break; } return buffer; @@ -88,11 +88,11 @@ int avi_get_data_id (AviFormat format, int stream) { char fcc[5]; if (avi_get_format_type (format) == FCC("vids")) - sprintf (fcc,"%2.2ddc",stream); + sprintf (fcc,"%2.2ddc",stream); else if (avi_get_format_type (format) == FCC("auds")) - sprintf (fcc,"%2.2ddc",stream); + sprintf (fcc,"%2.2ddc",stream); else - return 0; + return 0; return FCC(fcc); } @@ -103,11 +103,11 @@ int avi_get_format_type (AviFormat format) { case AVI_FORMAT_RGB32: case AVI_FORMAT_AVI_RGB: case AVI_FORMAT_MJPEG: - return FCC("vids"); - break; + return FCC("vids"); + break; default: - return 0; - break; + return 0; + break; } } @@ -116,14 +116,14 @@ int avi_get_format_fcc (AviFormat format) { case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB32: case AVI_FORMAT_AVI_RGB: - return FCC("DIB "); - break; + return FCC("DIB "); + break; case AVI_FORMAT_MJPEG: - return FCC("MJPG"); - break; + return FCC("MJPG"); + break; default: - return 0; - break; + return 0; + break; } } @@ -132,13 +132,13 @@ int avi_get_format_compression (AviFormat format) { case AVI_FORMAT_RGB24: case AVI_FORMAT_RGB32: case AVI_FORMAT_AVI_RGB: - return 0; - break; + return 0; + break; case AVI_FORMAT_MJPEG: - return FCC("MJPG"); - break; + return FCC("MJPG"); + break; default: - return 0; - break; + return 0; + break; } } diff --git a/source/blender/avi/intern/mjpeg.c b/source/blender/avi/intern/mjpeg.c index 6608e6c8363..d7212e710e9 100644 --- a/source/blender/avi/intern/mjpeg.c +++ b/source/blender/avi/intern/mjpeg.c @@ -134,13 +134,13 @@ static void std_huff_tables (j_decompress_ptr dinfo) { 0xf9, 0xfa }; add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[0], - bits_dc_luminance, val_dc_luminance); + bits_dc_luminance, val_dc_luminance); add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[0], - bits_ac_luminance, val_ac_luminance); + bits_ac_luminance, val_ac_luminance); add_huff_table(dinfo, &dinfo->dc_huff_tbl_ptrs[1], - bits_dc_chrominance, val_dc_chrominance); + bits_dc_chrominance, val_dc_chrominance); add_huff_table(dinfo, &dinfo->ac_huff_tbl_ptrs[1], - bits_ac_chrominance, val_ac_chrominance); + bits_ac_chrominance, val_ac_chrominance); } static int Decode_JPEG(unsigned char *inBuffer, unsigned char *outBuffer, unsigned int width, unsigned int height, int bufsize) { diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/options.c index bab02ec2a40..7b194b86ab6 100644 --- a/source/blender/avi/intern/options.c +++ b/source/blender/avi/intern/options.c @@ -109,17 +109,17 @@ AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream, } - fseek (movie->fp, movie->offset_table[0], SEEK_SET); - awrite (movie, movie->header, 1, sizeof(AviMainHeader), movie->fp, AVI_MAINH); + fseek (movie->fp, movie->offset_table[0], SEEK_SET); + awrite (movie, movie->header, 1, sizeof(AviMainHeader), movie->fp, AVI_MAINH); - break; + break; case AVI_OPTION_TYPE_STRH: - break; + break; case AVI_OPTION_TYPE_STRF: - break; + break; default: - return AVI_ERROR_OPTION; - break; + return AVI_ERROR_OPTION; + break; } return AVI_ERROR_NONE; -- cgit v1.2.3