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
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/avi/intern/avi_codecs.c')
-rw-r--r--source/blender/avi/intern/avi_codecs.c156
1 files changed, 79 insertions, 77 deletions
diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/avi/intern/avi_codecs.c
index 781519bbe24..705ca1e41e1 100644
--- a/source/blender/avi/intern/avi_codecs.c
+++ b/source/blender/avi/intern/avi_codecs.c
@@ -23,7 +23,6 @@
* This is external code. Identify and convert different avi-files.
*/
-
#include "AVI_avi.h"
#include "avi_intern.h"
@@ -31,102 +30,105 @@
#include "avi_mjpeg.h"
#include "avi_rgb32.h"
-void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, size_t *size)
+void *avi_format_convert(
+ AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, size_t *size)
{
- if (from == to)
- return buffer;
+ 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);
- }
+ 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_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;
- }
+ 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_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");
- default:
- return 0;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ case AVI_FORMAT_MJPEG:
+ return FCC("vids");
+ default:
+ return 0;
+ }
}
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 ");
- case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- default:
- return 0;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ return FCC("DIB ");
+ case AVI_FORMAT_MJPEG:
+ return FCC("MJPG");
+ default:
+ return 0;
+ }
}
int avi_get_format_compression(AviFormat format)
{
- switch (format) {
- case AVI_FORMAT_RGB24:
- case AVI_FORMAT_RGB32:
- case AVI_FORMAT_AVI_RGB:
- return 0;
- case AVI_FORMAT_MJPEG:
- return FCC("MJPG");
- default:
- return 0;
- }
+ switch (format) {
+ case AVI_FORMAT_RGB24:
+ case AVI_FORMAT_RGB32:
+ case AVI_FORMAT_AVI_RGB:
+ return 0;
+ case AVI_FORMAT_MJPEG:
+ return FCC("MJPG");
+ default:
+ return 0;
+ }
}