[Scummvm-cvs-logs] SF.net SVN: scummvm: [22096] tools/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Sun Apr 23 05:14:01 CEST 2006
Revision: 22096
Author: sev
Date: 2006-04-23 05:12:29 -0700 (Sun, 23 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22096&view=rev
Log Message:
-----------
Initial check-in of DXA encoder. Contributed code.
Modified Paths:
--------------
tools/trunk/Makefile
tools/trunk/Makefile.mingw
Added Paths:
-----------
tools/trunk/encode_dxa.cpp
Modified: tools/trunk/Makefile
===================================================================
--- tools/trunk/Makefile 2006-04-23 11:38:48 UTC (rev 22095)
+++ tools/trunk/Makefile 2006-04-23 12:12:29 UTC (rev 22096)
@@ -28,6 +28,7 @@
dekyra$(EXEEXT) \
descumm$(EXEEXT) \
desword2$(EXEEXT) \
+ encode_dxa$(EXEEXT) \
extract_kyra$(EXEEXT) \
extract_loom_tg16$(EXEEXT) \
extract_mm_c64$(EXEEXT) \
@@ -59,6 +60,9 @@
compress_scumm_bun$(EXEEXT): compress_scumm_bun.o compress.o util.o
$(CXX) $(LDFLAGS) -o $@ $+
+encode_dxa$(EXEEXT): encode_dxa.o util.o
+ $(CXX) $(LDFLAGS) -o $@ $+ -lpng -lsndfile -lz
+
extract_loom_tg16$(EXEEXT): extract_loom_tg16.o util.o
$(CC) $(LDFLAGS) -o $@ $+
@@ -112,6 +116,7 @@
descumm.o descumm6.o descumm-common.o descumm-tool.o \
dekyra.o \
desword2.o \
+encode_dxa.o \
extract_kyra.o \
extract_loom_tg16.o \
extract_mm_c64.o \
Modified: tools/trunk/Makefile.mingw
===================================================================
--- tools/trunk/Makefile.mingw 2006-04-23 11:38:48 UTC (rev 22095)
+++ tools/trunk/Makefile.mingw 2006-04-23 12:12:29 UTC (rev 22096)
@@ -23,6 +23,7 @@
strip dekyra.exe -o $(SCUMMVMPATH)/tools/dekyra.exe
strip descumm.exe -o $(SCUMMVMPATH)/tools/descumm.exe
strip desword2.exe -o $(SCUMMVMPATH)/tools/desword2.exe
+ strip encode_dxa.exe -o $(SCUMMVMPATH)/tools/encode_dxa.exe
strip extract_kyra.exe -o $(SCUMMVMPATH)/tools/extract_kyra.exe
strip extract_loom_tg16.exe -o $(SCUMMVMPATH)/tools/extract_loom_tg16.exe
strip extract_mm_c64.exe -o $(SCUMMVMPATH)/tools/extract_mm_c64.exe
Added: tools/trunk/encode_dxa.cpp
===================================================================
--- tools/trunk/encode_dxa.cpp (rev 0)
+++ tools/trunk/encode_dxa.cpp 2006-04-23 12:12:29 UTC (rev 22096)
@@ -0,0 +1,452 @@
+/* encode_dxa - compressor for dxa files
+ * Copyright (c) 2006 The ScummVM Team
+ * Copyright (c) 2006 Benjamin Haisch
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "util.h"
+
+#include <png.h>
+#include <sndfile.h>
+#include <zlib.h>
+
+const uint32 typeDEXA = 0x41584544;
+const uint32 typeFRAM = 0x4d415246;
+const uint32 typeWAVE = 0x45564157;
+const uint32 typeCMAP = 0x50414D43;
+const uint32 typeNULL = 0x4C4C554E;
+
+#define BUFFER_LEN 1024
+
+class DxaEncoder {
+private:
+ FILE *_dxa;
+ int _width, _height, _framerate, _framecount;
+ uint8 *_prevframe, *_prevpalette;
+
+public:
+ DxaEncoder(char *filename, int width, int height, int fps);
+ ~DxaEncoder();
+ void writeHeader();
+ void addAudio(char *wavfilename);
+ void writeFrame(uint8 *frame, uint8 *palette);
+};
+
+DxaEncoder::DxaEncoder(char *filename, int width, int height, int framerate) {
+ _dxa = fopen(filename, "wb");
+ _width = width;
+ _height = height;
+ _framerate = framerate;
+ _framecount = 0;
+ _prevframe = new uint8[_width * _height];
+ _prevpalette = new uint8[768];
+
+ writeHeader();
+}
+
+DxaEncoder::~DxaEncoder() {
+ fseek(_dxa, 0, SEEK_SET);
+
+ writeHeader();
+
+ fclose(_dxa);
+
+ delete[] _prevframe;
+ delete[] _prevpalette;
+}
+
+void DxaEncoder::writeHeader() {
+ //DEXA
+ uint8 unk = 0;
+
+ fwrite(&typeDEXA, 4, 1, _dxa);
+ fwrite(&unk, 1, 1, _dxa);
+
+ writeUint16BE(_dxa, _framecount);
+ writeUint32BE(_dxa, _framerate);
+ writeUint16BE(_dxa, _width);
+ writeUint16BE(_dxa, _height);
+}
+
+void DxaEncoder::addAudio(char* wavfilename) {
+ //WAVE
+ const int BUFSIZE = 8192;
+
+ FILE *wav = fopen(wavfilename, "rb");
+
+ fseek(wav, 0, SEEK_END);
+
+ int wavsize = ftell(wav);
+ int bytesleft = wavsize;
+
+ fseek(wav, 0, SEEK_SET);
+
+ fwrite(&typeWAVE, 4, 1, _dxa);
+
+ writeUint32BE(_dxa, wavsize);
+
+ printf("Adding WAVE audio track...");
+ fflush(stdout);
+
+ while (bytesleft > 0) {
+ uint8 buffer[BUFSIZE];
+ int readsize = BUFSIZE;
+
+ if (bytesleft - readsize < 0)
+ readsize = bytesleft;
+
+ fread(buffer, readsize, 1, wav);
+ fwrite(buffer, readsize, 1, _dxa);
+
+ bytesleft -= readsize;
+ }
+ printf("done\n");
+
+ fclose(wav);
+}
+
+void DxaEncoder::writeFrame(uint8 *frame, uint8 *palette) {
+
+ if (_framecount == 0 || memcmp(_prevpalette, palette, 768)) {
+ fwrite(&typeCMAP, 4, 1, _dxa);
+ fwrite(palette, 768, 1, _dxa);
+
+ memcpy(_prevpalette, palette, 768);
+ } else {
+ //NULL
+ fwrite(&typeNULL, 4, 1, _dxa);
+ }
+
+ if (_framecount == 0 || memcmp(_prevframe, frame, _width * _height)) {
+ //FRAM
+ uint8 compType;
+
+ fwrite(&typeFRAM, 4, 1, _dxa);
+
+ if (_framecount == 0)
+ compType = 2;
+ else
+ compType = 3;
+
+ fwrite(&compType, 1, 1, _dxa);
+
+ switch (compType) {
+ case 2:
+ {
+ uLong outsize = _width * _height;
+ uint8 *outbuf = new uint8[outsize];
+
+ compress(outbuf, &outsize, frame, _width * _height);
+
+ writeUint32BE(_dxa, outsize);
+
+ fwrite(outbuf, outsize, 1, _dxa);
+
+ delete[] outbuf;
+
+ break;
+ }
+ case 3:
+ {
+ uLong outsize = _width * _height;
+ uint8 *outbuf = new uint8[outsize];
+ uint8 *xorbuf = new uint8[_width * _height];
+
+ for (int i = 0; i < _width * _height; i++)
+ xorbuf[i] = _prevframe[i] ^ frame[i];
+
+ compress(outbuf, &outsize, xorbuf, _width * _height);
+
+ writeUint32BE(_dxa, outsize);
+
+ fwrite(outbuf, outsize, 1, _dxa);
+
+ delete[] outbuf;
+ delete[] xorbuf;
+
+ break;
+ }
+ }
+
+ memcpy(_prevframe, frame, _width * _height);
+
+ } else {
+ //NULL
+ fwrite(&typeNULL, 4, 1, _dxa);
+ }
+
+ _framecount++;
+}
+
+void copy_data_int(SNDFILE *outfile, SNDFILE *infile, int channels) {
+ static int data [BUFFER_LEN];
+ int frames, readcount;
+
+ frames = BUFFER_LEN / channels;
+ readcount = frames;
+
+ while (readcount > 0) {
+ readcount = sf_readf_int(infile, data, frames);
+ sf_writef_int(outfile, data, readcount);
+ }
+
+ return;
+}
+
+int convertAudio(const char* infilename, const char* outfilename, int useMsAdpcm) {
+
+ SNDFILE *infile = NULL, *outfile = NULL;
+ SF_INFO sfinfo;
+ int outfilemajor, outfileminor = 0, infileminor;
+
+ if ((infile = sf_open(infilename, SFM_READ, &sfinfo)) == NULL) {
+ return 1;
+ }
+
+ printf("Converting Wave file to MS ADPCM compressed file...");
+ fflush(stdout);
+
+ infileminor = sfinfo.format & SF_FORMAT_SUBMASK;
+
+ if (useMsAdpcm && sfinfo.format & SF_FORMAT_PCM_16)
+ outfileminor = outfileminor | SF_FORMAT_MS_ADPCM;
+
+ outfilemajor = sfinfo.format & (SF_FORMAT_TYPEMASK | SF_FORMAT_ENDMASK) | SF_FORMAT_WAV;
+
+ if (outfileminor == 0)
+ outfileminor = sfinfo.format & SF_FORMAT_SUBMASK;
+
+ if (outfileminor != 0)
+ sfinfo.format = outfilemajor | outfileminor;
+ else
+ sfinfo.format = outfilemajor | (sfinfo.format & SF_FORMAT_SUBMASK);
+
+ if (sf_format_check(&sfinfo) == 0) {
+ printf("Error : output file format is invalid (0x%08X).\n", sfinfo.format);
+ return 1;
+ };
+
+ // Open the output file.
+ if ((outfile = sf_open(outfilename, SFM_WRITE, &sfinfo)) == NULL) {
+ printf("Not able to open output file %s : %s\n", outfilename, sf_strerror(NULL));
+ return 1;
+ }
+
+ copy_data_int(outfile, infile, sfinfo.channels);
+
+ sf_close(infile);
+ sf_close(outfile);
+
+ printf("done\n");
+
+ return 0;
+}
+
+int read_png_file(char* filename, unsigned char *&image, unsigned char *&palette, int &width, int &height) {
+ png_byte header[8];
+
+ png_byte color_type;
+ png_byte bit_depth;
+
+ png_structp png_ptr;
+ png_infop info_ptr;
+ int number_of_passes;
+ png_bytep *row_pointers;
+
+ FILE *fp = fopen(filename, "rb");
+ if (!fp) {
+ printf("read_png_file: Can't open file: %s\n", filename);
+ exit(-1);
+ }
+ fread(header, 1, 8, fp);
+ if (png_sig_cmp(header, 0, 8))
+ return 1;
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+ if (!png_ptr)
+ return 1;
+
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ return 1;
+
+ if (setjmp(png_jmpbuf(png_ptr)))
+ return 1;
+
+ png_init_io(png_ptr, fp);
+ png_set_sig_bytes(png_ptr, 8);
+
+ png_read_info(png_ptr, info_ptr);
+
+ width = info_ptr->width;
+ height = info_ptr->height;
+ color_type = info_ptr->color_type;
+ bit_depth = info_ptr->bit_depth;
+
+ if (color_type != PNG_COLOR_TYPE_PALETTE) {
+ palette = NULL;
+ return 2;
+ }
+
+ number_of_passes = png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+ // read file
+ if (setjmp(png_jmpbuf(png_ptr)))
+ return 1;
+
+ row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
+ for (int y=0; y<height; y++)
+ row_pointers[y] = (png_byte*) malloc(info_ptr->rowbytes);
+
+ png_read_image(png_ptr, row_pointers);
+
+ if (image) {
+ image = new unsigned char[width * height];
+ for (int y=0; y<height; y++)
+ memcpy(&image[y*width], row_pointers[y], info_ptr->rowbytes);
+ }
+
+ for (int y=0; y<height; y++)
+ free(row_pointers[y]);
+ free(row_pointers);
+
+ if (palette) {
+ png_colorp pngpalette;
+ int num_palette;
+
+ png_get_PLTE(png_ptr, info_ptr, &pngpalette, &num_palette);
+
+ palette = new unsigned char[768];
+
+ memcpy(palette, pngpalette, 768);
+
+ free(pngpalette);
+ }
+
+ fclose(fp);
+
+ return 0;
+}
+
+void readSmackerInfo(char *filename, int &width, int &height, int &framerate, int &frames) {
+ FILE *smk = fopen(filename, "rb");
+ if (!smk) {
+ printf("readSmackerInfo: Can't open file: %s\n", filename);
+ exit(-1);
+ }
+
+ uint32 sig;
+
+ fread(&sig, 4, 1, smk);
+ fread(&width, 4, 1, smk);
+ fread(&height, 4, 1, smk);
+ fread(&frames, 4, 1, smk);
+ fread(&framerate, 4, 1, smk);
+
+ fclose(smk);
+}
+
+int main(int argc, char *argv[]) {
+ printf("Dxa encoder (c) 2006 Benjamin Haisch\n");
+
+ if (argc < 3) {
+ printf("syntax: encodedxa prefix datapath\n");
+ return 1;
+ }
+
+ int width, height, framerate, frames, useMsAdpcm = 0;
+ char strbuf[512];
+
+ char *prefix = argv[1], *datapath = argv[2];
+
+ // read some data from the Smacker file.
+ // TODO: make the values cmdline parameters and this optional.
+ sprintf(strbuf, "%s%s.smk", datapath, prefix);
+ readSmackerInfo(strbuf, width, height, framerate, frames);
+
+ printf("Width = %d, Height = %d, Framerate = %d, Frames = %d\n",
+ width, height, framerate, frames);
+
+ // create the encoder object
+ sprintf(strbuf, "%s.dxa", prefix);
+ DxaEncoder dxe(strbuf, width, height, framerate);
+
+ // check if the wav file exists.
+ // if it does, convert it to MS ADPCM-format if wanted.
+ // then add it to the dxa animation.
+ sprintf(strbuf, "%s%s.wav", datapath, prefix);
+ struct stat statinfo;
+
+ if (!stat(strbuf, &statinfo)) {
+ if (useMsAdpcm) {
+ convertAudio(strbuf, (const char *)"dxatemp.wav", useMsAdpcm);
+
+ strcpy(strbuf, "dxatemp.wav");
+ }
+ dxe.addAudio(strbuf);
+ }
+
+ uint8 *image, *palette;
+ int framenum = 0;
+
+ printf("Encoding...");
+ fflush(stdout);
+
+ for (int f = 0; f < frames; f++) {
+ if (frames > 1000)
+ sprintf(strbuf, "%s%s%04d.png", datapath, prefix, framenum);
+ else if (frames > 100)
+ sprintf(strbuf, "%s%s%03d.png", datapath, prefix, framenum);
+ else if (frames > 10)
+ sprintf(strbuf, "%s%s%02d.png", datapath, prefix, framenum);
+ else
+ sprintf(strbuf, "%s%s%d.png", datapath, prefix, framenum);
+
+ int r = read_png_file(strbuf, image, palette, width, height);
+
+ if (!palette)
+ printf("Error: 8-bit 256-color image expected!\n");
+
+ if (!r) {
+ dxe.writeFrame(image, palette);
+ }
+
+ if (image) delete[] image;
+ if (palette) delete[] palette;
+
+ if (r)
+ break;
+
+ framenum++;
+
+ if (framenum % 20 == 0) {
+ printf("\rEncoding...%d%% (%d of %d)", 100 * framenum / frames, framenum, frames);
+ fflush(stdout);
+ }
+ }
+
+ printf("\rEncoding...100%% (%d of %d)\n", frames, frames);
+
+ return 0;
+}
+
+
Property changes on: tools/trunk/encode_dxa.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Rev Author URL Id
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list