Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/avi
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/avi')
-rw-r--r--source/blender/avi/intern/avi.c2
-rw-r--r--source/blender/avi/intern/codecs.c156
-rw-r--r--source/blender/avi/intern/options.c124
3 files changed, 141 insertions, 141 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index ce414cd15fe..82bf3a3d21b 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -402,7 +402,7 @@ int AVI_is_avi (const char *name) {
/* at least one video track is needed */
return (movie_tracks != 0);
-
+
}
AviError AVI_open_movie (const char *name, AviMovie *movie) {
diff --git a/source/blender/avi/intern/codecs.c b/source/blender/avi/intern/codecs.c
index 47a5fc192fd..9d3da333957 100644
--- a/source/blender/avi/intern/codecs.c
+++ b/source/blender/avi/intern/codecs.c
@@ -42,102 +42,102 @@
#include "rgb32.h"
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size) {
- if (from == to)
- 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);
-
- switch (to) {
- case AVI_FORMAT_RGB24:
- switch (from) {
+ if (from == to)
+ 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);
+
+ 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;
case AVI_FORMAT_AVI_RGB:
- buffer = avi_converter_from_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_from_mjpeg (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
+ break;
case AVI_FORMAT_RGB32:
- buffer = avi_converter_from_rgb32 (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
+ break;
default:
- break;
+ break;
}
- break;
- case AVI_FORMAT_AVI_RGB:
- 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;
- case AVI_FORMAT_RGB32:
- buffer = avi_converter_to_rgb32 (movie, stream, buffer, size);
- break;
- default:
- break;
- }
- return buffer;
+ return buffer;
}
int avi_get_data_id (AviFormat format, int stream) {
- char fcc[5];
+ char fcc[5];
- if (avi_get_format_type (format) == FCC("vids"))
- sprintf (fcc,"%2.2ddc",stream);
- else if (avi_get_format_type (format) == FCC("auds"))
- sprintf (fcc,"%2.2ddc",stream);
- else
- return 0;
+ if (avi_get_format_type (format) == FCC("vids"))
+ sprintf (fcc,"%2.2ddc",stream);
+ else if (avi_get_format_type (format) == FCC("auds"))
+ sprintf (fcc,"%2.2ddc",stream);
+ else
+ return 0;
- return FCC(fcc);
+ return FCC(fcc);
}
int avi_get_format_type (AviFormat format) {
- switch (format) {
- case AVI_FORMAT_RGB24:
- case AVI_FORMAT_RGB32:
- case AVI_FORMAT_AVI_RGB:
- case AVI_FORMAT_MJPEG:
- return FCC("vids");
- break;
- default:
- return 0;
- break;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ case AVI_FORMAT_MJPEG:
+ return FCC("vids");
+ break;
+ default:
+ return 0;
+ break;
+ }
}
int avi_get_format_fcc (AviFormat format) {
- switch (format) {
- case AVI_FORMAT_RGB24:
- case AVI_FORMAT_RGB32:
- case AVI_FORMAT_AVI_RGB:
- return FCC("DIB ");
- break;
- case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- break;
- default:
- return 0;
- break;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ return FCC("DIB ");
+ break;
+ case AVI_FORMAT_MJPEG:
+ return FCC("MJPG");
+ break;
+ default:
+ return 0;
+ break;
+ }
}
int avi_get_format_compression (AviFormat format) {
- switch (format) {
- case AVI_FORMAT_RGB24:
- case AVI_FORMAT_RGB32:
- case AVI_FORMAT_AVI_RGB:
- return 0;
- break;
- case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- break;
- default:
- return 0;
- break;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ return 0;
+ break;
+ case AVI_FORMAT_MJPEG:
+ return FCC("MJPG");
+ break;
+ default:
+ return 0;
+ break;
+ }
}
diff --git a/source/blender/avi/intern/options.c b/source/blender/avi/intern/options.c
index 533bce2c8ea..edb708d8a69 100644
--- a/source/blender/avi/intern/options.c
+++ b/source/blender/avi/intern/options.c
@@ -53,77 +53,77 @@ AviError AVI_set_compress_option (AviMovie *movie, int option_type, int stream,
switch (option_type) {
case AVI_OPTION_TYPE_MAIN:
switch (option) {
- case AVI_OPTION_WIDTH:
- movie->header->Width = *((int *) opt_data);
- movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
-
- for (i=0; i < movie->header->Streams; i++) {
- if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- ((AviBitmapInfoHeader *) movie->streams[i].sf)->Width = *((int *) opt_data);
- movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
- movie->streams[i].sh.right = *((int *) opt_data);
- ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
- fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ case AVI_OPTION_WIDTH:
+ movie->header->Width = *((int *) opt_data);
+ movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
+
+ for (i=0; i < movie->header->Streams; i++) {
+ if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ ((AviBitmapInfoHeader *) movie->streams[i].sf)->Width = *((int *) opt_data);
+ movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
+ movie->streams[i].sh.right = *((int *) opt_data);
+ ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
+ fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
+ }
+
+ break;
- break;
-
- case AVI_OPTION_HEIGHT:
- movie->header->Height = *((int *) opt_data);
- movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
-
- for (i=0; i < movie->header->Streams; i++) {
- if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- ((AviBitmapInfoHeader *) movie->streams[i].sf)->Height = *((int *) opt_data);
- movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
- movie->streams[i].sh.bottom = *((int *) opt_data);
- ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
- fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ case AVI_OPTION_HEIGHT:
+ movie->header->Height = *((int *) opt_data);
+ movie->header->SuggestedBufferSize = movie->header->Width*movie->header->Height*3;
+
+ for (i=0; i < movie->header->Streams; i++) {
+ if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ ((AviBitmapInfoHeader *) movie->streams[i].sf)->Height = *((int *) opt_data);
+ movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
+ movie->streams[i].sh.bottom = *((int *) opt_data);
+ ((AviBitmapInfoHeader *) movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
+ fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
+ }
+
+ break;
- break;
-
- case AVI_OPTION_QUALITY:
- for (i=0; i < movie->header->Streams; i++) {
- if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- movie->streams[i].sh.Quality = (*((int *) opt_data))*100;
- fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ case AVI_OPTION_QUALITY:
+ for (i=0; i < movie->header->Streams; i++) {
+ if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ movie->streams[i].sh.Quality = (*((int *) opt_data))*100;
+ fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
- break;
-
- case AVI_OPTION_FRAMERATE:
- if (1000000/(*((double *) opt_data)))
- movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data));
-
- for (i=0; i < movie->header->Streams; i++) {
- if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- movie->streams[i].sh.Scale = movie->header->MicroSecPerFrame;
- fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ }
+ break;
+
+ case AVI_OPTION_FRAMERATE:
+ if (1000000/(*((double *) opt_data)))
+ movie->header->MicroSecPerFrame = 1000000/(*((double *) opt_data));
+
+ for (i=0; i < movie->header->Streams; i++) {
+ if (avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ movie->streams[i].sh.Scale = movie->header->MicroSecPerFrame;
+ fseek (movie->fp, movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
-
+ }
+
}
- 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;
- case AVI_OPTION_TYPE_STRH:
- break;
- case AVI_OPTION_TYPE_STRF:
- break;
- default:
- return AVI_ERROR_OPTION;
- break;
- }
+ break;
+ case AVI_OPTION_TYPE_STRH:
+ break;
+ case AVI_OPTION_TYPE_STRF:
+ break;
+ default:
+ return AVI_ERROR_OPTION;
+ break;
+ }
- return AVI_ERROR_NONE;
+ return AVI_ERROR_NONE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:49:30 +0300