wiretap 0.1 → 0.1.2

data/README

@@ -24,7 +24,8 @@ For sound files:
 === Running the unit tests
 
 Define a RUBY_WIRETAP_TEST_HOST environment variable that will contain the hostname or IP address
-of your IFFS system. Make a PAL 720x576 8-bit project on the system and name it "RubyWiretapTest".
+of your IFFS system. If you are running versions EARLIER than 2007 you will also have to
+make a PAL 720x576 8-bit project on the system and name it "RubyWiretapTest".
 
 Run rake.
 

data/ext/Makefile

@@ -4,55 +4,58 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin8.8.3
+topdir = /usr/local/lib/ruby/1.8/powerpc-darwin8.8.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/local
-exec_prefix = $(DESTDIR)/opt/local
+prefix = $(DESTDIR)/usr/local
+exec_prefix = $(DESTDIR)/usr/local
 sitedir = $(prefix)/lib/ruby/site_ruby
 rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
 archdir = $(rubylibdir)/$(arch)
 sbindir = $(exec_prefix)/sbin
-vendordir = $(prefix)/lib/ruby/vendor_ruby
-datadir = $(prefix)/share
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
 includedir = $(prefix)/include
-infodir = $(prefix)/info
+infodir = $(datarootdir)/info
 sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/opt/local/share/man
-libdir = $(DESTDIR)/opt/local/lib
+mandir = $(datarootdir)/man
+libdir = $(DESTDIR)/usr/local/lib
 sharedstatedir = $(prefix)/com
 oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
 sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
 bindir = $(exec_prefix)/bin
 localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
 sitelibdir = $(sitedir)/$(ruby_version)
 libexecdir = $(exec_prefix)/libexec
 
 CC = g++ 
-LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = 
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common -I../../wiretap_api//api -Wall 
-INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.8.3 -I.
-CPPFLAGS = -DHAVE_WIRETAPCLIENTAPI_H -DHAVE_SNDFILE_H -O -pipe -I/opt/local/include
+CFLAGS   =  -fno-common -g -O2 -pipe -fno-common -I/Code/wiretap-api-stable/api -I/opt/local/include -I/opt/local/lib -Wall 
+INCFLAGS = -I. -I. -I/usr/local/lib/ruby/1.8/powerpc-darwin8.8.0 -I.
+CPPFLAGS = -DHAVE_WIRETAPCLIENTAPI_H -DHAVE_SNDFILE_H 
 CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L/opt/local/lib -L../../wiretap_api//lib/dbg/MACOSX/fat/Darwin_8_3_0/GCC_4_0_1/  
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+DLDFLAGS =  -L/Code/wiretap-api-stable/libs/Mac/OSX/gcc_3.3/dbg -L/usr/local/lib -L/opt/local/lib  
+LDSHARED = g++ -dynamic -bundle -undefined suppress -flat_namespace
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin8.8.3
-sitearch = i686-darwin8.8.3
-vendorarch = i686-darwin8.8.3
+arch = powerpc-darwin8.8.0
+sitearch = powerpc-darwin8.8.0
 ruby_version = 1.8
-ruby = /opt/local/bin/ruby
+ruby = /usr/local/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -76,9 +79,9 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lwiretapClientAPI -lsndfile  -lpthread -ldl -lobjc  
-SRCS = audio_format.cpp bmp.cpp format.cpp image_format.cpp node.cpp nodechildren.cpp nodeframes.cpp nodemetadata.cpp ppm.cpp server.cpp serverlist.cpp sgi.cpp thread_worker.cpp wiretap.cpp
-OBJS = audio_format.o bmp.o format.o image_format.o node.o nodechildren.o nodeframes.o nodemetadata.o ppm.o server.o serverlist.o sgi.o thread_worker.o wiretap.o
+LIBS =  -lwiretapClientAPI -lsndfile  -lpthread -ldl -lobjc  
+SRCS = audio_format.cpp format.cpp frame_io.cpp image_format.cpp image_io.cpp node.cpp nodechildren.cpp nodeframes.cpp nodemetadata.cpp server.cpp serverlist.cpp thread_worker.cpp wiretap.cpp
+OBJS = audio_format.o format.o frame_io.o image_format.o image_io.o node.o nodechildren.o nodeframes.o nodemetadata.o server.o serverlist.o thread_worker.o wiretap.o
 TARGET = wiretap_bin
 DLLIB = $(TARGET).bundle
 EXTSTATIC = 

data/ext/audio_format.cpp

