Index: utils.c =================================================================== --- utils.c (revisión: 0) +++ utils.c (revisión: 0) @@ -0,0 +1,68 @@ +/******************************************************************************* +# luvcview: Sdl video Usb Video Class grabber # +#This package work with the Logitech UVC based webcams with the mjpeg feature. # +#All the decoding is in user space with the embedded jpeg decoder # +#. # +# Copyright (C) 2005 2006 Laurent Pinchart && Michel Xhaard # +# # +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +*******************************************************************************/ + +#include "motion.h" +#include "utils.h" +#include +#include +#include +#include +#include "huffman.h" + + +int is_huffman(unsigned char *buf) +{ + unsigned char *ptbuf; + int i = 0; + ptbuf = buf; + + while (((ptbuf[0] << 8) | ptbuf[1]) != 0xffda) { + if (i++ > 2048) + return 0; + if (((ptbuf[0] << 8) | ptbuf[1]) == 0xffc4) + return 1; + ptbuf++; + } + + return 0; +} + +int check_is_huffman(unsigned char *output, unsigned char *buf, int size) +{ + unsigned char *ptdeb, *ptcur = buf; + int sizein; + + if (!is_huffman(buf)) { + ptdeb = ptcur = buf; + while (((ptcur[0] << 8) | ptcur[1]) != 0xffc0) + ptcur++; + sizein = ptcur - ptdeb; + + memcpy(output, buf,sizein); + memcpy(output+sizein, dht_data, DHT_SIZE); + memcpy(output+sizein+DHT_SIZE, ptcur, size - sizein); + return 0; + } + + return 1; +} Index: Makefile.in =================================================================== --- Makefile.in (revisión: 201) +++ Makefile.in (copia de trabajo) @@ -39,7 +39,7 @@ OBJ = motion.o conf.o draw.o $(VIDEO_OBJ) netcam.o \ netcam_ftp.o netcam_jpeg.o netcam_wget.o track.o \ alg.o event.o picture.o rotate.o webhttpd.o \ - webcam.o mjpeg.o @FFMPEG_OBJ@ + webcam.o utils.o @FFMPEG_OBJ@ SRC = $(OBJ:.o=.c) DOC = CHANGELOG COPYING CREDITS INSTALL README motion_guide.html EXAMPLES = *.conf motion.init-Debian motion.init-RH motion.init-FreeBSD.sh Index: utils.h =================================================================== --- utils.h (revisión: 0) +++ utils.h (revisión: 0) @@ -0,0 +1,41 @@ +/******************************************************************************* +# luvcview: Sdl video Usb Video Class grabber. # +#This package work with the Logitech UVC based webcams with the mjpeg feature. # +#All the decoding is in user space with the embedded jpeg decoder # +#. # +# Copyright (C) 2005 2006 Laurent Pinchart && Michel Xhaard # +# # +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +*******************************************************************************/ + +#define ERR_NO_SOI 1 +#define ERR_NOT_8BIT 2 +#define ERR_HEIGHT_MISMATCH 3 +#define ERR_WIDTH_MISMATCH 4 +#define ERR_BAD_WIDTH_OR_HEIGHT 5 +#define ERR_TOO_MANY_COMPPS 6 +#define ERR_ILLEGAL_HV 7 +#define ERR_QUANT_TABLE_SELECTOR 8 +#define ERR_NOT_YCBCR_221111 9 +#define ERR_UNKNOWN_CID_IN_SCAN 10 +#define ERR_NOT_SEQUENTIAL_DCT 11 +#define ERR_WRONG_MARKER 12 +#define ERR_NO_EOI 13 +#define ERR_BAD_TABLES 14 +#define ERR_DEPTH_MISMATCH 15 + +int check_is_huffman(unsigned char *output, unsigned char *bufin, int size); + Index: event.c =================================================================== --- event.c (revisión: 201) +++ event.c (copia de trabajo) @@ -207,8 +207,9 @@ unsigned char *img, char *dummy1 ATTRIBUTE_UNUSED, void *dummy2 ATTRIBUTE_UNUSED, struct tm *tm ATTRIBUTE_UNUSED) { - if (cnt->conf.webcam_port) + if (cnt->conf.webcam_port){ webcam_put(cnt, img); + } } #ifndef WITHOUT_V4L Index: video2.c =================================================================== --- video2.c (revisión: 201) +++ video2.c (copia de trabajo) @@ -69,7 +69,7 @@ #include "netcam.h" #include "video.h" #include "rotate.h" -#include "mjpeg.h" +#include "utils.h" #ifdef MOTION_V4L2_OLD // Seems that is needed for some system @@ -297,13 +297,14 @@ static const u32 supported_formats[] = { /* higher index means better chance to be used */ V4L2_PIX_FMT_SN9C10X, V4L2_PIX_FMT_SBGGR8, - V4L2_PIX_FMT_MJPEG, + /* V4L2_PIX_FMT_MJPEG, */ V4L2_PIX_FMT_JPEG, V4L2_PIX_FMT_RGB24, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_YUV422P, V4L2_PIX_FMT_YUV420, + V4L2_PIX_FMT_MJPEG, 0 }; @@ -361,7 +362,6 @@ motion_log(LOG_INFO, 0, "Using palette %c%c%c%c (%dx%d) bytesperlines %d sizeimage %d colorspace %08x", pixformat >> 0, pixformat >> 8, pixformat >> 16, pixformat >> 24, *width, *height, s->fmt.fmt.pix.bytesperline, s->fmt.fmt.pix.sizeimage, s->fmt.fmt. pix.colorspace); -#ifdef HAVE_FFMPEG /* TODO: Review when it has been tested */ if (pixformat == V4L2_PIX_FMT_MJPEG) { struct v4l2_jpegcompression v4l2_jpeg; @@ -374,13 +374,7 @@ motion_log(LOG_ERR, 0, "VIDIOC_S_JPEGCOMP %s", strerror(errno)); } - - if ((s->mjpeg = MJPEGStartDecoder(s->fmt.fmt.pix.width, s->fmt.fmt.pix.height)) == NULL) { - motion_log(LOG_ERR, 0, "Error registering mjpeg extension %s", strerror(errno)); - return 0; - } } -#endif return 0; } @@ -828,25 +822,19 @@ case V4L2_PIX_FMT_YUV420: memcpy(map, the_buffer->ptr, viddev->v4l_bufsize); // ? s->buffer[s->buf.index].size; return 0; -#ifdef HAVE_FFMPEG case V4L2_PIX_FMT_MJPEG: { netcam_buff temp_netcam_buff = *the_buffer; - temp_netcam_buff.ptr = - (char *) MJPEGDecodeFrame((unsigned char *) the_buffer->ptr, - the_buffer->content_length, cnt->imgs.common_buffer, - (width * height << 1), s->mjpeg); - - if (temp_netcam_buff.ptr == NULL){ - motion_log(LOG_INFO,0,"Error decoding MJPEG"); - return 1; + if (!check_is_huffman((unsigned char *)temp_netcam_buff.ptr, (unsigned char *)the_buffer->ptr, the_buffer->content_length)) { + motion_log(LOG_INFO,0,"Missing huffman table ... fixing"); + return conv_jpeg2yuv420(cnt, map, &temp_netcam_buff, width, height); } - memcpy(map, temp_netcam_buff.ptr, viddev->v4l_bufsize); - return 0; + + return conv_jpeg2yuv420(cnt, map, the_buffer, width, height); + } -#endif case V4L2_PIX_FMT_JPEG: return conv_jpeg2yuv420(cnt, map, the_buffer, width, height); @@ -871,14 +859,7 @@ { src_v4l2_t *s = (src_v4l2_t *) viddev->v4l2_private; enum v4l2_buf_type type; - -#ifdef HAVE_FFMPEG - if (s->fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) { - MJPEGStopDecoder(s->mjpeg); - free(s->mjpeg); - } -#endif - + type = V4L2_BUF_TYPE_VIDEO_CAPTURE; xioctl(s->fd, VIDIOC_STREAMOFF, &type); close(s->fd); Index: huffman.h =================================================================== --- huffman.h (revisión: 0) +++ huffman.h (revisión: 0) @@ -0,0 +1,106 @@ + +#define DHT_SIZE 432 + +static unsigned char dht_data[DHT_SIZE] = { + 0xff, 0xc4, 0x00, 0x1f, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, + 0x0b, 0xff, 0xc4, 0x00, 0xb5, 0x10, 0x00, 0x02, + 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, + 0x01, 0x7d, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, + 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, + 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 0x23, 0x42, + 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, + 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, + 0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, + 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53, + 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, + 0x78, 0x79, 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, + 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, + 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, + 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, + 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, + 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, 0xe3, 0xe4, + 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, + 0xf7, 0xf8, 0xf9, 0xfa, 0xff, 0xc4, 0x00, 0x1f, + 0x01, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, + 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0xff, 0xc4, 0x00, + 0xb5, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, + 0x03, 0x04, 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 0x00, 0x01, + 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, + 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, + 0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, + 0x52, 0xf0, 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, + 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, + 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, + 0x47, 0x48, 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, + 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, + 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, + 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, + 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, + 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, + 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, + 0xd9, 0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, + 0xe8, 0xe9, 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa +}; + +#define JPG_HUFFMAN_TABLE_LENGTH 0x1A0 + +const unsigned char JPEGHuffmanTable[JPG_HUFFMAN_TABLE_LENGTH] + = { + 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, + 0x0A, 0x0B, 0x01, 0x00, 0x03, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x10, + 0x00, 0x02, 0x01, 0x03, 0x03, + 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D, + 0x01, 0x02, 0x03, 0x00, 0x04, + 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, + 0x22, 0x71, 0x14, 0x32, 0x81, + 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, + 0x24, 0x33, 0x62, 0x72, 0x82, + 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, + 0x29, 0x2A, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, + 0x4A, 0x53, 0x54, 0x55, 0x56, + 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, + 0x6A, 0x73, 0x74, 0x75, 0x76, + 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, + 0x8A, 0x92, 0x93, 0x94, 0x95, + 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, + 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, + 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, + 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, + 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, + 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, + 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, + 0xF9, 0xFA, 0x11, 0x00, 0x02, + 0x01, 0x02, 0x04, 0x04, 0x03, 0x04, 0x07, 0x05, 0x04, 0x04, 0x00, + 0x01, 0x02, 0x77, 0x00, 0x01, + 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, + 0x07, 0x61, 0x71, 0x13, 0x22, + 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xA1, 0xB1, 0xC1, 0x09, 0x23, + 0x33, 0x52, 0xF0, 0x15, 0x62, + 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18, + 0x19, 0x1A, 0x26, 0x27, 0x28, + 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, + 0x46, 0x47, 0x48, 0x49, 0x4A, + 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, + 0x66, 0x67, 0x68, 0x69, 0x6A, + 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x82, 0x83, 0x84, + 0x85, 0x86, 0x87, 0x88, 0x89, + 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, + 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, + 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, + 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, + 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, + 0xD8, 0xD9, 0xDA, 0xE2, 0xE3, + 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, + 0xF6, 0xF7, 0xF8, 0xF9, 0xFA +}; Index: video_common.c =================================================================== --- video_common.c (revisión: 201) +++ video_common.c (copia de trabajo) @@ -26,6 +26,7 @@ int val; } code_table_t; + /* * sonix_decompress_init * ===================== @@ -372,7 +373,6 @@ latest.size = buff->length; /* total allocated size */ latest.used = buff->used; #endif - //motion_log(LOG_DEBUG, 0, "frame %p length=%d", buff->start, buff->length); memset(&netcam, 0, sizeof(netcam)); netcam.imgcnt_last = 1;