Merge branch 'hw-ycc+devdrv2' into hw-upycc

diff --git a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/mjpeg.vhd b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/mjpeg.vhd
index a66dfdd..d5f6f74 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/mjpeg.vhd
+++ b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/mjpeg.vhd
@@ -1,3 +1,28 @@
+------------------------------------------------------------------------------
+--  Copyright (C) 20011 , Kenichi Kurimoto
+--
+--  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 
+-----------------------------------------------------------------------------
+-- Entity:      mjpeg package 
+-- File:        mjpeg.vhd
+-- Author:      Kenichi Kurimoto 
+-- Description: motion JPEG package
+------------------------------------------------------------------------------
+
+
+
 library ieee;
 use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;

diff --git a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/yccrgbs.vhd b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/yccrgbs.vhd
index d025724..5f02129 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/yccrgbs.vhd
+++ b/grlib-gpl-1.0.22-b4095/lib/kuri/mjpeg/yccrgbs.vhd
@@ -1,3 +1,26 @@
+------------------------------------------------------------------------------
+--  Copyright (C) 2011 -  Kenichi Kurimoto
+--
+--  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 
+-----------------------------------------------------------------------------
+-- Entity:      yccrgbs
+-- File:        yccrgbs.vhd
+-- Author:      Kenichi Kurimoto 
+-- Description: simple YCbCr-RGB translation 
+------------------------------------------------------------------------------
+
 library ieee;
 use ieee.std_logic_1164.all;
 use ieee.numeric_std.all;

diff --git a/snapgear-2.6-p42/user/jpeg-6b-host/README.mjpegfile b/snapgear-2.6-p42/user/jpeg-6b-host/README.mjpegfile
new file mode 100644 (file)
index 0000000..6a1d241
--- /dev/null
+++ b/snapgear-2.6-p42/user/jpeg-6b-host/README.mjpegfile
@@ -0,0 +1,13 @@
+gfdl-qvga.mjpeg
+gfdl.mjpeg
+
+は、以下のアドレスで公開されているGNU Free Documentation Lisenseの動画を
+元にffmpegを使用してmjpegファイルに変換して生成しました
+
+http://commons.wikimedia.org/wiki/File:University_of_Louisville_Residence_Halls.ogg
+
+-----------------------------------------------------------------------
+
+gfdl-qvga.mjpeg gfdl.mjpeg are generated from the following GFDL(Gnu Free Documentation License) movie.
+
+http://commons.wikimedia.org/wiki/File:University_of_Louisville_Residence_Halls.ogg
\ No newline at end of file

diff --git a/snapgear-2.6-p42/user/jpeg-6b-host/airport-qvga.mjpeg b/snapgear-2.6-p42/user/jpeg-6b-host/airport-qvga.mjpeg
deleted file mode 100644 (file)
index 0de2ea8..0000000
Binary files a/snapgear-2.6-p42/user/jpeg-6b-host/airport-qvga.mjpeg and /dev/null differ

diff --git a/snapgear-2.6-p42/user/jpeg-6b-host/airport-vga.mjpeg b/snapgear-2.6-p42/user/jpeg-6b-host/airport-vga.mjpeg
deleted file mode 100644 (file)
index 0a51c57..0000000
Binary files a/snapgear-2.6-p42/user/jpeg-6b-host/airport-vga.mjpeg and /dev/null differ

diff --git a/snapgear-2.6-p42/user/jpeg-6b-host/gfdl-qvga.mjpeg b/snapgear-2.6-p42/user/jpeg-6b-host/gfdl-qvga.mjpeg
new file mode 100644 (file)
index 0000000..cf06afb
Binary files /dev/null and b/snapgear-2.6-p42/user/jpeg-6b-host/gfdl-qvga.mjpeg differ

diff --git a/snapgear-2.6-p42/user/jpeg-6b-host/gfdl.mjpeg b/snapgear-2.6-p42/user/jpeg-6b-host/gfdl.mjpeg
new file mode 100644 (file)
index 0000000..2b3be76
Binary files /dev/null and b/snapgear-2.6-p42/user/jpeg-6b-host/gfdl.mjpeg differ