@@ -94,7 +94,7 @@ int wiretap_write_audio_frame(int samples, int rate, int bps, ID type, unsigned
 	SNDFILE *input = sf_open_virtual(&v_io, SFM_READ, &info, &vf);
 
 	if(!input) {
-		THROW("Couldn't open frame for reading");
+		THROW("Couldn't open audio frame for reading");
 	}
 
 	std::auto_ptr<float> output_items(new float[item_count]);
@@ -106,20 +106,20 @@ int wiretap_write_audio_frame(int samples, int rate, int bps, ID type, unsigned
 	sf_close(input);
 	if(error) {
 		output_items.release();
-		THROW("Waited to read %d frames, got %d: %s", item_count, size, error);
+		THROW("Did not reach %d frames, got %d: %s", item_count, size, error);
 	}
 	
 	SF_INFO out_info = info;
 	out_info.format = SF_FORMAT_AIFF | SF_FORMAT_PCM_16;
 	if(!sf_format_check(&out_info)) {
 		output_items.release();
-		THROW("Invalid format provided for output file");
+		THROW("Invalid format provided for audio output file");
 	 }
 
 	SNDFILE *output = sf_open(filename, SFM_RDWR, &out_info);
 	if(!output) {
 		output_items.release();
-		THROW("Couldn't open file %s for write", filename);
+		THROW("Couldn't open file %s for writing", filename);
 	}
 	int out_size = sf_write_float(output, output_items.get(), item_count);
 	output_items.release();
@@ -158,7 +158,10 @@ static VALUE wiretap_get_audio_format(VALUE self, VALUE filename) {
 	return Data_Wrap_Struct(cAudioFormat, 0, wiretap_format_free, new WireTapAudioFormat(audio_format));
 }
 
-static VALUE wiretap_audio_import_music(VALUE self, VALUE filename) {
+/*
+ * Importing music is possible on Audio clips
+ */
+static VALUE wiretap_audio_import_audio_file(VALUE self, VALUE filename) {
 	Check_Type(filename, T_STRING);
 	
 	SF_INFO sfinfo;
@@ -181,7 +184,7 @@ static VALUE wiretap_audio_import_music(VALUE self, VALUE filename) {
 	return self;
 }
 
-/* This is called on node. Not on NodeFrames */
+/* This is called on the node itself, but not on NodeFrames */
 
 static VALUE wiretap_audio_dump(VALUE self, VALUE file) {
 	WireTapNodeHandle* node;
@@ -212,13 +215,12 @@ static VALUE wiretap_audio_dump(VALUE self, VALUE file) {
 
 #endif /* HAVE_SNDFILE_H */
 
-
 void Init_audio_format() {
 #ifdef HAVE_SNDFILE_H
 	rb_define_singleton_method(mWiretap, "dump_audio_data", VALUEFUNC(wiretap_dump_audio_data), 6);	
 	rb_define_singleton_method(mWiretap, "audio_format", VALUEFUNC(wiretap_get_audio_format), 1);
 	
-	rb_define_method(cAudio, "import_music", VALUEFUNC(wiretap_audio_import_music), 1);
+	rb_define_method(cAudio, "import_audio!", VALUEFUNC(wiretap_audio_import_audio_file), 1);
 	rb_define_method(cAudio, "dump", VALUEFUNC(wiretap_audio_dump), 1);
 #endif /* HAVE_SNDFILE_H */
 }

data/ext/charstream.h

@@ -0,0 +1,41 @@
+#ifndef _CHARSTREAM_H_
+#define _CHARSTREAM_H_
+#include <stdio.h>
+
+class charstream {
+public:
+	charstream();
+	virtual void write_char(unsigned char channel);
+	virtual ~charstream();
+	
+	void write_int32_le(int value);
+	void write_int32_be(int value);
+	void write_int16_le(short value);
+	void write_int16_be(short value);
+	void write_string(char* value);
+};
+
+class memstream : public charstream {
+	unsigned char* ptr;
+public:
+	memstream(unsigned char* _ptr);
+	void write_char(unsigned char channel);
+};
+
+class filestream : public charstream {
+	FILE* f;
+public:
+	filestream(FILE* _f);
+	void write_char(unsigned char channel);
+};
+
+class filestream_bgr : public charstream {
+	int count;
+	unsigned char buffer[3];
+	FILE* f;
+public:
+	filestream_bgr(FILE* _f);
+	void write_char(unsigned char channel);
+};
+
+#endif /* _CHARSTREAM_H_ */

data/ext/extconf.rb

@@ -6,11 +6,10 @@ CONFIG["CPP"] = "g++ -E "
 CONFIG["CC"] = "g++ "
 CONFIG["LDSHARED"].gsub!(/^cc /,"g++ ")
 
-#@wiretap_placements = [ "../../wiretap_api", "/Code/wiretap-api"]
 @wiretap_placements = []
-
-@includes = []
-@libraries = []
+@includes = ["/opt/local/include", "/opt/local/lib", ]
+@libraries = ["/usr/local/lib", "/opt/local/lib"]
+@wiretap_placements << ENV['WIRETAP_INSTALL_DIR'] if ENV['WIRETAP_INSTALL_DIR']
 
 OptionParser.new do |opts|
   opts.on("-S PATH", "--sndfile-dir=PATH", "Prefix, where libsndfile is installed: /usr/local or /opt/local") do |path|
@@ -67,12 +66,12 @@ end
 $CFLAGS << include_flags
 $LDFLAGS << library_flags
 
-have_header "WireTapClientAPI.h"
+have_header "WireTapClientAPI.h" or raise "We must have the Wiretap client header. Check the --wiretap-dir parameter"
 unless have_header("sndfile.h") && have_library("sndfile")
   puts "*********************"
-  puts "You don't have libsndfile installed. You can use wiretap ruby binding without it,"
-  puts "but You will not have support of audio."
-  puts "If You install libsndfile, reinstall gem after it."
+  puts "You don't have libsndfile installed. You can use wiretap ruby bindings without it,"
+  puts "but without audio support. If you will be installing libsndfile, recompile the gem afterwards."
+  puts "Verify if you have audio by calling Wiretap::supports_audio?"
 end
 have_library "wiretapClientAPI", "WireTapClientInit" do <<-SRC
 #include <WireTapClientAPI.h>
@@ -81,5 +80,4 @@ int main(void) {
 }
 	SRC
 end
-create_makefile "wiretap_bin"
-
+create_makefile "wiretap_bin"

data/ext/frame_io.cpp

@@ -0,0 +1,120 @@
+#include "frame_io.h"
+
+FrameIO::FrameIO(unsigned char* _frame, int _width, int _height) {
+	frame = _frame;
+	width = _width;
+	height = _height;
+	length = 0;
+}
+
+FrameIO::~FrameIO() {}
+
+FrameIO* FrameIO::decoder(unsigned char* frame, int width, int height, int bpp) {
+	switch(bpp) {
+		case 24: return new FrameIO_24(frame, width, height);
+		case 30:
+		case 32: return new FrameIO_32(frame, width, height);
+		case 36: return new FrameIO_36(frame, width, height);
+		case 48: return new FrameIO_48(frame, width, height);
+	}
+	return NULL;
+}
+
+unsigned char* FrameIO::get_frame() { return frame; }
+
+
+FrameIO_24::FrameIO_24(unsigned char* _frame, int _width, int _height) : FrameIO(_frame, _width, _height) {
+	length = width*height*3;
+}
+
+void FrameIO_24::decode(charstream& writer, bool bit16) {
+	for(size_t index = 0; index < length; index++) {
+		writer.write_char(frame[index]);
+		// TODO: Here is only bigendian encoding
+		if(bit16) writer.write_char(0);
+	}
+}
+
+FrameIO_32::FrameIO_32(unsigned char* _frame, int _width, int _height) : FrameIO(_frame, _width, _height) {
+	length = width*height*4;
+}
+
+void FrameIO_32::decode(charstream& writer, bool bit16) {
+	unsigned char* frame = get_frame();
+	for(size_t index = 0; index < length; index += 4) {
+		short r = (short(frame[0]) << 2) + (frame[1] >> 6);
+		short g = (short(frame[1]) << 2) + (frame[2] >> 6);
+		short b = (short(frame[2]) << 4) + (frame[3] >> 4);
+		if(bit16) {
+			writer.write_int16_be(r);
+			writer.write_int16_be(g);
+			writer.write_int16_be(b);
+		} else {
+			writer.write_char((r >> 2) & 0xFF);
+			writer.write_char((g >> 2) & 0xFF);
+			writer.write_char((b >> 2) & 0xFF);
+		}
+		frame += 4;
+	}
+}
+
+FrameIO_36::FrameIO_36(unsigned char* _frame, int _width, int _height) : FrameIO(_frame, _width, _height) {
+	length = width*height*9/2;
+}
+void FrameIO_36::decode(charstream& writer, bool bit16) {
+	unsigned char* frame = get_frame();
+	int orphan_index = 0;
+	int orphan[3*6]; //куски, которые пропускаем
+
+	int pixelnum = 0;
+
+	for(size_t index = 0; index < length*2/9; index++) {
+		if (pixelnum == 6) //7й пиксель собираем и пропущеных кусков
+		{
+			writer.write_char(((orphan[4] & 0xF) << 4) + (orphan[2] & 0xF)); // R
+			writer.write_char(((orphan[5] & 0xF) << 4) + (orphan[3] & 0xF)); // G
+			writer.write_char(((orphan[10] & 0xF) << 4) + (orphan[8] & 0xF));// B
+
+			pixelnum++;
+			continue;
+		}
+
+		if (pixelnum == 7) //8й пиксель тоже собираем из пропущеных кусков
+		{
+			writer.write_char(((orphan[11] & 0xF) << 4) + (orphan[9] & 0xF)); // R
+			writer.write_char(((orphan[16] & 0xF) << 4) + (orphan[14] & 0xF));// G
+			writer.write_char(((orphan[17] & 0xF) << 4) + (orphan[15] & 0xF));// B
+
+			pixelnum = 0;
+			orphan_index = 0;
+
+			continue;
+		}
+
+		writer.write_char(*frame++); // R
+		orphan[orphan_index++] = *frame++;
+		
+		writer.write_char(*frame++); // G
+		orphan[orphan_index++] = *frame++;
+		
+		writer.write_char(*frame++); // B
+		orphan[orphan_index++] = *frame++;
+
+		pixelnum++;
+	}
+}
+
+FrameIO_48::FrameIO_48(unsigned char* _frame, int _width, int _height) : FrameIO(_frame, _width, _height) {
+	length = width*height*6;
+}
+void FrameIO_48::decode(charstream& writer, bool bit16) {
+	for(size_t index = 0; index < length / 6; index++) {
+		writer.write_char(frame[index*6 + 0]);
+		if(bit16) writer.write_char(frame[index*6 + 1]);
+		writer.write_char(frame[index*6 + 2]);
+		if(bit16) writer.write_char(frame[index*6 + 3]);
+		writer.write_char(frame[index*6 + 4]);
+		if(bit16) writer.write_char(frame[index*6 + 5]);
+	}
+}
+

data/ext/frame_io.h

@@ -0,0 +1,45 @@
+#ifndef _FRAME_IO_H_
+#define _FRAME_IO_H_
+#include "charstream.h"
+#include "wiretap.h"
+
+
+class FrameIO {
+public:
+	FrameIO(unsigned char* _frame, int width, int height);
+	virtual void decode(charstream& writer, bool bit16 = false) = 0;
+	virtual ~FrameIO();
+	static FrameIO* decoder(unsigned char* frame, int width, int height, int bpp);
+	unsigned char* get_frame();
+protected:
+	unsigned char* frame;
+	size_t length;
+	int width;
+	int height;
+};
+
+class FrameIO_24 : public FrameIO {
+public:
+	FrameIO_24(unsigned char* _frame, int width, int height);
+	virtual void decode(charstream& writer, bool bit16 = false);
+};
+
+class FrameIO_32 : public FrameIO {
+public:
+	FrameIO_32(unsigned char* _frame, int width, int height);
+	virtual void decode(charstream& writer, bool bit16 = false);
+};
+
+class FrameIO_36 : public FrameIO {
+public:
+	FrameIO_36(unsigned char* _frame, int width, int height);
+	virtual void decode(charstream& writer, bool bit16 = false);
+};
+
+class FrameIO_48 : public FrameIO {
+public:
+	FrameIO_48(unsigned char* _frame, int width, int height);
+	virtual void decode(charstream& writer, bool bit16 = false);
+};
+
+#endif /* _FRAME_IO_H_ */

data/ext/image_format.cpp

@@ -1,194 +1,74 @@
 #include "wiretap.h"
 
-enum {IMAGE_BMP, IMAGE_SGI};
-int img_format = IMAGE_SGI;
-
-
-
-static int wiretap_reduce_frame_bits24(const unsigned char* frame, int byte_length, bitstream_writer writer, void *data) {
-	for(int index = 0; index < byte_length; index++) {
-		writer(data, frame[index]);
-	}
-	return 0;
-}
-
-
-static int wiretap_reduce_frame_bits32(const unsigned char* frame, int byte_length, bitstream_writer writer, void *data) {
-	for(int index = 0; index < byte_length; index += 4) {
-		writer(data, frame[0]);
-
-		writer(data, frame[1] << 2 | frame[2] >> 6);
-
-		writer(data, frame[2] << 4 | frame[3] >> 4);
-		frame += 4;
-	}
-	return 0;
-}
-
-
-
-static int wiretap_reduce_frame_bits36(const unsigned char* frame, int byte_length, bitstream_writer writer, void *data) {
-
-	int orphan_index = 0;
-	int orphan[3*6]; //куски, которые пропускаем
-
-	int pixelnum = 0;
-
-	for(int index = 0; index < byte_length*2/9; index++) {
-		if (pixelnum == 6) //7й пиксель собираем и пропущеных кусков
-		{
-			writer(data, ((orphan[4] & 0xF) << 4) + (orphan[2] & 0xF)); // R
-			writer(data, ((orphan[5] & 0xF) << 4) + (orphan[3] & 0xF)); // G
-			writer(data, ((orphan[10] & 0xF) << 4) + (orphan[8] & 0xF));// B
-
-			pixelnum++;
-			continue;
-		}
-
-		if (pixelnum == 7) //8й пиксель тоже собираем из пропущеных кусков
-		{
-			writer(data, ((orphan[11] & 0xF) << 4) + (orphan[9] & 0xF)); // R
-			writer(data, ((orphan[16] & 0xF) << 4) + (orphan[14] & 0xF));// G
-			writer(data, ((orphan[17] & 0xF) << 4) + (orphan[15] & 0xF));// B
-
-			pixelnum = 0;
-			orphan_index = 0;
-
-			continue;
-		}
-
-		writer(data, *frame++); // R
-		orphan[orphan_index++] = *frame++;
-		
-		writer(data, *frame++); // G
-		orphan[orphan_index++] = *frame++;
-		
-		writer(data, *frame++); // B
-		orphan[orphan_index++] = *frame++;
-
-		pixelnum++;
-	}
-	return 0;	
-}
-
-static int wiretap_reduce_frame_bits48(const unsigned char* frame, int byte_length, bitstream_writer writer, void* data) {
-	for(int index = 0; index < byte_length / 6; index++) {
-		writer(data, frame[index*6 + 0]);
-		writer(data, frame[index*6 + 2]);
-		writer(data, frame[index*6 + 4]);
-	}
-	return 0;
-}
 
 bool wiretap_write_image_frame(int width, int height, int bpp, unsigned char* frame, const char* filename) {
-	FILE *f = fopen(filename, "w+");
-	if(!f) {
-		THROW("Couldn't open file for dump: %s", filename);
-	}
+	WireTapClipFormat format;
+	format.setWidth(width);
+	format.setHeight(height);
+	format.setBitsPerPixel(bpp);
 	
-	switch(img_format) {
-		case IMAGE_SGI: {
-			wiretap_write_frame_sgi(width, height, bpp, frame, f);
-			break;
-		}
-		case IMAGE_BMP: {
-			wiretap_write_frame_bmp(width, height, bpp, frame, f);
-			break;
-		}
-		default: {
-			fclose(f); 
-			THROW("Error. Wrong internal format provided: %d", img_format);
-		}
+	std::auto_ptr<ImageIO> image(ImageIO::open(filename, format, false));
+	if(!image.get()) {
+		THROW("Couldn't guess image format for file: %s", filename);
 	}
-	fclose(f);
+	image->write_data(frame);
 	return true;
 }
 
 
-void write_to_memory(void *stream, unsigned char channel) {
-	memstream* data = (memstream *)stream;
-	*data->ptr++ = channel;
-}
-
-void write_to_file(void *stream, unsigned char channel) {
-	filestream* data = (filestream *)stream;
-	fwrite(&channel, sizeof(channel), 1, data->f);
-}
-
-
-
-int reduced_frame_length(int byte_length, int bpp) {
-	const int bits_in_byte = 8;
-	const int bytes_in_pixel = 3;
-	// bpp/bits_in_byte  - number of bytes per pixel in income frame. Maybe 3 (in case of 24bpp) or 4.5 (in case of 36bpp)
-	// byte_length/bytes_per_pixel - number of pixels in income frame
-	// number_pixels * 3 - number of pixels in outgoing frame
-	// 3 * byte_length/bpp * bits_in_byte
-	return (bytes_in_pixel * byte_length * bits_in_byte) / bpp;
-}
-
-
-
-int wiretap_write_image_data(int width, int height, int bpp, const unsigned char* frame, bitstream_writer writer, void *data) {
-	switch(bpp) {
-		case 24: {
-			wiretap_reduce_frame_bits24(frame, width*height*3, writer, data);
-			break;
-		}
-		case 30:
-		case 32: {
-			wiretap_reduce_frame_bits32(frame, width*height*4, writer, data);
-			break;
-		}
-		case 36: {
-			wiretap_reduce_frame_bits36(frame, width*height*9/2, writer, data);
-			break;
-		}
-		case 48: {
-			wiretap_reduce_frame_bits48(frame, width*height*6, writer, data);
-			break;
-		}
-		default: {
-			THROW("Unsupported color depth: %d", bpp);
-		}
-	}
-	return 0;
-}
-
-
 VALUE wiretap_dump_image_data(VALUE self, VALUE width, VALUE height, VALUE bpp, VALUE raw, VALUE filename) {
 	wiretap_write_image_frame(NUM2INT(width), NUM2INT(height), NUM2INT(bpp), (unsigned char* )STR(raw), CSTR(filename));
 	return Qtrue;
 }
 
-VALUE wiretap_set_dump_image_format(VALUE self, VALUE format) {
-	ID bmp, sgi, format_id;
-	bmp = rb_intern("bmp");
-	sgi = rb_intern("sgi");
-	Check_Type(format, T_SYMBOL);
-	format_id = SYM2ID(format);
-	
-	if(format_id == bmp ) {
-		img_format = IMAGE_BMP;
-	} else if(format_id == sgi) {
-		img_format = IMAGE_SGI;
-	} else {
-		THROW("Unknown format");
+/*
+ * Extract Wiretap clip format from image file. The format will inherit the bit depths of the image and allocate
+ * the framebuffer size into which the imported image will fit
+ *
+ *      @clipformat = Wiretap::image_format("test/wiretap-images/01.ppm")
+ */
+static VALUE wiretap_get_format(VALUE self, VALUE input) {
+	WireTapClipFormat format;
+	std::auto_ptr<ImageIO> image(ImageIO::open(CSTR(input), format));
+	if(!image.get()) {
+		THROW("Couldn't open file %s for reading", CSTR(input));
 	}
-	return self;
+	image->read_format();
+	VALUE clip_format = rb_funcall(cClipFormat, rb_intern("new"), 0);
+	DATA_PTR(clip_format) = new WireTapClipFormat(format);
+	return clip_format;
 }
 
-VALUE wiretap_get_dump_image_format(VALUE self) {
-	switch(img_format) {
-		case IMAGE_SGI: return ID2SYM(rb_intern("sgi"));
-		case IMAGE_BMP: return ID2SYM(rb_intern("bmp"));
+/*
+ * Convert a PPM file to an SGI file
+ *
+ *     Wiretap::convert_image("test/wiretap-images/01.ppm", "/tmp/a.sgi")
+ */
+static VALUE wiretap_convert_image(VALUE self, VALUE input, VALUE output) {
+	Check_Type(input, T_STRING);
+	Check_Type(output, T_STRING);
+	
+	WireTapClipFormat format;
+	std::auto_ptr<ImageIO> image(ImageIO::open(CSTR(input), format));
+	if(!image.get()) {
+		image.release();
+		THROW("Couldn't open file %s for read", CSTR(input));
+	}
+	image->read_format();
+	std::auto_ptr<unsigned char> frame(image->read_data());
+
+	if(!wiretap_write_image_frame(format.width(), format.height(), format.bitsPerPixel(), frame.get(), CSTR(output))) {
+		rb_warn("Couldn't dump image to file %s", CSTR(output));
+		return Qfalse;
 	}
-	return Qnil;
+	return Qtrue;
 }
 
 
+
 void Init_image_format() {
+	rb_define_singleton_method(mWiretap, "convert_image", VALUEFUNC(wiretap_convert_image), 2);
+	rb_define_singleton_method(mWiretap, "image_format", VALUEFUNC(wiretap_get_format), 1);
 	rb_define_singleton_method(mWiretap, "dump_image_data", VALUEFUNC(wiretap_dump_image_data), 5);
-	rb_define_singleton_method(mWiretap, "dump_image_format=", VALUEFUNC(wiretap_set_dump_image_format), 1);
-	rb_define_singleton_method(mWiretap, "dump_image_format", VALUEFUNC(wiretap_get_dump_image_format), 0);
+	rb_define_singleton_method(mWiretap, "convert_image", VALUEFUNC(wiretap_convert_image), 2);
 }