diff -ruN effectv-0.3.11/Makefile dctrial/Makefile --- effectv-0.3.11/Makefile 2003-12-25 23:03:46.854199000 +0900 +++ dctrial/Makefile 2004-10-26 16:09:33.465259000 +0900 @@ -7,7 +7,7 @@ INSTALL = /usr/bin/install -c CFLAGS = $(CONFIG) $(CONFIG.arch) $(CFLAGS.opt) -Iv4lutils `sdl-config --cflags` -LIBS = v4lutils/libv4lutils.a -lm `sdl-config --libs` $(LIBS.extra) +LIBS = v4lutils/libv4lutils.a -lm `sdl-config --libs` -ldc1394_control -lraw1394 $(LIBS.extra) PROGRAM = effectv diff -ruN effectv-0.3.11/palette.c dctrial/palette.c --- effectv-0.3.11/palette.c 2005-07-12 21:12:56.265754000 +0900 +++ dctrial/palette.c 2006-02-14 22:33:05.377335000 +0900 @@ -281,6 +281,134 @@ } } +static void convert_DCYUV422toRGB32 +(unsigned char *src, RGB32 *dest, int width, int height) +{ + int i, length; + unsigned int gray; + unsigned int u, v; + unsigned char *p; + + length = width * height / 2; + p = (unsigned char *)dest; + for(i=0; i #include #include +#include #include +#include +#include + #include #include "EffecTV.h" @@ -18,7 +22,12 @@ #include "utils.h" /* Currently there is only one v4l device obeject. */ +#if 0 static v4ldevice vd; +#endif + +static raw1394handle_t dc1394Handle = NULL; +static dc1394_cameracapture dc1394Camera; /* Flag for horizontal flipping mode */ int video_horizontalFlip = 0; @@ -28,6 +37,7 @@ int video_height; int video_area; // = video_width * video_height +#if 0 /* Video input parameters */ static int video_channel; static int video_norm; @@ -47,6 +57,7 @@ static int picture_hue; static int picture_colour; static int picture_contrast; +#endif static palette_converter_toRGB32 *converter; static palette_converter_toRGB32 *converter_hflip; @@ -72,12 +83,83 @@ #define MINWIDTH (vd.capability.minwidth) #define MINHEIGHT (vd.capability.minheight) +static int getRaw1394Ports() +{ +#define MAX_PORTS 4 + + raw1394handle_t handle = NULL; + int numPorts = MAX_PORTS; + struct raw1394_portinfo ports[MAX_PORTS]; + + handle = raw1394_new_handle(); + if(handle == NULL) { + perror("Unable to acquire a raw1394 handle: "); + return -1; + } + + numPorts = raw1394_get_port_info(handle, ports, numPorts); + raw1394_destroy_handle(handle); + + return numPorts; +} + +static int findCamera(int numPorts) +{ + int port; + int camCount; + nodeid_t *nodes; + dc1394_camerainfo info; + int found = 0; + + for(port = 0; port < numPorts; port++) { + if(dc1394Handle != NULL) { + dc1394_destroy_handle(dc1394Handle); + } + + dc1394Handle = dc1394_create_handle(port); + if(dc1394Handle == NULL) { + perror("Unable to aquire a raw1394 handle.\n"); + return -1; + } + + camCount = 0; + nodes = dc1394_get_camera_nodes(dc1394Handle, &camCount, 1); + + if(camCount > 0) { + if(dc1394_get_camera_info(dc1394Handle, nodes[0], &info) == DC1394_SUCCESS) { + dc1394_print_camera_info(&info); + dc1394Camera.node = nodes[0]; + found = 1; + break; + } + } + dc1394_free_camera_nodes(nodes); + if(found) { + if(dc1394Camera.node == raw1394_get_nodecount(dc1394Handle) - 1) { + raw1394_reset_bus(dc1394Handle); + sleep(2); + found = 0; + } + } + } + + if(!found) return -1; + + return 0; +} + /* Channel and norm is determined at initialization time. */ -int video_init(char *file, int channel, int norm, int freq, int w, int h, int palette) +int video_init(char *file, int ch, int norm, int freq, int w, int h, int palette) { - if(file == NULL){ - file = DEFAULT_VIDEO_DEVICE; + int numPorts; + unsigned int channel, speed; + + dc1394Handle = raw1394_new_handle(); + if(dc1394Handle == NULL) { + perror("Unable to aquire a raw1394 handle.\n"); + return -1; } +#if 0 if(v4lopen(file, &vd)) return -1; video_file = strdup(file); @@ -87,17 +169,48 @@ v4lsetdefaultnorm(&vd, norm); v4lgetcapability(&vd); +#endif - if(!(vd.capability.type & VID_TYPE_CAPTURE)) { - fprintf(stderr, "video_init: This device seems not to support video capturing.\n"); + numPorts = getRaw1394Ports(); + if(findCamera(numPorts)) { + fprintf(stderr, "Failed to find cameras.\n"); return -1; } + + { + dc1394_feature_set features; + if(dc1394_get_camera_feature_set(dc1394Handle, dc1394Camera.node, &features) != DC1394_SUCCESS) { + exit(-1); + } + dc1394_print_feature_set(&features); +#if 0 if((vd.capability.type & VID_TYPE_TUNER)) { video_hasTuner = 1; video_frequencyTable = freq; video_TVchannel = 0; video_setfreq(0); +#endif + } + + if(dc1394_start_iso_transmission(dc1394Handle, dc1394Camera.node) != DC1394_SUCCESS) { + perror("Failed to start iso transmission.\n"); + exit(-1); } + + if(dc1394_get_iso_channel_and_speed(dc1394Handle, dc1394Camera.node, + &channel, &speed) != DC1394_SUCCESS) { + fprintf(stderr, "unable to get the iso channel number.\n"); + } + + if(dc1394_dma_setup_capture(dc1394Handle, dc1394Camera.node, channel, + FORMAT_VGA_NONCOMPRESSED, MODE_640x480_YUV411, + SPEED_400, FRAMERATE_30, 4, 1, + NULL, &dc1394Camera) != DC1394_SUCCESS) { + perror("Failed to set DMA capture mode.\n"); + exit(-1); + } + +#if 0 if(w == 0 && h == 0) { w = DEFAULT_VIDEO_WIDTH; h = DEFAULT_VIDEO_HEIGHT; @@ -111,9 +224,10 @@ h = MINHEIGHT; fprintf(stderr, "capturing size is set to %dx%d.\n", w, h); } +#endif - video_width = w; - video_height = h; + video_width = 640; + video_height = 480; video_area = video_width * video_height; framebuffer = (RGB32 *)malloc(video_area*sizeof(RGB32)); @@ -122,6 +236,7 @@ return -1; } +#if 0 if(v4lmaxchannel(&vd)) { if(v4lsetchannel(&vd, channel)) return -1; } @@ -149,6 +264,10 @@ picture_hue = vd.picture.hue; picture_colour = vd.picture.colour; picture_contrast = vd.picture.contrast; +#endif + + video_set_grabformat(VIDEO_PALETTE_DCYUV411); + atexit(video_quit); return 0; } @@ -156,20 +275,22 @@ /* close v4l device. */ void video_quit(void) { - v4lmunmap(&vd); - v4lclose(&vd); + dc1394_dma_unlisten(dc1394Handle, &dc1394Camera); + dc1394_dma_release_camera(dc1394Handle, &dc1394Camera); free(framebuffer); } /* Set the format of captured data. */ int video_setformat(int palette) { - return v4lsetpalette(&vd, palette); +// return v4lsetpalette(&vd, palette); + return 0; } /* check supported pixel format */ int video_grab_check(int palette) { +#if 0 int ret; v4lseterrorlevel(V4L_PERROR_NONE); @@ -185,10 +306,13 @@ EXIT: v4lseterrorlevel(V4L_PERROR_ALL); return ret; +#endif + return 0; } int video_set_grabformat(int palette) { +#if 0 if(palette == 0) { if(video_grab_check(DEFAULT_PALETTE) == 0) { converter = NULL; @@ -204,6 +328,10 @@ return -1; } } +#endif + if(!palette_check_supported_converter_toRGB32(palette, &converter, &converter_hflip)) { + return -1; + } return 0; } @@ -211,17 +339,20 @@ /* Start the continuous grabbing */ int video_grabstart(void) { +#if 0 vd.frame = 0; if(v4lgrabstart(&vd, 0) < 0) return -1; if(v4lgrabstart(&vd, 1) < 0) return -1; +#endif return 0; } /* Stop the continuous grabbing */ int video_grabstop(void) { +#if 0 if(vd.framestat[vd.frame]) { if(v4lsync(&vd, vd.frame) < 0) return -1; @@ -230,18 +361,24 @@ if(v4lsync(&vd, vd.frame ^ 1) < 0) return -1; } +#endif return 0; } /* Wait on the capturing image */ int video_syncframe(void) { - return v4lsyncf(&vd); + if(dc1394_dma_single_capture(&dc1394Camera) == DC1394_SUCCESS) + return 0; + + return -1; } /* Start capturing next image */ int video_grabframe(void){ - return v4lgrabf(&vd); + dc1394_dma_done_with_buffer(&dc1394Camera); + + return 0; } /* Returns a pointer to captured image */ @@ -249,17 +386,19 @@ { if(converter) { if(video_horizontalFlip) { - (*converter_hflip)(v4lgetaddress(&vd), framebuffer, video_width, video_height); + (*converter_hflip)((unsigned char *)dc1394Camera.capture_buffer, + framebuffer, video_width, video_height); } else { - (*converter)(v4lgetaddress(&vd), framebuffer, video_width, video_height); + (*converter)((unsigned char *)dc1394Camera.capture_buffer, + framebuffer, video_width, video_height); } return (unsigned char *)framebuffer; } else if(video_horizontalFlip) { - image_hflip((RGB32 *)v4lgetaddress(&vd), framebuffer, + image_hflip((RGB32 *)dc1394Camera.capture_buffer, framebuffer, video_width, video_height); return (unsigned char *)framebuffer; } else { - return v4lgetaddress(&vd); + return (unsigned char *)dc1394Camera.capture_buffer; } } @@ -267,6 +406,7 @@ * the size is set to default size. */ int video_changesize(int width, int height) { +#if 0 if(width == 0 || height == 0) { width = DEFAULT_VIDEO_WIDTH; height = DEFAULT_VIDEO_HEIGHT; @@ -275,11 +415,15 @@ video_height = height; return v4lgrabinit(&vd, width, height); +#endif + return 0; } /* change video_TVchannel to video_TVchannel+v */ int video_setfreq(int v) { + return 0; +#if 0 if(video_hasTuner && (video_frequencyTable >= 0)) { video_TVchannel += v; while(video_TVchannel<0) { @@ -291,48 +435,59 @@ } else { return 0; } +#endif } /* increase brightness value with v */ void video_change_brightness(int v) { +#if 0 picture_brightness += v; if(picture_brightness < 0) picture_brightness = 0; if(picture_brightness > 65535) picture_brightness = 65535; v4lsetpicture(&vd, picture_brightness, -1, -1, -1, -1); +#endif } /* increase hue value with v */ void video_change_hue(int v) { +#if 0 picture_hue += v; if(picture_hue < 0) picture_hue = 0; if(picture_hue > 65535) picture_hue = 65535; v4lsetpicture(&vd, -1, picture_hue, -1, -1, -1); +#endif } /* increase color value with v */ void video_change_color(int v) { +#if 0 picture_colour += v; if(picture_colour < 0) picture_colour = 0; if(picture_colour > 65535) picture_colour = 65535; v4lsetpicture(&vd, -1, -1, picture_colour, -1, -1); +#endif } /* increase contrast value with v */ void video_change_contrast(int v) { +#if 0 picture_contrast += v; if(picture_contrast < 0) picture_contrast = 0; if(picture_contrast > 65535) picture_contrast = 65535; v4lsetpicture(&vd, -1, -1, -1, picture_contrast, -1); +#endif } /* change channel: stops video grabbing at first, then recreate v4ldevice * object. */ int video_change_channel(int channel) { + return 0; +#if 0 int ret = 0; int maxch; @@ -346,11 +501,14 @@ video_grabstart(); return ret; +#endif } /* retry grabbing */ int video_retry(void) { + return 0; +#if 0 video_quit(); return video_init( video_file, @@ -360,6 +518,7 @@ video_width, video_height, video_palette); +#endif } /*