wiretap 0.1.2 → 0.11

data/ext/Makefile

@@ -80,8 +80,8 @@ extout_prefix =
 target_prefix = 
 LOCAL_LIBS = 
 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
+SRCS = audio_format.cpp format.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 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/image_format.cpp

@@ -1,6 +1,81 @@
 #include "wiretap.h"
 
 
+static int wiretap_reduce_frame_bits24(const unsigned char* frame, int byte_length, charstream& writer) {
+	for(int index = 0; index < byte_length; index++) {
+		writer.write_char(frame[index]);
+	}
+	return 0;
+}
+
+
+static int wiretap_reduce_frame_bits32(const unsigned char* frame, int byte_length, charstream& writer) {
+	for(int index = 0; index < byte_length; index += 4) {
+		writer.write_char(frame[0]);
+
+		writer.write_char(frame[1] << 2 | frame[2] >> 6);
+
+		writer.write_char(frame[2] << 4 | frame[3] >> 4);
+		frame += 4;
+	}
+	return 0;
+}
+
+
+
+static int wiretap_reduce_frame_bits36(const unsigned char* frame, int byte_length, charstream& writer) {
+
+	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.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++;
+	}
+	return 0;	
+}
+
+static int wiretap_reduce_frame_bits48(const unsigned char* frame, int byte_length, charstream& writer) {
+	for(int index = 0; index < byte_length / 6; index++) {
+		writer.write_char(frame[index*6 + 0]);
+		writer.write_char(frame[index*6 + 2]);
+		writer.write_char(frame[index*6 + 4]);
+	}
+	return 0;
+}
+
 bool wiretap_write_image_frame(int width, int height, int bpp, unsigned char* frame, const char* filename) {
 	WireTapClipFormat format;
 	format.setWidth(width);
@@ -16,6 +91,46 @@ bool wiretap_write_image_frame(int width, int height, int bpp, unsigned char* fr
 }
 
 
+
+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, charstream& writer) {
+	switch(bpp) {
+		case 24: {
+			wiretap_reduce_frame_bits24(frame, width*height*3, writer);
+			break;
+		}
+		case 30:
+		case 32: {
+			wiretap_reduce_frame_bits32(frame, width*height*4, writer);
+			break;
+		}
+		case 36: {
+			wiretap_reduce_frame_bits36(frame, width*height*9/2, writer);
+			break;
+		}
+		case 48: {
+			wiretap_reduce_frame_bits48(frame, width*height*6, writer);
+			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;

data/ext/image_io.cpp

@@ -132,14 +132,6 @@ ImageIO::~ImageIO() {
 }
 
 
-void ImageIO::decode_image_data(unsigned char* frame, charstream& writer) {
-	std::auto_ptr<FrameIO> frame_io(FrameIO::decoder(frame, format.width(), format.height(), format.bitsPerPixel()));
-	if(!frame_io.get()) {
-		THROW("Unsupported color depth for dumping image: %d", format.bitsPerPixel());
-	}
-	frame_io->decode(writer);
-}
-
 /**************  PPM format *****************/
 
 ImageIO_PPM::ImageIO_PPM(const char* _filename, FILE* _f, WireTapClipFormat& _format) : ImageIO(_filename, _f, _format) {
@@ -205,8 +197,9 @@ void ImageIO_SGI::read_format() {
 	if(_magic != magic) {
 		rb_warn("Warning: %s has a broken file format: %d", filename, _magic);
 	}
-
-	compressed = read_int8() ? true : false;
+	char cmpr = read_int8();
+	
+	compressed = cmpr ? true : false;
 	switch(read_int8()) { // 1 for 1 byte per channel. 24 bit picture
 		case 1: format.setBitsPerPixel(24);
 		break;
@@ -392,7 +385,7 @@ void ImageIO_SGI::write_data(unsigned char* frame) {
 	memstream mem(buffer.get());
 
 	wiretap_write_sgi_header(format.width(), format.height(), stream);
-	decode_image_data(frame, mem);	
+	wiretap_write_image_data(format.width(), format.height(), format.bitsPerPixel(), frame, mem);	
 
 	write_channel(format.width(), format.height(), 0, buffer.get(), f);
 	write_channel(format.width(), format.height(), 1, buffer.get(), f);
@@ -438,7 +431,7 @@ void ImageIO_BMP::write_data(unsigned char* frame) {
 	filestream_bgr stream_bgr(f);
 	
 	write_header();
-	decode_image_data(frame, stream_bgr);
+	wiretap_write_image_data(format.width(), format.height(), format.bitsPerPixel(), frame, stream_bgr);
 }
 
 

data/ext/image_io.h

@@ -1,9 +1,49 @@
 #ifndef _IMAGE_IO_H_
 #define _IMAGE_IO_H_
 #include <string.h>
-#include "charstream.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);
+};
+
+
+bool wiretap_write_frame_bmp(int width, int height, int bpp, unsigned char* frame, FILE* f);
+bool wiretap_write_frame_sgi(int width, int height, int bpp, unsigned char* frame, FILE* f);
+
+int wiretap_write_image_data(int width, int height, int bpp, const unsigned char* frame, charstream& writer);
 
 
 class ImageIO {
@@ -23,7 +63,6 @@ protected:
 	int read_int32_be();
 	short read_int16_be();
 	unsigned char read_int8();
-	void decode_image_data(unsigned char* frame, charstream& writer);
 };
 
 class ImageIO_SGI : public ImageIO {

data/ext/wiretap.h

@@ -14,7 +14,6 @@
 #include <stdarg.h>
 #include <memory>
 
-#include "frame_io.h"
 #include "image_io.h"
 
 

data/test_new/test_image_conversions.rb

@@ -74,7 +74,7 @@ class TestImageConversions < Test::Unit::TestCase
     FileUtils.rm_f output
     3.times do | i |
       File.open(FIXTURES_DIR + "/raw/cube_SD_10bit_5f/%s.stoneimage" % i) do |f|
-        Wiretap.dump_image_data(@width, @height, 32, f.read(@width*@height*4), output % i)
+        Wiretap.dump_image_data(@width, @height, 32, f.read(@width*@height*9/2), output % i)
       end
     end
   end
@@ -84,7 +84,7 @@ class TestImageConversions < Test::Unit::TestCase
     FileUtils.rm_f output
     3.times do | i |
       File.open(FIXTURES_DIR + "/raw/cube_SD_10bit_5f/%s.stoneimage" % i) do |f|
-        Wiretap.dump_image_data(@width, @height, 32, f.read(@width*@height*4), output % i )
+        Wiretap.dump_image_data(@width, @height, 32, f.read(@width*@height*9/2), output % i )
       end
     end
   end

data/test_new/test_parts/connect_to_test_host.rb

@@ -8,9 +8,9 @@ module TestConnectToTestHost
     assert @server.alive?, "The server should be alive to test it - maybe you have mistakenly entered a faulty IP adderss?"
 
     assert_equal @test_host, @server.hostname
-    assert_match /(\d+)/, @server.version, "Server version has to be a String and has to contain a number"
-    assert_match /Discreet/, @server.vendor, "The vendor should be Discreet"
-    assert_match /IFFFS/, @server.product, "The product should be IFFS (InfernoFlintFlameSmoke)"
+    assert_match /(\d+)/, @server.version
+    assert_match /Discreet/, @server.vendor
+    assert_match /IFFFS/, @server.product
 
     assert @server.close!, "The connection should be closed succesfully"
     
@@ -20,8 +20,8 @@ module TestConnectToTestHost
   end
   
   def test_02a_bailing_when_opening_from_dead_server
-    assert_raise(Wiretap::ServerDead) { nonexistent_lib = Wiretap::open("10.2.2.2/Bla") }
-    dead_server = Wiretap::Server.new("10.2.2.2/Bla")
-    assert !dead_server.alive?, "The dead server should respond dead"
+    assert_raise(Wiretap::ServerDead) do
+      nonexistent_lib = Wiretap::open("10.2.2.2/Bla")
+    end
   end
 end

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: wiretap
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-02-01 00:00:00 +01:00
+  version: "0.11"
+date: 2007-01-31 00:00:00 +01:00
 summary: WireTap driver
 require_paths: 
 - lib
-email: tools@hecticelectric.nl
+email: max@maxidoors.ru
 homepage: http://rubyforge.org/projects/wiretap/
 rubyforge_project: wiretap
 description: 
@@ -26,7 +26,7 @@ platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-- Max Lapshin, Julik Tarkhanov, HecticElectric BV
+- Max Lapshin
 files: 
 - test_new/common.rb
 - test_new/fixtures
@@ -86,11 +86,8 @@ files:
 - test_new/test_parts/simple_node_lookup_and_browsing.rb
 - lib/wiretap.rb
 - ext/audio_format.cpp
-- ext/charstream.h
 - ext/extconf.rb
 - ext/format.cpp
-- ext/frame_io.cpp
-- ext/frame_io.h
 - ext/image_format.cpp
 - ext/image_io.cpp
 - ext/image_io.h

data/ext/charstream.h

@@ -1,41 +0,0 @@
-#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/frame_io.cpp

@@ -1,120 +0,0 @@
-#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

@@ -1,45 +0,0 @@
-#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_ */