diff --git a/veejay-current/README b/veejay-current/README index 1e11de66..798c4b3a 100644 --- a/veejay-current/README +++ b/veejay-current/README @@ -17,7 +17,7 @@ 0.9.16 - 2006/2007 - release date Feb. XX 2007 + 2006/2007 - release date Feb. 2 2007 ======================================= :: Veejay, a visual instrument for GNU :: @@ -73,7 +73,10 @@ See file 'INSTALL' See doc/Howto_Compile.html See doc/Howto_Compile_on_Ubuntu.html +Documentation +============= +See the directory 'doc' in this package, it contains usefull documentation. Running diff --git a/veejay-current/doc/HowtoVideoCodecs.txt b/veejay-current/doc/HowtoVideoCodecs.txt index accf0198..1d836945 100644 --- a/veejay-current/doc/HowtoVideoCodecs.txt +++ b/veejay-current/doc/HowtoVideoCodecs.txt @@ -50,11 +50,11 @@ Wich resolutions to use ¶ Veejay can do: - * high definition (use MLZO avi) - * pal: 720x576 + * high definition (use MLZO/YUV avi) + * pal: 720x576 (recommended to use MLZO/YUV avi) * ntsc: 720x480 - * 1/4 pal: 360x288 - * 1/4 ntsc: 360x240 + * 1/4 pal: 360x288 (any) + * 1/4 ntsc: 360x240 (any) If you load multiple video files on the commandline, make sure that all files have the same resolution and audio properties. How to convert ¶ diff --git a/veejay-current/README.performance b/veejay-current/doc/README.performance similarity index 100% rename from veejay-current/README.performance rename to veejay-current/doc/README.performance diff --git a/veejay-current/README.quickstart b/veejay-current/doc/README.quickstart similarity index 92% rename from veejay-current/README.quickstart rename to veejay-current/doc/README.quickstart index 5fc1b98a..a55cdb13 100644 --- a/veejay-current/README.quickstart +++ b/veejay-current/doc/README.quickstart @@ -23,13 +23,11 @@ sayVIMS "243:stream.yuv;" Move your mouse pointer to the SDL window (so it dissapears) and press 'ESC' to switch from the dummy footage to the last created or played video stream. -Veejay supports MJPG, DV avi type 2, IYUV AVI and to a certain extend also MPEG4 and DivX. Try loading an AVI file with something like: $ veejay -v mjpeg-video-file.avi -The '-v' commandline option generates extra debugging output. Sometimes this can be a lot, -you can type 'de' in veejay's console to disable/enable these messages anytime. +The '-v' commandline option generates extra debugging output. By default, veejay uses a SDL window for displaying video. You can specify veejay to write to STDOUT : diff --git a/veejay-current/README.whatis b/veejay-current/doc/README.whatis similarity index 100% rename from veejay-current/README.whatis rename to veejay-current/doc/README.whatis diff --git a/veejay-current/doc/YCbCr.txt b/veejay-current/doc/YCbCr.txt index 99f805d2..23c79a51 100644 --- a/veejay-current/doc/YCbCr.txt +++ b/veejay-current/doc/YCbCr.txt @@ -1,20 +1,17 @@ - Veejay processing ================= - - Veejay processes nativly in YUV, hence no RGB <-> YUV conversions - are used while rendering. + Veejay processes nativly in YUV, this is to keep colorspace conversions + to a minimum. YUV 4:2:0 Planar ( 1 Cr and 1 Cb sample per 2x2 Y samples) YUV 4:2:2 Planar ( 1 Cr and 1 Cr sample per 1x2 Y samples) (both full range JPEG and clipped to 16-235 / 16-240) - - - Conversion from RGB to YUV is only necessary for webcam devices. - Conversion from YUV to RGB is only necessary for preview image - + Places where veejay uses software conversion: + Conversion from RGB to YUV is for webcam devices. + Conversion from YUV to RGB is for preview image + Some FX convert the frame to RGB Why YUV ? ========= @@ -23,5 +20,4 @@ Why YUV ? - Many capture devices deliver YUV - Software conversion of RGB <-> YUV is expensive - Consumes less bandwith then RGB - diff --git a/veejay-current/gveejay-reloaded/vj-api.c b/veejay-current/gveejay-reloaded/vj-api.c index d6aebbea..53d7f1a7 100644 --- a/veejay-current/gveejay-reloaded/vj-api.c +++ b/veejay-current/gveejay-reloaded/vj-api.c @@ -1,6 +1,7 @@ /* Gveejay Reloaded - graphical interface for VeeJay * (C) 2002-2004 Niels Elburg - * (C) 2005 Thomas Rheinhold + * with contributions by Thomas Rheinhold (2005) + * (initial sampledeck representation in GTK) * * * This program is free software; you can redistribute it and/or modify @@ -1517,22 +1518,23 @@ void about_dialog() const gchar *authors[] = { "Niels Elburg ", + "Matthijs v. Henten ", "Thomas Reinhold ", NULL }; - const gchar *license = - { - "This program is Free Software; You can redistribute it and/or modify\n" \ - "under the terms of the GNU General Public License as published by\n" \ - "the Free Software Foundation; either version 2, or (at your option)\n"\ - "any later version.\n\n"\ - "This program is distributed in the hope it will be useful,\n"\ - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"\ - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"\ - "See the GNU General Public License for more details.\n\n"\ - "For more information , see also: http://www.gnu.org\n" - }; + const gchar *license = + { + "This program is Free Software; You can redistribute it and/or modify\n" \ + "under the terms of the GNU General Public License as published by\n" \ + "the Free Software Foundation; either version 2, or (at your option)\n"\ + "any later version.\n\n"\ + "This program is distributed in the hope it will be useful,\n"\ + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"\ + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"\ + "See the GNU General Public License for more details.\n\n"\ + "For more information , see also: http://www.gnu.org\n" + }; #ifdef HAVE_GTK2_6 char path[MAX_PATH_LEN]; @@ -1544,7 +1546,7 @@ void about_dialog() GTK_TYPE_ABOUT_DIALOG, "name", "GVeejay Reloaded", "version", VERSION, - "copyright", "(C) 2004 - 2005 N. Elburg et all.", + "copyright", "(C) 2004 - 2007 N. Elburg et all.", "comments", "The graphical interface for Veejay", "authors", authors, "artists", artists, @@ -1554,19 +1556,6 @@ void about_dialog() g_signal_connect( about , "response", G_CALLBACK( gtk_widget_destroy),NULL); gtk_window_present( GTK_WINDOW( about ) ); -#else - int i; -// vj_msg_detail( VEEJAY_MSG_INFO, "Gveejay Reloaded %s %d%d%d", VEEJAY_CODENAME,VEEJAY_MAJOR_VERSION,VEEJAY_MINOR_VERSION,VEEJAY_MICRO_VERSION ); -// vj_msg_detail( VEEJAY_MSG_INFO, "%s", license ); -/* for(i = 0; artists[i] != NULL ; i ++ ) - vj_msg_detail( VEEJAY_MSG_INFO, "%s", artists[i] ); - for(i = 0; authors[i] != NULL ; i ++ ) - vj_msg_detail( VEEJAY_MSG_INFO, "%s", authors[i] ); - vj_msg_detail( VEEJAY_MSG_INFO, - "Copyright (C) 2004 - 2005. N. Elburg et all." ); - vj_msg_detail( VEEJAY_MSG_INFO, - "GVeejay Reloaded - Another graphical interface for Veejay");*/ - #endif } diff --git a/veejay-current/libgoom/Makefile.in b/veejay-current/libgoom/Makefile.in index d04e5c2e..53f5fce7 100644 --- a/veejay-current/libgoom/Makefile.in +++ b/veejay-current/libgoom/Makefile.in @@ -260,9 +260,6 @@ USE_GL_FALSE = @USE_GL_FALSE@ USE_GL_TRUE = @USE_GL_TRUE@ USE_GVEEJAYRELOADED_FALSE = @USE_GVEEJAYRELOADED_FALSE@ USE_GVEEJAYRELOADED_TRUE = @USE_GVEEJAYRELOADED_TRUE@ -USE_SWSCALER = @USE_SWSCALER@ -USE_SWSCALER_FALSE = @USE_SWSCALER_FALSE@ -USE_SWSCALER_TRUE = @USE_SWSCALER_TRUE@ USE_UNICAP = @USE_UNICAP@ USE_UNICAP_FALSE = @USE_UNICAP_FALSE@ USE_UNICAP_TRUE = @USE_UNICAP_TRUE@ diff --git a/veejay-current/veejay/veejay.c b/veejay-current/veejay/veejay.c index 03d0205e..d6818de0 100644 --- a/veejay-current/veejay/veejay.c +++ b/veejay-current/veejay/veejay.c @@ -216,7 +216,7 @@ static void Usage(char *progname) fprintf(stderr, " --map-from-file \tmap N frames to memory\n"); fprintf(stderr, - " -z/--zoom [1-11]\n"); + " -z/--zoom [1-11]\t\tScale output video\n"); fprintf(stderr, "\t\t\t\tsoftware scaler type (also use -w/--zoomwidth, -h/--zoomheight ). \n"); fprintf(stderr,