Merge branch 'beta' of https://github.com/mailmindlin/v4l4j into beta

Author: mailmindlin

.gitignore

@@ -1,9 +1,14 @@
-*.o
 *.a
+*.d
+*.o
 *.pc
 *.so
+*.save
+*.so.0
 .metadata/**/*
-*.d
 /bin/
 .classpath
-.project
+.project
+classes/*
+libvideo/libv4lconvert/ov511-decomp
+libvideo/libv4lconvert/ov518-decomp

build.xml

@@ -331,6 +331,7 @@
 			<jvmarg value="-Dtest.channel=${test.channel}" />
 			<test name="au.edu.jcu.v4l4j.test.FrameGrabberTest" />
 			<test name="au.edu.jcu.v4l4j.test.PushSourceTest" />
+			<test name="au.edu.jcu.v4l4j.encoder.AbstractVideoFrameEncoderTest" />
 			<formatter type="plain" usefile="false" />
 			<classpath refid="test.classpath" />
 		</junit>

libvideo/libv4lconvert/libv4lconvert-flat.c

@@ -7,6 +7,8 @@
 #ifndef __LIBVIDEO_LIBV4LCONVERT_LIBV4LCONVERT_FLAT_CPP
 #define __LIBVIDEO_LIBV4LCONVERT_LIBV4LCONVERT_FLAT_CPP
 
+extern "C" {
+
 #ifndef N_A
 #define N_A 0
 #endif
@@ -91,4 +93,6 @@ void v4lconvert_encoder_init(struct v4lconvert_encoder* encoder, int converterId
 v4lconvert_converter_t* v4lconvert_converter_getConverterById(int converterId) {
 	return &(v4lconvert_converters[converterId]);
 }
+
+}
 #endif

libvideo/libv4lconvert/libv4lconvert-flat.h

@@ -6,6 +6,10 @@
 #ifndef __LIBVIDEO_LIBV4LCONVERT_LIBV4LCONVERT_FLAT_H
 #define __LIBVIDEO_LIBV4LCONVERT_LIBV4LCONVERT_FLAT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum v4lconvert_conversion_fingerprint {
 	/**
 	 * Value if this fingerprint is unset (struct's will defaultly initialize with this value)
@@ -61,4 +65,8 @@ void v4lconvert_encoder_doConvert(struct v4lconvert_encoder* self, const u8* src
 void v4lconvert_encoder_init(struct v4lconvert_encoder* encoder, int converterId, int width, int height);
 v4lconvert_converter_t* v4lconvert_converter_getConverterById(int converterId);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/Makefile

@@ -44,7 +44,7 @@ OBJ := jpeg.o v4l4j_FrameGrabber.o v4l4j_ImageFormatList.o \
 
 INCLUDES := -I$(JDK_HOME)/include -I$(JDK_HOME)/include/linux/ \
   -I$(LIBVIDEO_PATH) -I$(LIBVIDEO_PATH)/pixfc-sse -I.
-CFLAGS += $(INCLUDES) $(DBG) $(OPTIMISATION) -fPIC -fno-stack-protector
+CFLAGS += $(INCLUDES) $(DBG) $(OPTIMISATION) -fPIC -fno-stack-protector -std=gnu11
 
 LDFLAGS += -shared -ljpeg -L$(LIBVIDEO_PATH) -l$(LIBVIDEO_NAME)
 

src/au/edu/jcu/v4l4j/encoder/AbstractVideoFrameEncoderTest.java

@@ -1,11 +1,10 @@
 package au.edu.jcu.v4l4j.encoder;
 
-import static org.junit.Assert.*;
-
 import java.util.Arrays;
 
 import org.junit.Test;
 
+import au.edu.jcu.v4l4j.ImagePalette;
 import junit.framework.Assert;
 
 /**
@@ -15,17 +14,24 @@
 public class AbstractVideoFrameEncoderTest {
 
 	@Test
-	public void test() {
-		AbstractVideoFrameEncoder encoder = new AbstractVideoFrameEncoder(5, 7, null, null);
-		
-		int numConverters = -encoder.getConverterIds(encoder.object, null);
-		Assert.assertEquals(numConverters, 1);
-		
-		int[] converterIds = new int[numConverters];
-		numConverters = encoder.getConverterIds(encoder.object, converterIds);
-		System.out.println(Arrays.toString(converterIds));
-		Assert.assertEquals(numConverters, 1);
-//		fail("Not yet implemented");
+	public void test() throws Exception {
+		try {
+			
+			AbstractVideoFrameEncoder encoder = new AbstractVideoFrameEncoder(5, 7, ImagePalette.RGB32, ImagePalette.YUV420);
+			
+			int numConverters = -encoder.getConverterIds(encoder.object, null);
+			Assert.assertEquals(numConverters, 1);
+			
+			int[] converterIds = new int[numConverters];
+			numConverters = encoder.getConverterIds(encoder.object, converterIds);
+			System.out.println(Arrays.toString(converterIds));
+			Assert.assertEquals(numConverters, 1);
+			
+			encoder.close();
+	//		fail("Not yet implemented");
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		}
 	}
-
 }

src/debug.h

@@ -62,7 +62,7 @@
 				dprint(LOG_MEMALLOC, "[MEMALLOC]: allocated %lu bytes of type %s for var %s (%p).\n", (long unsigned int)size, #type, #var, (var));}\
 		} while (0)
 
-#define XCALLLOC(var, type, width, size)	\
+#define XCALLOC(var, type, width, size)	\
 		do { \
 			var = (type) calloc((width), (size)); \
 			if (!var) {dprint(LOG_MEMALLOC, "[MEMALLOC]: Can't allocate %lu of width %lu.\n", (long unsigned int) (size), (long unsigned int) (width));} \
@@ -102,6 +102,12 @@
 			else { CLEAR(*var);}\
 		} while (0)
 
+#define XCALLOC(var, type, width, size)	\
+		do { \
+			var = (type) calloc((width), (size)); \
+			if (!var) {fprintf(stderr,"[%s:%d %s] MEMALLOC: OUT OF MEMORY !!! Cant allocate %lu of width %lu.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, (long unsigned int) size, (long unsigned int) width); fflush(stderr);} \
+		} while (0)
+
 #define XMALLOC_ALIGNED(var, type, size)	\
 		do { \
 			if (posix_memalign((void**)&(var), 16, (size))!=0) {fprintf(stderr,"[%s:%d %s] MEMALLOC: OUT OF MEMORY !!! Cant allocate %lu bytes.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, (long unsigned int) size); fflush(stderr);} \

src/v4l4j_VideoFrameEncoder.c

@@ -169,19 +169,21 @@ JNIEXPORT jint JNICALL Java_au_edu_jcu_v4l4j_encoder_AbstractVideoFrameEncoder_g
 		return -num_converters;
 
 	jint* converter_ids;
-	XCALLOC(converter_ids, jint, out_length * sizeof(jint));
-	if (converter_ids == NULL)
+	XCALLOC(converter_ids, jint*, sizeof(jint), out_length);
+	if (converter_ids == NULL) {
 		THROW_EXCEPTION(env, JNI_EXCP, "Unable to allocate memory.");
+		return 0;
+	}
 
 	if (encoder->is_series) {
 		struct v4lconvert_encoder_series* v4lcvt_series = encoder->v4lenc.encoder_series;
 		for (int i=0; i < num_converters; i++)
-			converter_ids[i] = vcvt_series->encoders[i]->id;
+			converter_ids[i] = v4lcvt_series->encoders[i]->converter->id;
 	} else {
 		converter_ids[0] = encoder->v4lenc.encoder->converter->id;
 	}
 
-	(*env)->SetIntArrayRegion(env, out, 0, converter_ids, num_converters);
+	(*env)->SetIntArrayRegion(env, out, 0, num_converters, converter_ids);
 
 	XFREE(converter_ids);
 	//TODO check that it was freed