artoolkit-commits Mailing List for ARToolKit (Page 3)
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits — Log of code commits to the ARToolKit repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(5) |
Mar
(15) |
Apr
(22) |
May
|
Jun
(9) |
Jul
(108) |
Aug
(42) |
Sep
(62) |
Oct
(5) |
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(27) |
Jun
(58) |
Jul
(8) |
Aug
(11) |
Sep
(51) |
Oct
(15) |
Nov
(12) |
Dec
(3) |
| 2007 |
Jan
(25) |
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(20) |
Sep
(5) |
Oct
|
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Philip L. <phi...@us...> - 2007-08-06 02:38:46
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12739 Modified Files: main.c Log Message: Rename some fns for clarity, change Quit to cleanup. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** main.c 22 Feb 2007 21:53:13 -0000 1.15 --- main.c 6 Aug 2007 02:38:47 -0000 1.16 *************** *** 109,113 **** static void Keyboard(unsigned char key, int x, int y); static void Quit(void); ! static void Idle(void); static void Visibility(int visible); static void Reshape(int w, int h); --- 109,113 ---- static void Keyboard(unsigned char key, int x, int y); static void Quit(void); ! static void mainLoop(void); static void Visibility(int visible); static void Reshape(int w, int h); *************** *** 143,147 **** // Register GLUT event-handling callbacks. ! // NB: Idle() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); --- 143,147 ---- // Register GLUT event-handling callbacks. ! // NB: mainLoop() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); *************** *** 263,267 **** printf("Not enough images to proceed with calibration. Exiting.\n"); } ! Quit(); } } --- 263,268 ---- printf("Not enough images to proceed with calibration. Exiting.\n"); } ! cleanup(); ! exit(0); } } *************** *** 275,279 **** if (gPatt.loop_num == 0) { // No images with all features identified, so quit. ! Quit(); } else { // At least one image with all features identified, --- 276,281 ---- if (gPatt.loop_num == 0) { // No images with all features identified, so quit. ! cleanup(); ! exit(0); } else { // At least one image with all features identified, *************** *** 467,471 **** } ! static void Quit(void) { if (gClipImage) { --- 469,473 ---- } ! static void cleanup(void) { if (gClipImage) { *************** *** 476,483 **** if (gWin) glutDestroyWindow(gWin); arVideoClose(); - exit(0); } ! static void Idle(void) { static int ms_prev; --- 478,484 ---- if (gWin) glutDestroyWindow(gWin); arVideoClose(); } ! static void mainLoop(void) { static int ms_prev; *************** *** 486,490 **** ARUint8 *image; ! // Find out how long since Idle() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; --- 487,491 ---- ARUint8 *image; ! // Find out how long since mainLoop() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; *************** *** 509,513 **** { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(Idle); } else { glutIdleFunc(NULL); --- 510,514 ---- { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(mainLoop); } else { glutIdleFunc(NULL); |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:38:40
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12728 Modified Files: calib_dist.c Log Message: Rename some fns for clarity, change Quit to cleanup. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** calib_dist.c 3 Oct 2006 21:35:19 -0000 1.16 --- calib_dist.c 6 Aug 2007 02:38:41 -0000 1.17 *************** *** 107,111 **** static void Keyboard(unsigned char key, int x, int y); static void Quit(void); ! static void Idle(void); static void Visibility(int visible); static void Reshape(int w, int h); --- 107,111 ---- static void Keyboard(unsigned char key, int x, int y); static void Quit(void); ! static void mainLoop(void); static void Visibility(int visible); static void Reshape(int w, int h); *************** *** 140,144 **** // Register GLUT event-handling callbacks. ! // NB: Idle() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); --- 140,144 ---- // Register GLUT event-handling callbacks. ! // NB: mainLoop() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); *************** *** 236,240 **** glutPostRedisplay(); } else { ! Quit(); } } --- 236,241 ---- glutPostRedisplay(); } else { ! cleanup(); ! exit(0); } } *************** *** 248,252 **** if (gPatt.loop_num == 0) { // No images with all features identified, so quit. ! Quit(); } else { // At least one image with all features identified, --- 249,254 ---- if (gPatt.loop_num == 0) { // No images with all features identified, so quit. ! cleanup(); ! exit(0); } else { // At least one image with all features identified, *************** *** 440,444 **** } ! static void Quit(void) { if (gClipImage) { --- 442,446 ---- } ! static void cleanup(void) { if (gClipImage) { *************** *** 449,456 **** if (gWin) glutDestroyWindow(gWin); arVideoClose(); - exit(0); } ! static void Idle(void) { static int ms_prev; --- 451,457 ---- if (gWin) glutDestroyWindow(gWin); arVideoClose(); } ! static void mainLoop(void) { static int ms_prev; *************** *** 459,463 **** ARUint8 *image; ! // Find out how long since Idle() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; --- 460,464 ---- ARUint8 *image; ! // Find out how long since mainLoop() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; *************** *** 482,486 **** { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(Idle); } else { glutIdleFunc(NULL); --- 483,487 ---- { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(mainLoop); } else { glutIdleFunc(NULL); |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:37:36
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12341 Modified Files: twoView.c Log Message: Rename some fns for clarity, change Quit to cleanup. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** twoView.c 23 Jan 2007 00:39:27 -0000 1.19 --- twoView.c 6 Aug 2007 02:37:37 -0000 1.20 *************** *** 361,365 **** } ! static void Idle(void) { int i; --- 361,365 ---- } ! static void mainLoop(void) { int i; *************** *** 373,377 **** int j, k; ! // Find out how long since Idle() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; --- 373,377 ---- int j, k; ! // Find out how long since mainLoop() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; *************** *** 382,386 **** DrawCubeUpdate(s_elapsed); ! gCallCountGetImage++; // Increment Idle() counter. for (i = 0; i < gContextsActiveCount; i++) { --- 382,386 ---- DrawCubeUpdate(s_elapsed); ! gCallCountGetImage++; // Increment mainLoop() counter. for (i = 0; i < gContextsActiveCount; i++) { *************** *** 391,395 **** gContextsActive[i].callCountMarkerDetect++; // Increment ARToolKit FPS counter. ! //fprintf(stderr, "Idle(): Got image #%ld from cam %d on attempt #%ld.\n", gContextsActive[i].callCountMarkerDetect, i + 1, gCallCountGetImage); // Detect the markers in the video frame. --- 391,395 ---- gContextsActive[i].callCountMarkerDetect++; // Increment ARToolKit FPS counter. ! //fprintf(stderr, "mainLoop(): Got image #%ld from cam %d on attempt #%ld.\n", gContextsActive[i].callCountMarkerDetect, i + 1, gCallCountGetImage); // Detect the markers in the video frame. *************** *** 429,433 **** { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(Idle); } else { glutIdleFunc(NULL); --- 429,433 ---- { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(mainLoop); } else { glutIdleFunc(NULL); *************** *** 614,618 **** // Register GLUT event-handling callbacks. ! // NB: Idle() is registered by Visibility. glutMainLoop(); --- 614,618 ---- // Register GLUT event-handling callbacks. ! // NB: mainLoop() is registered by Visibility. glutMainLoop(); |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:37:10
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12325 Modified Files: gsubUtil.c gsub_lite.c Log Message: Add some comments, sanity checking. Index: gsubUtil.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsubUtil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** gsubUtil.c 4 Nov 2004 08:51:43 -0000 1.1.1.1 --- gsubUtil.c 6 Aug 2007 02:37:09 -0000 1.2 *************** *** 20,26 **** #include <AR/gsubUtil.h> ! #define CALIB_POS1_NUM 5 ! #define CALIB_POS2_NUM 2 static double calib_pos[CALIB_POS1_NUM][2] = { { 160, 120 }, { 480, 120 }, --- 20,27 ---- #include <AR/gsubUtil.h> ! #define CALIB_POS1_NUM 5 // Use 5 positions in the display image plane (x-y) ! #define CALIB_POS2_NUM 2 // Use 2 positions in the display depth axis (z) + // Centre of the four quadrants, and centre of whole image. static double calib_pos[CALIB_POS1_NUM][2] = { { 160, 120 }, { 480, 120 }, *************** *** 30,35 **** static double calib_pos2d[CALIB_POS1_NUM][CALIB_POS2_NUM][2]; static double calib_pos3d[CALIB_POS1_NUM][CALIB_POS2_NUM][3]; ! static int co1; ! static int co2; static int left_right; static double target_trans[3][4]; --- 31,36 ---- static double calib_pos2d[CALIB_POS1_NUM][CALIB_POS2_NUM][2]; static double calib_pos3d[CALIB_POS1_NUM][CALIB_POS2_NUM][3]; ! static int co1; // Index into which x-y coordinate we are capturing. ! static int co2; // Index into which z coordinate we are capturing. static int left_right; static double target_trans[3][4]; Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** gsub_lite.c 23 Jan 2007 00:39:27 -0000 1.24 --- gsub_lite.c 6 Aug 2007 02:37:09 -0000 1.25 *************** *** 638,641 **** --- 638,642 ---- void arglCleanup(ARGL_CONTEXT_SETTINGS_REF contextSettings) { + if (!contextSettings) return; // Sanity check. arglCleanupTexRectangle(contextSettings); arglCleanupTexPow2(contextSettings); |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:36:06
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11919 Modified Files: simpleLite.c Log Message: Rename some fns for clarity, change Quit to cleanup. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** simpleLite.c 20 Mar 2007 04:28:56 -0000 1.24 --- simpleLite.c 6 Aug 2007 02:36:07 -0000 1.25 *************** *** 232,241 **** } ! static void Quit(void) { arglCleanup(gArglSettings); arVideoCapStop(); arVideoClose(); - exit(0); } --- 232,240 ---- } ! static void cleanup(void) { arglCleanup(gArglSettings); arVideoCapStop(); arVideoClose(); } *************** *** 248,252 **** case 'Q': case 'q': ! Quit(); break; case ' ': --- 247,252 ---- case 'Q': case 'q': ! cleanup(); ! exit(0); break; case ' ': *************** *** 302,306 **** } ! static void Idle(void) { static int ms_prev; --- 302,306 ---- } ! static void mainLoop(void) { static int ms_prev; *************** *** 313,317 **** int j, k; ! // Find out how long since Idle() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; --- 313,317 ---- int j, k; ! // Find out how long since mainLoop() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; *************** *** 363,367 **** { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(Idle); } else { glutIdleFunc(NULL); --- 363,367 ---- { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(mainLoop); } else { glutIdleFunc(NULL); *************** *** 435,448 **** { char glutGamemode[32]; ! const char *cparam_name = "Data/camera_para.dat"; ! // ! // Camera configuration. ! // ! #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; ! #else ! char *vconf = ""; ! #endif ! const char *patt_name = "Data/patt.hiro"; // ---------------------------------------------------------------------------- --- 435,441 ---- { char glutGamemode[32]; ! char *cparam_name = "Data/camera_para.dat"; ! char *vconf = ""; ! char *patt_name = "Data/patt.hiro"; // ---------------------------------------------------------------------------- *************** *** 477,483 **** } ! // Setup argl library for current context. if ((gArglSettings = arglSetupForCurrentContext()) == NULL) { fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n"); exit(-1); } --- 470,477 ---- } ! // Setup ARgsub_lite library for current OpenGL context. if ((gArglSettings = arglSetupForCurrentContext()) == NULL) { fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n"); + cleanup(); exit(-1); } *************** *** 485,496 **** glEnable(GL_DEPTH_TEST); arUtilTimerReset(); ! if (!setupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); ! Quit(); } // Register GLUT event-handling callbacks. ! // NB: Idle() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); --- 479,492 ---- glEnable(GL_DEPTH_TEST); arUtilTimerReset(); ! ! // Load marker(s). if (!setupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); ! cleanup(); ! exit(-1); } // Register GLUT event-handling callbacks. ! // NB: mainLoop() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:34:39
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11188 Modified Files: videoWin32DirectShow.cpp Log Message: Tidy up config handling in videoWin32DSVL. Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** videoWin32DirectShow.cpp 23 Jan 2007 00:39:28 -0000 1.11 --- videoWin32DirectShow.cpp 6 Aug 2007 02:34:40 -0000 1.12 *************** *** 156,169 **** vid->graphManager = new DSVL_VideoSource(); if (!config) { - config = getenv("ARTOOLKIT_CONFIG"); ! ! if (config == NULL) { ! config = &config_default[0]; ! } if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL); - } else { ! if (strncmp(config, "<?xml", 5) == 0) { if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL); } else { --- 156,166 ---- vid->graphManager = new DSVL_VideoSource(); if (!config) { config = getenv("ARTOOLKIT_CONFIG"); ! if (!config) config = config_default; if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL); } else { ! if (!config[0]) { ! if (FAILED(vid->graphManager->BuildGraphFromXMLString(config_default))) return(NULL); ! } else if (strncmp(config, "<?xml", 5) == 0) { if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL); } else { |
|
From: Philip L. <phi...@us...> - 2007-08-06 02:32:57
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10431 Modified Files: simpleVRML.c Log Message: Rename some fns for clarity, change Quit to cleanup. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** simpleVRML.c 23 Jan 2007 00:39:27 -0000 1.18 --- simpleVRML.c 6 Aug 2007 02:32:54 -0000 1.19 *************** *** 185,189 **** } ! static void Quit(void) { arglCleanup(gArglSettings); --- 185,189 ---- } ! static void cleanup(void) { arglCleanup(gArglSettings); *************** *** 193,197 **** CoUninitialize(); #endif - exit(0); } --- 193,196 ---- *************** *** 204,208 **** case 'Q': case 'q': ! Quit(); break; case 'C': --- 203,208 ---- case 'Q': case 'q': ! cleanup(); ! exit(0); break; case 'C': *************** *** 255,259 **** } ! static void Idle(void) { static int ms_prev; --- 255,259 ---- } ! static void mainLoop(void) { static int ms_prev; *************** *** 266,270 **** int i, j, k; ! // Find out how long since Idle() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; --- 266,270 ---- int i, j, k; ! // Find out how long since mainLoop() last ran. ms = glutGet(GLUT_ELAPSED_TIME); s_elapsed = (float)(ms - ms_prev) * 0.001; *************** *** 330,334 **** { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(Idle); } else { glutIdleFunc(NULL); --- 330,334 ---- { if (visible == GLUT_VISIBLE) { ! glutIdleFunc(mainLoop); } else { glutIdleFunc(NULL); *************** *** 456,459 **** --- 456,460 ---- if ((gArglSettings = arglSetupForCurrentContext()) == NULL) { fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n"); + cleanup(); exit(-1); } *************** *** 464,468 **** if (!setupMarkersObjects(objectDataFilename, &gObjectData, &gObjectDataCount)) { fprintf(stderr, "main(): Unable to set up AR objects and markers.\n"); ! Quit(); } --- 465,470 ---- if (!setupMarkersObjects(objectDataFilename, &gObjectData, &gObjectDataCount)) { fprintf(stderr, "main(): Unable to set up AR objects and markers.\n"); ! cleanup(); ! exit(-1); } *************** *** 478,482 **** // Register GLUT event-handling callbacks. ! // NB: Idle() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); --- 480,484 ---- // Register GLUT event-handling callbacks. ! // NB: mainLoop() is registered by Visibility. glutDisplayFunc(Display); glutReshapeFunc(Reshape); |
|
From: Philip L. <phi...@us...> - 2007-03-20 04:28:59
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28588/doc/gsub_lite/DataTypes Modified Files: DataTypes.html Log Message: Updated copyright date. Add threshhold adjustment to simpleLite. Index: DataTypes.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes/DataTypes.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DataTypes.html 22 May 2006 23:03:19 -0000 1.6 --- DataTypes.html 20 Mar 2007 04:28:56 -0000 1.7 *************** *** 34,38 **** </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb (Last Updated June 23, 2006) </p></body></html> --- 34,38 ---- </dd> </dl> ! <p><p>© 2003-2007 Philip Lamb (Last Updated June 23, 2006) </p></body></html> |
|
From: Philip L. <phi...@us...> - 2007-03-20 04:28:58
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28588/doc/gsub_lite Modified Files: CompositePage.html Log Message: Updated copyright date. Add threshhold adjustment to simpleLite. Index: CompositePage.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CompositePage.html 4 Oct 2006 05:37:47 -0000 1.9 --- CompositePage.html 20 Mar 2007 04:28:56 -0000 1.10 *************** *** 637,641 **** </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb (Last Updated June 23, 2006) </p></body></html> --- 637,641 ---- </dd> </dl> ! <p><p>© 2003-2007 Philip Lamb (Last Updated June 23, 2006) </p></body></html> |
|
From: Philip L. <phi...@us...> - 2007-03-20 04:28:58
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28588/doc/gsub_lite/Functions Modified Files: Functions.html Log Message: Updated copyright date. Add threshhold adjustment to simpleLite. Index: Functions.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions/Functions.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Functions.html 4 Oct 2006 05:37:33 -0000 1.8 --- Functions.html 20 Mar 2007 04:28:56 -0000 1.9 *************** *** 548,552 **** </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb (Last Updated June 23, 2006) </p></body></html> --- 548,552 ---- </dd> </dl> ! <p><p>© 2003-2007 Philip Lamb (Last Updated June 23, 2006) </p></body></html> |
|
From: Philip L. <phi...@us...> - 2007-03-20 04:28:58
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28588/examples/simpleLite Modified Files: simpleLite.c Log Message: Updated copyright date. Add threshhold adjustment to simpleLite. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** simpleLite.c 23 Jan 2007 00:39:27 -0000 1.23 --- simpleLite.c 20 Mar 2007 04:28:56 -0000 1.24 *************** *** 242,246 **** static void Keyboard(unsigned char key, int x, int y) { ! int mode; switch (key) { case 0x1B: // Quit. --- 242,247 ---- static void Keyboard(unsigned char key, int x, int y) { ! int mode, threshChange = 0; ! switch (key) { case 0x1B: // Quit. *************** *** 268,271 **** --- 269,279 ---- debugReportMode(gArglSettings); break; + case '-': + threshChange = -5; + break; + case '+': + case '=': + threshChange = +5; + break; case 'D': case 'd': *************** *** 277,280 **** --- 285,289 ---- printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); + printf(" - and + Adjust threshhold.\n"); printf(" d Activate / deactivate debug mode.\n"); printf(" ? or / Show this help.\n"); *************** *** 285,288 **** --- 294,303 ---- break; } + if (threshChange) { + gARTThreshhold += threshChange; + if (gARTThreshhold < 0) gARTThreshhold = 0; + if (gARTThreshhold > 255) gARTThreshhold = 255; + printf("Threshhold changed to %d.\n", gARTThreshhold); + } } |
|
From: Wayne P. <ti...@us...> - 2007-03-13 04:57:30
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv944 Modified Files: Makefile.in Log Message: Added -f flag so that if the target doesn't exist we don't get a fatal error Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 1 Dec 2004 04:54:47 -0000 1.1 --- Makefile.in 13 Mar 2007 04:57:30 -0000 1.2 *************** *** 41,48 **** clean: -rm -f *.o *~ *.bak ! -rm $(TARGET) allclean: -rm -f *.o *~ *.bak ! -rm $(TARGET) -rm -f Makefile --- 41,48 ---- clean: -rm -f *.o *~ *.bak ! -rm -f $(TARGET) allclean: -rm -f *.o *~ *.bak ! -rm -f $(TARGET) -rm -f Makefile |
|
From: Wayne P. <ti...@us...> - 2007-03-13 04:53:48
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv31539 Modified Files: video.c Log Message: Previously the error checking was inconsistent, with some exit() calls and some return() calls. I have now made it so that return is used whenever there is some kind of recoverable error, and if the error indicates a fault in the code itself, then we just exit because there is no point continuing. I also added better debugging during the config string parsing. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** video.c 13 Mar 2007 04:26:43 -0000 1.16 --- video.c 13 Mar 2007 04:53:47 -0000 1.17 *************** *** 266,270 **** printf(" specifies desired framerate of a FireWire camera. \n"); printf(" (1.875, 3.75, 7.5, 15, 30, 60)\n"); ! printf(" -[name]=N where name is brightness, iris, shutter, gain, saturation, gamma, sharpness\n"); printf(" (value must be a legal value for this parameter - use coriander to find what they are\n"); printf("\n"); --- 266,270 ---- printf(" specifies desired framerate of a FireWire camera. \n"); printf(" (1.875, 3.75, 7.5, 15, 30, 60)\n"); ! printf(" -[name]=N where name is 'iris' or 'gain'.\n"); printf(" (value must be a legal value for this parameter - use coriander to find what they are\n"); printf("\n"); *************** *** 304,324 **** vid->status = 0; ! /* If no config string is supplied, we should use the environment variable, otherwise set a sane default */ ! if (!config_in || !(config_in[0])) { ! /* None suppplied, lets see if the user supplied one from the shell */ ! char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf && envconf[0]) { ! config = envconf; ! printf ("Using config string from environment [%s].\n", envconf); ! } else { ! config = NULL; ! printf ("No video config string supplied, using defaults.\n"); ! } ! } else { ! config = config_in; ! printf ("Using supplied video config string [%s].\n", config_in); ! } ! ! a = config; if( a != NULL) { for(;;) { --- 304,324 ---- vid->status = 0; ! /* If no config string is supplied, we should use the environment variable, otherwise set a sane default */ ! if (!config_in || !(config_in[0])) { ! /* None suppplied, lets see if the user supplied one from the shell */ ! char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf && envconf[0]) { ! config = envconf; ! printf ("Using config string from environment [%s].\n", envconf); ! } else { ! config = NULL; ! printf ("No video config string supplied, using default 640x480 RGB at 15 Hz.\n"); ! } ! } else { ! config = config_in; ! printf ("Using supplied video config string [%s].\n", config_in); ! } ! ! a = config; if( a != NULL) { for(;;) { *************** *** 337,343 **** } else { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 337,344 ---- } else { + fprintf (stderr, "Video mode string supplied [%s] is not parseable", &a[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 346,352 **** sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &iris ) == 0 ) { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 347,354 ---- sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &iris ) == 0 ) { + fprintf (stderr, "Video iris value supplied [%s] is not parseable", &line[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 354,360 **** sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &gain ) == 0 ) { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 356,363 ---- sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &gain ) == 0 ) { + fprintf (stderr, "Video gain value supplied [%s] is not parseable", &line[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 363,369 **** sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &vid->node ) == 0 ) { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 366,373 ---- sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &vid->node ) == 0 ) { + fprintf (stderr, "Firewire node value supplied [%s] is not parseable", &line[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 371,377 **** sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &vid->card ) == 0 ) { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 375,382 ---- sscanf( a, "%s", line ); if( sscanf( &line[6], "%d", &vid->card ) == 0 ) { + fprintf (stderr, "Firewire card value supplied [%s] is not parseable", &line[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 396,402 **** } else { ar2VideoDispOption(); free( vid ); ! return 0; } } --- 401,408 ---- } else { + fprintf (stderr, "Frame rate value supplied [%s] is not parseable", &a[6]); ar2VideoDispOption(); free( vid ); ! return (NULL); } } *************** *** 405,414 **** } else if( strncmp( a, "-adjust", 7 ) == 0 ) { ! /* Do nothing - this is for V4L compatibility */ } else { ar2VideoDispOption(); free( vid ); ! return 0; } --- 411,421 ---- } else if( strncmp( a, "-adjust", 7 ) == 0 ) { ! /* Do nothing - this is for VideoLinuxV4L compatibility */ } else { + fprintf (stderr, "Unknown config option supplied [%s]", a); ar2VideoDispOption(); free( vid ); ! return (NULL); } *************** *** 423,427 **** { fprintf (stderr, "Could not initialise 1394 bus with card=%d and node=%d\n", vid->card, vid->node); ! exit(1); } initFlag = 1; --- 430,434 ---- { fprintf (stderr, "Could not initialise 1394 bus with card=%d and node=%d\n", vid->card, vid->node); ! return (NULL); } initFlag = 1; *************** *** 436,439 **** --- 443,447 ---- &(vid->features)) != DC1394_SUCCESS ) { fprintf( stderr, "Unable to get feature set from device\n"); + return (NULL); } else if( vid->debug ) { *************** *** 464,468 **** /*-----------------------------------------------------------------------*/ if( dc1394_query_supported_formats(arV1394.handle, vid->node, &value) != DC1394_SUCCESS ) { ! fprintf( stderr, "unable to query_supported_formats\n"); } i = 31 - (FORMAT_VGA_NONCOMPRESSED - FORMAT_MIN); --- 472,477 ---- /*-----------------------------------------------------------------------*/ if( dc1394_query_supported_formats(arV1394.handle, vid->node, &value) != DC1394_SUCCESS ) { ! fprintf( stderr, "Unable to perform a query_supported_formats call\n"); ! return (NULL); } i = 31 - (FORMAT_VGA_NONCOMPRESSED - FORMAT_MIN); *************** *** 470,475 **** p2 = value & p1; if( p2 == 0 ) { ! fprintf( stderr, "unable to use this camera on VGA_NONCOMPRESSED format.\n"); ! exit(0); } --- 479,484 ---- p2 = value & p1; if( p2 == 0 ) { ! fprintf( stderr, "Unable to use this camera on VGA_NONCOMPRESSED format.\n"); ! return (NULL); } *************** *** 489,493 **** fprintf( stderr, "Unsupported Mode for the specified camera.\n"); ar2VideoDispOption(); ! exit(0); } else --- 498,502 ---- fprintf( stderr, "Unsupported Mode for the specified camera.\n"); ar2VideoDispOption(); ! return (NULL); } else *************** *** 504,510 **** p2 = value & p1; if( p2 == 0 ) { ! fprintf( stderr, "Unsupported Framerate for the specified mode.\n"); ar2VideoDispOption(); ! exit(0); } --- 513,519 ---- p2 = value & p1; if( p2 == 0 ) { ! fprintf( stderr, "Unsupported framerate for the specified mode.\n"); ar2VideoDispOption(); ! return (NULL); } *************** *** 541,556 **** #endif &(vid->camera)) != DC1394_SUCCESS ) { ! fprintf( stderr,"unable to setup camera-\n" ! "check if you did 'insmod video1394' or,\n" ! "check line %d of %s to make sure\n" ! "that the video mode,framerate and format are\n" ! "supported by your camera\n", ! __LINE__,__FILE__); ! exit(1); } /* set trigger mode */ if( dc1394_set_trigger_mode(arV1394.handle, vid->node, TRIGGER_MODE_0) != DC1394_SUCCESS ) { ! fprintf( stderr, "unable to set camera trigger mode (ignored)\n"); } --- 550,560 ---- #endif &(vid->camera)) != DC1394_SUCCESS ) { ! fprintf (stderr, "Unable to setup initial camera DMA transfer, check that the video1394 module is loaded, and that the video mode, frame rate, and format are supported by your camera"); ! return (NULL); } /* set trigger mode */ if( dc1394_set_trigger_mode(arV1394.handle, vid->node, TRIGGER_MODE_0) != DC1394_SUCCESS ) { ! fprintf( stderr, "unable to set camera trigger mode (ignored)\n"); } *************** *** 616,629 **** #endif &(vid->camera)) != DC1394_SUCCESS ) { ! fprintf( stderr,"unable to setup camera-\n" ! "check if you did 'insmod video1394' or,\n" ! "check line %d of %s to make sure\n" ! "that the video mode,framerate and format are\n" ! "supported by your camera\n", ! __LINE__,__FILE__); ! exit(1); } } ! if( dc1394_start_iso_transmission(arV1394.handle, vid->node) != DC1394_SUCCESS ) { fprintf( stderr, "unable to start camera iso transmission\n"); --- 620,629 ---- #endif &(vid->camera)) != DC1394_SUCCESS ) { ! ! fprintf (stderr, "Unable to setup initial camera DMA transfer, check that the video1394 module is loaded, and that the video mode, frame rate, and format are supported by your camera"); ! return (-1); } } ! if( dc1394_start_iso_transmission(arV1394.handle, vid->node) != DC1394_SUCCESS ) { fprintf( stderr, "unable to start camera iso transmission\n"); *************** *** 714,718 **** if (ar2Video_dragonfly < 0) { ! fprintf (stderr, "It is not possible to be in mono mode without the dragonfly flag being set previously\n"); exit (1); } --- 714,718 ---- if (ar2Video_dragonfly < 0) { ! fprintf (stderr, "It is not possible to be in mono mode without the dragonfly flag being set previously - internal error\n"); exit (1); } *************** *** 744,753 **** break; case 0x59595959: /* YYYY = BW */ ! fprintf (stderr, "Camera is black and white, Bayer conversion is not possible\n"); exit (1); default: if (prev_pattern == -1) { ! fprintf (stderr, "Camera BAYER_TILE_MAPPING register has an unexpected value 0x%x on initial startup, which should not occur\n", qValue); exit (1); } --- 744,753 ---- break; case 0x59595959: /* YYYY = BW */ ! fprintf (stderr, "Camera is black and white, Bayer conversion is not possible - internal error\n"); exit (1); default: if (prev_pattern == -1) { ! fprintf (stderr, "Camera BAYER_TILE_MAPPING register has an unexpected value 0x%x on initial startup, which should not occur - internal error\n", qValue); exit (1); } *************** *** 755,759 **** { /* This is a wierd bug where occasionally you get an invalid register value and I have no idea why this is */ ! fprintf (stderr, "WARNING! The BAYER_TILE_MAPPING register has an unexpected value 0x%x, but I was able to use the previous stored result\n", qValue); pattern = prev_pattern; } --- 755,759 ---- { /* This is a wierd bug where occasionally you get an invalid register value and I have no idea why this is */ ! fprintf (stderr, "WARNING! The BAYER_TILE_MAPPING register has an unexpected value 0x%x, but I was able to use the previous stored result - this might be a bug\n", qValue); pattern = prev_pattern; } *************** *** 910,914 **** { fprintf (stderr, "Card value is %d and node value is %d, you must either auto-detect both or specify both\n", *card, *node); ! exit (1); } --- 910,914 ---- { fprintf (stderr, "Card value is %d and node value is %d, you must either auto-detect both or specify both\n", *card, *node); ! return (-1); } *************** *** 924,928 **** { fprintf (stderr, "Could not acquire a raw1394 handle - driver not installed?\n"); ! exit (1); } numPorts = raw1394_get_port_info (raw_handle, ports, numPorts); --- 924,928 ---- { fprintf (stderr, "Could not acquire a raw1394 handle - driver not installed?\n"); ! return (-1); } numPorts = raw1394_get_port_info (raw_handle, ports, numPorts); *************** *** 976,980 **** { fprintf (stderr, "Could not auto detect any cameras on the %d firewire cards available\n", numPorts); ! exit (1); } printf ("Using the firewire camera on card %d and node %d\n", *card, *node); --- 976,980 ---- { fprintf (stderr, "Could not auto detect any cameras on the %d firewire cards available\n", numPorts); ! return (-1); } printf ("Using the firewire camera on card %d and node %d\n", *card, *node); *************** *** 987,991 **** { fprintf (stderr, "Could not acquire a raw1394 handle, did you insmod the drivers?\n"); ! exit(1); } --- 987,991 ---- { fprintf (stderr, "Could not acquire a raw1394 handle, did you insmod the drivers?\n"); ! return (-1); } |
|
From: Wayne P. <ti...@us...> - 2007-03-13 04:27:15
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20625/lib/SRC/VideoLinux1394Cam Modified Files: video.c Log Message: The code had a completely duplicated set of constants for video modes and frame rates, which is then mapped to the DC1394 versions. There is no need for this so I deleted all the local constants and now we use the values in the dc1394 library. It is much easier to understand the code now. This also involved me deleting the int_* elements from the big camera config struct because they are not needed any more. The second major change is that the default video mode was YUV411_HALF, and by default the simpleTest application does not work. So I'm not sure when this did work or if something else changed, but I have now modified it so that the default mode is 640x480 with RGB. You can always override this with a vconf string, but this will make all the normal applications work by default now like it should. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** video.c 23 Jan 2007 00:39:28 -0000 1.15 --- video.c 13 Mar 2007 04:26:43 -0000 1.16 *************** *** 75,78 **** --- 75,84 ---- * - Better config string support with ARTOOLKIT_CONFIG to override defaults from the shell * + * + * Revision: 1.4 Date: 2007/03/13 ( wa...@cs... ) + * - Removed local definition of video mode constants + * - Use RGB by default which works on all cameras instead of YUV411_HALF from before + * - Other clean ups in error checking and debugging errors + * */ *************** *** 124,143 **** /* Defines that control various aspects of this code */ #define VIDEO_NODE_ANY -1 - #define VIDEO_MODE_320x240_YUV422 32 - #define VIDEO_MODE_640x480_YUV411 33 - #define VIDEO_MODE_640x480_RGB 34 - #define VIDEO_MODE_640x480_YUV411_HALF 35 - #define VIDEO_MODE_640x480_MONO 36 - #define VIDEO_MODE_640x480_MONO_COLOR 37 - #define VIDEO_MODE_640x480_MONO_COLOR_HALF 38 - #define VIDEO_FRAME_RATE_1_875 1 - #define VIDEO_FRAME_RATE_3_75 2 - #define VIDEO_FRAME_RATE_7_5 3 - #define VIDEO_FRAME_RATE_15 4 - #define VIDEO_FRAME_RATE_30 5 - #define VIDEO_FRAME_RATE_60 6 #define DEFAULT_VIDEO_NODE VIDEO_NODE_ANY ! #define DEFAULT_VIDEO_MODE VIDEO_MODE_640x480_YUV411_HALF ! #define DEFAULT_VIDEO_FRAME_RATE VIDEO_FRAME_RATE_30 --- 130,136 ---- /* Defines that control various aspects of this code */ #define VIDEO_NODE_ANY -1 #define DEFAULT_VIDEO_NODE VIDEO_NODE_ANY ! #define DEFAULT_VIDEO_MODE MODE_640x480_RGB ! #define DEFAULT_VIDEO_FRAME_RATE FRAMERATE_15 *************** *** 335,345 **** if( strncmp( a, "-mode=", 6 ) == 0 ) { if ( strncmp( &a[6], "320x240_YUV422", 14 ) == 0 ) { ! vid->mode = VIDEO_MODE_320x240_YUV422; } else if ( strncmp( &a[6], "640x480_YUV411", 14 ) == 0 ) { ! vid->mode = VIDEO_MODE_640x480_YUV411; } else if ( strncmp( &a[6], "640x480_RGB", 11 ) == 0 ) { ! vid->mode = VIDEO_MODE_640x480_RGB; } else { --- 328,338 ---- if( strncmp( a, "-mode=", 6 ) == 0 ) { if ( strncmp( &a[6], "320x240_YUV422", 14 ) == 0 ) { ! vid->mode = MODE_320x240_YUV422; } else if ( strncmp( &a[6], "640x480_YUV411", 14 ) == 0 ) { ! vid->mode = MODE_640x480_YUV411; } else if ( strncmp( &a[6], "640x480_RGB", 11 ) == 0 ) { ! vid->mode = MODE_640x480_RGB; } else { *************** *** 385,404 **** else if( strncmp( a, "-rate=", 6 ) == 0 ) { if ( strncmp( &a[6], "1.875", 5 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_1_875; } else if ( strncmp( &a[6], "3.75", 4 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_3_75; } else if ( strncmp( &a[6], "7.5", 3 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_7_5; } else if ( strncmp( &a[6], "15", 2 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_15; } else if ( strncmp( &a[6], "30", 2 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_30; } else if ( strncmp( &a[6], "60", 2 ) == 0 ) { ! vid->rate = VIDEO_FRAME_RATE_60; } else { --- 378,397 ---- else if( strncmp( a, "-rate=", 6 ) == 0 ) { if ( strncmp( &a[6], "1.875", 5 ) == 0 ) { ! vid->rate = FRAMERATE_1_875; } else if ( strncmp( &a[6], "3.75", 4 ) == 0 ) { ! vid->rate = FRAMERATE_3_75; } else if ( strncmp( &a[6], "7.5", 3 ) == 0 ) { ! vid->rate = FRAMERATE_7_5; } else if ( strncmp( &a[6], "15", 2 ) == 0 ) { ! vid->rate = FRAMERATE_15; } else if ( strncmp( &a[6], "30", 2 ) == 0 ) { ! vid->rate = FRAMERATE_30; } else if ( strncmp( &a[6], "60", 2 ) == 0 ) { ! vid->rate = FRAMERATE_60; } else { *************** *** 429,433 **** if( ar2Video1394Init(vid->debug, &vid->card, &vid->node) < 0 ) { ! fprintf (stderr, "Could not initialise 1394\n"); exit(1); } --- 422,426 ---- if( ar2Video1394Init(vid->debug, &vid->card, &vid->node) < 0 ) { ! fprintf (stderr, "Could not initialise 1394 bus with card=%d and node=%d\n", vid->card, vid->node); exit(1); } *************** *** 435,483 **** } - switch( vid->mode ) - { - case VIDEO_MODE_320x240_YUV422: - vid->int_mode = MODE_320x240_YUV422; - break; - case VIDEO_MODE_640x480_YUV411: - vid->int_mode = MODE_640x480_YUV411; - break; - case VIDEO_MODE_640x480_RGB: - vid->int_mode = MODE_640x480_RGB; - break; - default: - printf("Sorry, Unsupported Video Format for IEEE1394 Camera.\n"); - exit(1); - break; - } - - - switch( vid->rate ) { - case VIDEO_FRAME_RATE_1_875: - vid->int_rate = FRAMERATE_1_875; - break; - case VIDEO_FRAME_RATE_3_75: - vid->int_rate = FRAMERATE_3_75; - break; - case VIDEO_FRAME_RATE_7_5: - vid->int_rate = FRAMERATE_7_5; - break; - case VIDEO_FRAME_RATE_15: - vid->int_rate = FRAMERATE_15; - break; - case VIDEO_FRAME_RATE_30: - vid->int_rate = FRAMERATE_30; - break; - case VIDEO_FRAME_RATE_60: - vid->int_rate = FRAMERATE_60; - break; - default: - fprintf(stderr, "Sorry, Unsupported Frame Rate for IEEE1394 Camera.\n"); - exit(1); - } - - - - /*-----------------------------------------------------------------------*/ --- 428,431 ---- *************** *** 487,491 **** vid->node, &(vid->features)) != DC1394_SUCCESS ) { ! fprintf( stderr, "unable to get feature set\n"); } else if( vid->debug ) { --- 435,439 ---- vid->node, &(vid->features)) != DC1394_SUCCESS ) { ! fprintf( stderr, "Unable to get feature set from device\n"); } else if( vid->debug ) { *************** *** 528,532 **** /* Check that the camera supports the particular video mode we asked for */ dc1394_query_supported_modes(arV1394.handle, vid->node, FORMAT_VGA_NONCOMPRESSED, &value); ! i = 31 - (vid->int_mode - MODE_FORMAT0_MIN); p1 = 1 << i; p2 = value & p1; --- 476,480 ---- /* Check that the camera supports the particular video mode we asked for */ dc1394_query_supported_modes(arV1394.handle, vid->node, FORMAT_VGA_NONCOMPRESSED, &value); ! i = 31 - (vid->mode - MODE_FORMAT0_MIN); p1 = 1 << i; p2 = value & p1; *************** *** 546,556 **** { fprintf (stderr, "Detected a mono camera, assuming DragonFly camera with Bayer image decoding\n"); ! vid->int_mode = MODE_640x480_MONO; ar2Video_dragonfly = 1; } } ! dc1394_query_supported_framerates(arV1394.handle, vid->node, FORMAT_VGA_NONCOMPRESSED, vid->int_mode, &value); ! i = 31 - (vid->int_rate - FRAMERATE_MIN); p1 = 1 << i; p2 = value & p1; --- 494,504 ---- { fprintf (stderr, "Detected a mono camera, assuming DragonFly camera with Bayer image decoding\n"); ! vid->mode = MODE_640x480_MONO; ar2Video_dragonfly = 1; } } ! dc1394_query_supported_framerates(arV1394.handle, vid->node, FORMAT_VGA_NONCOMPRESSED, vid->mode, &value); ! i = 31 - (vid->rate - FRAMERATE_MIN); p1 = 1 << i; p2 = value & p1; *************** *** 582,588 **** #endif vid->format, ! vid->int_mode, vid->speed, ! vid->int_rate, vid->dma_buf_num, #ifdef LIBDC_10 --- 530,536 ---- #endif vid->format, ! vid->mode, vid->speed, ! vid->rate, vid->dma_buf_num, #ifdef LIBDC_10 *************** *** 657,663 **** #endif vid->format, ! vid->int_mode, vid->speed, ! vid->int_rate, vid->dma_buf_num, #ifdef LIBDC_10 --- 605,611 ---- #endif vid->format, ! vid->mode, vid->speed, ! vid->rate, vid->dma_buf_num, #ifdef LIBDC_10 *************** *** 756,760 **** ! switch( vid->int_mode ) { case MODE_640x480_RGB: return (ARUint8 *)vid->camera.capture_buffer; --- 704,708 ---- ! switch( vid->mode ) { case MODE_640x480_RGB: return (ARUint8 *)vid->camera.capture_buffer; |
|
From: Wayne P. <ti...@us...> - 2007-03-13 04:27:14
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20625/include/AR/sys Modified Files: videoLinux1394Cam.h Log Message: The code had a completely duplicated set of constants for video modes and frame rates, which is then mapped to the DC1394 versions. There is no need for this so I deleted all the local constants and now we use the values in the dc1394 library. It is much easier to understand the code now. This also involved me deleting the int_* elements from the big camera config struct because they are not needed any more. The second major change is that the default video mode was YUV411_HALF, and by default the simpleTest application does not work. So I'm not sure when this did work or if something else changed, but I have now modified it so that the default mode is 640x480 with RGB. You can always override this with a vconf string, but this will make all the normal applications work by default now like it should. Index: videoLinux1394Cam.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoLinux1394Cam.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** videoLinux1394Cam.h 20 Aug 2006 21:48:47 -0000 1.3 --- videoLinux1394Cam.h 13 Mar 2007 04:26:43 -0000 1.4 *************** *** 35,40 **** int format; int dma_buf_num; - int int_mode; - int int_rate; int status; --- 35,38 ---- |
|
From: Hartmut S. <ret...@us...> - 2007-02-22 21:53:15
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12725/util/calib_camera2 Modified Files: main.c Log Message: Fixed bug in GStreamer video capture. Using GST_STATE_PAUSED instead of GST_STATE_NULL for stopping the stream. Removed hard coded video configuration for GStreamer in calib_camera2 - instead using ARTOOLKIT_CONFIG environment variable. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.c 3 Oct 2006 21:35:27 -0000 1.14 --- main.c 22 Feb 2007 21:53:13 -0000 1.15 *************** *** 62,66 **** #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; # elif defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; --- 62,66 ---- #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! char *vconf = ""; # elif defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; |
|
From: Hartmut S. <ret...@us...> - 2007-02-22 21:53:15
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12725/lib/SRC/VideoGStreamer Modified Files: video.c Log Message: Fixed bug in GStreamer video capture. Using GST_STATE_PAUSED instead of GST_STATE_NULL for stopping the stream. Removed hard coded video configuration for GStreamer in calib_camera2 - instead using ARTOOLKIT_CONFIG environment variable. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer/video.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** video.c 21 Feb 2007 03:20:07 -0000 1.9 --- video.c 22 Feb 2007 21:53:12 -0000 1.10 *************** *** 371,375 **** ar2VideoCapStop(AR2VideoParamT *vid) { /* stop pipeline */ ! return gst_element_set_state (vid->pipeline, GST_STATE_NULL); } --- 371,375 ---- ar2VideoCapStop(AR2VideoParamT *vid) { /* stop pipeline */ ! return gst_element_set_state (vid->pipeline, GST_STATE_PAUSED); } |
|
From: Hartmut S. <ret...@us...> - 2007-02-21 03:20:13
|
Update of /cvsroot/artoolkit/artoolkit/doc/video In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24680/doc/video Modified Files: index.html Log Message: Minor enhancement to allow RTSP streaming sources to be used through GStreamer. Added a piece of documentation for the correct configuration string. Index: index.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video/index.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.html 23 Jan 2007 00:27:26 -0000 1.5 --- index.html 21 Feb 2007 03:20:05 -0000 1.6 *************** *** 1 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>ARToolKit Video Library Configuration documentation</title> </head> <body> <h1>ARToolKit video configuration </h1> <p>When using ARToolKit to open a video stream, one of the following functions / code snippets is called:</p> <blockquote> <p><code>arVideoOpen(char *vconf);</code></p> </blockquote> <p>or</p> <blockquote> <p><code>AR2VideoParamT vid;<br> vid = ar2VideoOpen(char *vconf);</code></p> </blockquote> <p>These functions take a single parameter, vconf, which is a character string.</p> <p>This character string encapsulates operating-system dependent directions as to how to find, open and configure the video stream. In order to assist you in determining a set of parameters, the functions <code>arVideoDispOption();</code> or <code>ar2VideoDispOption();</code> are designed to output some help text. The text is reproduced here for your convenience.</p> <p>Select an operating system / driver for which you wish to view the help text</p> <ul> <li><a href="#VideoLinux1394Cam">VideoLinux1394Cam</a></li> <li><a href="#VideoGStreamer">VideoGStreamer</a></li> <li><a href="#VideoLinuxDVCam">VideoLinuxDVCam</a></li> <li><a href="#VideoLinuxV4L">VideoLinuxV4L</a></li> <li><a href="#VideoMacOSX">VideoMacOSX</a></li> <li><a href="#VideoSGI">VideoSGI</a></li> <li><a href="#VideoWin32DirectShow">VideoWin32DirectShow</a> <ul> <li><a href="#VideoWin32DirectShow271">ARToolKit versions 2.71 and later</a></li> <li><a href="#VideoWin32DirectShow265">ARToolKit versions 2.65 to 2.70.1</a></li> </ul> </li> </ul> <p> </p> <a class="anchor" name="VideoLinux1394Cam"> <h2>VideoLinux1394Cam</h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -node=N specifies detected node ID of a FireWire camera (-1: Any). -card=N specifies the FireWire adaptor id number (-1: Any). -mode=[320x240_YUV422|640x480_RGB|640x480_YUV411] specifies input image format. -rate=N specifies desired framerate of a FireWire camera. (1.875, 3.75, 7.5, 15, 30, 60) -[name]=N where name is brightness, iris, shutter, gain, saturation, gamma, sharpness (value must be a legal value for this parameter - use coriander to find what they are </pre> <a class="anchor" name="VideoGStreamer"> <h2>VideoGStreamer</h2> <p> ARVideo via <a href="http://www.gstreamer.org">GStreamer</a> may be configured using a configuration string following the <code>gst-launch</code> syntax. Some examples (using the ARTOOLKIT_CONFIG environment variable, bash syntax): </p> <ul> <li>Loading a file from disk: <pre> $> export ARTOOLKIT_CONFIG="filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink" </pre> <li>Using a webcam on /dev/video0 through Video4Linux v2 (V4L2): <pre>$> export ARTOOLKIT_CONFIG="v4l2src device=/dev/video1 use-fixed-fps=false ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink" </pre> </li> The same strings can also directly been used within the code: <pre>arVideoOpen("videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink");</pre> </ul> <a class="anchor" name="VideoLinuxDV"> <h2>VideoLinuxDV </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -mode=[PAL|NTSC] specifies TV signal mode. </pre> <a class="anchor" name="VideoLinuxV4L"> <h2>VideoLinuxV4L </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: DEVICE CONTROLS: -dev=filepath specifies device file. -channel=N specifies source channel. -noadjust prevent adjusting the width/height/channel if not suitable. -width=N specifies expected width of image. -height=N specifies expected height of image. -palette=[RGB|YUV420P] specifies the camera palette (WARNING:all are not supported on each camera !!). IMAGE CONTROLS (WARNING: every options are not supported by all camera !!): -brightness=N specifies brightness. (0.0 <-> 1.0) -contrast=N specifies contrast. (0.0 <-> 1.0) -saturation=N specifies saturation (color). (0.0 <-> 1.0) (for color camera only) -hue=N specifies hue. (0.0 <-> 1.0) (for color camera only) -whiteness=N specifies whiteness. (0.0 <-> 1.0) (REMARK: gamma for some drivers, otherwise for greyscale camera only) -color=N specifies saturation (color). (0.0 <-> 1.0) (REMARK: obsolete !! use saturation control) OPTION CONTROLS: -mode=[PAL|NTSC|SECAM] specifies TV signal mode (for tv/capture card). </pre> <a class="anchor" name="VideoMacOSX"> <h2>VideoMacOSX </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: printf(" -pixelformat=cccc\n"); printf(" Return images with pixels in format cccc, where cccc is either a\n"); printf(" numeric pixel format number or a valid 4-character-code for a\n"); printf(" pixel format.\n"); printf(" The following numeric values are supported: \n"); printf(" 24 (24-bit RGB), 32 (32-bit ARGB), 40 (8-bit grey)"); printf(" The following 4-character-codes are supported: \n"); printf(" BGRA, RGBA, ABGR, 24BG, 2vuy, yuvs.\n"); printf(" (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.)\n"); printf(" -fliph\n"); printf(" Flip camera image horizontally.\n"); printf(" -flipv\n"); printf(" Flip camera image vertically.\n"); printf(" -singlebuffer\n"); printf(" Use single buffering of captured video instead of triple-buffering.\n"); -nodialog Don't display video settings dialog. -width=w Scale camera native image to width w. -height=h Scale camera native image to height h. -fps Overlay camera frame counter on image. -grabber=n With multiple QuickTime video grabber components installed, use component n (default n=1). N.B. It is NOT necessary to use this option if you have installed more than one video input device (e.g. two cameras) as the default QuickTime grabber can manage multiple video channels. -pixelformat=cccc The following numeric values are supported: 24 (24-bit RGB), 32 (32-bit ARGB), 40 (8-bit grey) The following 4-character-codes are supported: BGRA, RGBA, ABGR, 24BG, 2vuy, yuvs. (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.) -fliph Flip camera image horizontally. (Added in ARToolKit v2.72.) -flipv Flip camera image vertically. (Added in ARToolKit v2.72.) -singlebuffer Use single buffering of captured video instead of triple-buffering. (Added in ARToolKit v2.73.) </pre> <a class="anchor" name="VideoSGI"> <h2>VideoSGI </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -size=[FULL/HALF] specifies size of image. -device=N specifies device number. -bufsize=N specifies video buffer size. </pre> <a class="anchor" name="VideoWin32DirectShow"> <h2>VideoWin32DirectShow</h2> <a class="anchor" name="VideoWin32DirectShow271"> <h3>ARToolKit versions 2.71 and later </h3> <p>In ARToolKit 2.71 and later, the video configuration is specified in an XML file, conforming to the DSVideoLib XML Schema. This schema is documented in the file "DsVideoLib.xsd" inside the DSVL-0.0.8b package. You can use an <a href="http://www.w3.org/XML/Schema">XML Schema viewer</a> to view the schema file, and a text editor or XML editor to edit your own configuration file.</p> <p>The pathname of the configuration file is then specified in the video configuration string. </p> <blockquote><pre> parameter is a file name (e.g. 'config.XML') conforming to the DSVideoLib XML Schema (DsVideoLib.xsd). </pre></blockquote> <a class="anchor" name="VideoWin32DirectShow265"> <h3>ARToolKit versions 2.65 to 2.70.1</h3> <blockquote> <pre> parameter format is either NULL or a list of tokens, separated by commas "," BINARY TOKENS: -------------- flipH : flip image horizontally (WARNING: non-optimal performance) flipV : flip image vertically (WARNING: non-optimal performance) showDlg : displays either WDM capture filter's property page or MSDV decoder format dialog (depending on source media type). only applies to WDM_CAP, will be ignored for AVI_FILE loopAVI : continuously loops through an AVI file (applies only to AVI_FILE) noClock : does not use a Reference Clock to synchronize samples; use this flag for offline post-processing (applies only to AVI_FILE) renderSec : render secondary streams (applies only to AVI_FILE) An AVI file can contain an arbitrary number of multiplexed A/V substreams, usually there are at most 2 substreams (1st: video, 2nd: audio). the AVI_FILE input module will only try to render stream 0x00 (assuming that it's video) and ignore the remaning substreams. Use this flag to force IGraphBuilder->Render(IPin*) calls on substreams 1..n DO NOT SET this flag if your AVI file contains more than one video stream PARAMETRIZED TOKENS: -------------------- inputDevice=? : supported parameters: "WDM_CAP" (WDM_VIDEO_CAPTURE_FILTER) use the DirectShow WDM wrapper to obtain live video input from a streaming capture device such as a IEEE 1394 DV camera or USB webcam. OPTIONAL: set deviceName=? and/or ieee1394id=? for better control over the choice of suitable WDM drivers "AVI_FILE" (ASYNC_FILE_INPUT_FILTER) use an Asynchronous File Input Filter to read & decode AVI video data NOTE: be sure to specify the input file name by pointing fileName=? to a valid AVI file. EXAMPLE: "inputDevive=WDM_CAP", or "inputDevice=AVI_FILE" DEFAULT: "WDM_CAP" will be selected if you omit this token videoWidth=? : preferred video width, EXAMPLE: "videoWidth=720" only applies to WDM_CAP, will be ignored for AVI_FILE videoHeight=? : preferred video height, EXAMPLE: "videoHeight=576" only applies to WDM_CAP, will be ignored for AVI_FILE pixelFormat=? : internal pixel format (see PixelFormat.h for supported types) PERFORMANCE WARNING: Be sure to match your IDirect3DTexture/OpenGL texture formats to whatever you specify here, i.e. use PXtoOpenGL(format), PXtoD3D(format) for creating your textures! (see PixelFormat.h for details) EXAMPLE: "pixelFormat=PIXELFORMAT_RGB32" NOTE: if you omit the pixelFormat=? token, the global constant (default_PIXELFORMAT, usually PIXELFORMAT_RGB32) will be selected. friendlyName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL BE IGNORED IF deviceName=? IS SET."); (WARNING: WDM "friendly names" are locale-dependent), i.e. try to match substring <?> with the "friendly names" of enumerated DirectShow WDM wrappers (ksproxy.ax). EXAMPLE: "friendlyName=Microsoft DV Camera" for IEEE1394 DV devices "friendlyName=QuickCam" for Logitech QuickCam deviceName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL ALWAYS WILL OVERRIDE friendlyName=? i.e. try to match substring <?> with the "device names" of enumerated DirectShow WDM wrappers (ksproxy.ax). Device names look like: "@device:*:{860BB310-5D01-11d0-BD3B-00A0C911CE86} Use GraphEdit (part of the DirectX SDK, under \DXSDK\bin\DxUtils\graphedt.exe) to figure out your camera's device name. EXAMPLE: "deviceName=1394#unibrain&fire-i_1.2#4510000061431408 fileName=? : only applies to AVI_FILE, will be IGNORED if "inputDevice=AVI_FILE" is not set. input file name, if just use a file's name (without its full path), the WIN32 API fuction SearchPath() (Winbase.h) will be used to locate the file. EXAMPLE: "fileName=C:\Some Directory\Another Directory\Video.AVI" "fileName=video.AVI" (will succeed if C:\Some Directory\Another Directory\ is: * the application's startup directory * the current directory * listed in the PATH environment variable) ieee1394id=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Unique 64-bit device identifier, as defined by IEEE 1394. Hexadecimal value expected, i.e. "ieee1394id=437d3b0201460008" Use /bin/IEEE394_id.exe to determine your camera's ID. deinterlaceState=? : supported parameters (see VFX_STATE_names[]) "off" : disable deinterlacing (DEFAULT) "on" : force deinterlacing (even for progressive frames) "auto" : enable deinterlacing only if (VIDEOINFOHEADER.dwInterlaceFlags & AMINTERLACE_IsInterlaced) WARNING: EXPERIMENTAL FEATURE! deinterlaceMethod=? : deinterlacing method (see VFxDeinterlaceParam.h for supported modes) supported parameters (see DEINTERLACE_METHOD_names[]): "blend" : blend fields (best quality) "duplicate1" : duplicate first field "duplicate2" : duplicate second field NOTE: omitting this token results in default mode (DEINTERLACE_BLEND) being used. WARNING: EXPERIMENTAL FEATURE! EXAMPLES: arVideoOpen(NULL); arVideoOpen("inputDevice=WDM_CAP,showDlg"); arVideoOpen("inputDevice=WDM_CAP,flipH,flipV,showDlg"); arVideoOpen("inputDevice=WDM_CAP,pixelFormat=PIXELFORMAT_RGB24,showDlg"); arVideoOpen("inputDevice=WDM_CAP,showDlg,deinterlaceState=on,deinterlaceMethod=duplicate1"); arVideoOpen("inputDevice=WDM_CAP,videoWidth=640,flipH,videoHeight=480,showDlg,deinterlaceState=auto"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,videoWidth=720,videoHeight=480"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Logitech,videoWidth=320,videoHeight=240,flipV"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,ieee1394id=437d3b0201460008"); arVideoOpen("inputDevice=AVI_FILE,fileName=C:\Some Directory\Another Directory\Video.AVI"); arVideoOpen("inputDevice=AVI_FILE,fileName=Video.AVI,pixelFormat=PIXELFORMAT_RGB24"); </pre> </blockquote> </body> </html> \ No newline at end of file --- 1,8 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>ARToolKit Video Library Configuration documentation</title> </head> <body> <h1>ARToolKit video configuration </h1> <p>When using ARToolKit to open a video stream, one of the following functions / code snippets is called:</p> <blockquote> <p><code>arVideoOpen(char *vconf);</code></p> </blockquote> <p>or</p> <blockquote> <p><code>AR2VideoParamT vid;<br> vid = ar2VideoOpen(char *vconf);</code></p> </blockquote> <p>These functions take a single parameter, vconf, which is a character string.</p> <p>This character string encapsulates operating-system dependent directions as to how to find, open and configure the video stream. In order to assist you in determining a set of parameters, the functions <code>arVideoDispOption();</code> or <code>ar2VideoDispOption();</code> are designed to output some help text. The text is reproduced here for your convenience.</p> <p>Select an operating system / driver for which you wish to view the help text</p> <ul> <li><a href="#VideoLinux1394Cam">VideoLinux1394Cam</a></li> <li><a href="#VideoGStreamer">VideoGStreamer</a></li> <li><a href="#VideoLinuxDVCam">VideoLinuxDVCam</a></li> <li><a href="#VideoLinuxV4L">VideoLinuxV4L</a></li> <li><a href="#VideoMacOSX">VideoMacOSX</a></li> <li><a href="#VideoSGI">VideoSGI</a></li> <li><a href="#VideoWin32DirectShow">VideoWin32DirectShow</a> <ul> <li><a href="#VideoWin32DirectShow271">ARToolKit versions 2.71 and later</a></li> <li><a href="#VideoWin32DirectShow265">ARToolKit versions 2.65 to 2.70.1</a></li> </ul> </li> </ul> <p> </p> <a class="anchor" name="VideoLinux1394Cam"> <h2>VideoLinux1394Cam</h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -node=N specifies detected node ID of a FireWire camera (-1: Any). -card=N specifies the FireWire adaptor id number (-1: Any). -mode=[320x240_YUV422|640x480_RGB|640x480_YUV411] specifies input image format. -rate=N specifies desired framerate of a FireWire camera. (1.875, 3.75, 7.5, 15, 30, 60) -[name]=N where name is brightness, iris, shutter, gain, saturation, gamma, sharpness (value must be a legal value for this parameter - use coriander to find what they are </pre> <a class="anchor" name="VideoGStreamer"> <h2>VideoGStreamer</h2> <p> ARVideo via <a href="http://www.gstreamer.org">GStreamer</a> may be configured using a configuration string following the <code>gst-launch</code> syntax. Some examples (using the ARTOOLKIT_CONFIG environment variable, bash syntax): </p> <ul> <li>Loading a file from disk: <pre> $> export ARTOOLKIT_CONFIG="filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink" </pre> <li>Using a webcam on /dev/video0 through Video4Linux v2 (V4L2): <pre>$> export ARTOOLKIT_CONFIG="v4l2src device=/dev/video0 use-fixed-fps=false ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink" </pre> </li> ! ! <li>The same strings can also directly been used within the code: <pre>arVideoOpen("videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink");</pre> ! </li> ! ! ! <li>Using a RTSP streaming source as a video input: ! <pre>$> export ARTOOLKIT_CONFIG="rtspsrc location=rtsp://somertspstreamingserver:554/live.sdp ! rtpmp4vdepay ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink sync=0"</pre> </li> </ul> <a class="anchor" name="VideoLinuxDV"> <h2>VideoLinuxDV </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -mode=[PAL|NTSC] specifies TV signal mode. </pre> <a class="anchor" name="VideoLinuxV4L"> <h2>VideoLinuxV4L </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: DEVICE CONTROLS: -dev=filepath specifies device file. -channel=N specifies source channel. -noadjust prevent adjusting the width/height/channel if not suitable. -width=N specifies expected width of image. -height=N specifies expected height of image. -palette=[RGB|YUV420P] specifies the camera palette (WARNING:all are not supported on each camera !!). IMAGE CONTROLS (WARNING: every options are not supported by all camera !!): -brightness=N specifies brightness. (0.0 <-> 1.0) -contrast=N specifies contrast. (0.0 <-> 1.0) -saturation=N specifies saturation (color). (0.0 <-> 1.0) (for color camera only) -hue=N specifies hue. (0.0 <-> 1.0) (for color camera only) -whiteness=N specifies whiteness. (0.0 <-> 1.0) (REMARK: gamma for some drivers, otherwise for greyscale camera only) -color=N specifies saturation (color). (0.0 <-> 1.0) (REMARK: obsolete !! use saturation control) OPTION CONTROLS: -mode=[PAL|NTSC|SECAM] specifies TV signal mode (for tv/capture card). </pre> <a class="anchor" name="VideoMacOSX"> <h2>VideoMacOSX </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: printf(" -pixelformat=cccc\n"); printf(" Return images with pixels in format cccc, where cccc is either a\n"); printf(" numeric pixel format number or a valid 4-character-code for a\n"); printf(" pixel format.\n"); printf(" The following numeric values are supported: \n"); printf(" 24 (24-bit RGB), 32 (32-bit ARGB), 40 (8-bit grey)"); printf(" The following 4-character-codes are supported: \n"); printf(" BGRA, RGBA, ABGR, 24BG, 2vuy, yuvs.\n"); printf(" (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.)\n"); printf(" -fliph\n"); printf(" Flip camera image horizontally.\n"); printf(" -flipv\n"); printf(" Flip camera image vertically.\n"); printf(" -singlebuffer\n"); printf(" Use single buffering of captured video instead of triple-buffering.\n"); -nodialog Don't display video settings dialog. -width=w Scale camera native image to width w. -height=h Scale camera native image to height h. -fps Overlay camera frame counter on image. -grabber=n With multiple QuickTime video grabber components installed, use component n (default n=1). N.B. It is NOT necessary to use this option if you have installed more than one video input device (e.g. two cameras) as the default QuickTime grabber can manage multiple video channels. -pixelformat=cccc The following numeric values are supported: 24 (24-bit RGB), 32 (32-bit ARGB), 40 (8-bit grey) The following 4-character-codes are supported: BGRA, RGBA, ABGR, 24BG, 2vuy, yuvs. (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.) -fliph Flip camera image horizontally. (Added in ARToolKit v2.72.) -flipv Flip camera image vertically. (Added in ARToolKit v2.72.) -singlebuffer Use single buffering of captured video instead of triple-buffering. (Added in ARToolKit v2.73.) </pre> <a class="anchor" name="VideoSGI"> <h2>VideoSGI </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -size=[FULL/HALF] specifies size of image. -device=N specifies device number. -bufsize=N specifies video buffer size. </pre> <a class="anchor" name="VideoWin32DirectShow"> <h2>VideoWin32DirectShow</h2> <a class="anchor" name="VideoWin32DirectShow271"> <h3>ARToolKit versions 2.71 and later </h3> <p>In ARToolKit 2.71 and later, the video configuration is specified in an XML file, conforming to the DSVideoLib XML Schema. This schema is documented in the file "DsVideoLib.xsd" inside the DSVL-0.0.8b package. You can use an <a href="http://www.w3.org/XML/Schema">XML Schema viewer</a> to view the schema file, and a text editor or XML editor to edit your own configuration file.</p> <p>The pathname of the configuration file is then specified in the video configuration string. </p> <blockquote><pre> parameter is a file name (e.g. 'config.XML') conforming to the DSVideoLib XML Schema (DsVideoLib.xsd). </pre></blockquote> <a class="anchor" name="VideoWin32DirectShow265"> <h3>ARToolKit versions 2.65 to 2.70.1</h3> <blockquote> <pre> parameter format is either NULL or a list of tokens, separated by commas "," BINARY TOKENS: -------------- flipH : flip image horizontally (WARNING: non-optimal performance) flipV : flip image vertically (WARNING: non-optimal performance) showDlg : displays either WDM capture filter's property page or MSDV decoder format dialog (depending on source media type). only applies to WDM_CAP, will be ignored for AVI_FILE loopAVI : continuously loops through an AVI file (applies only to AVI_FILE) noClock : does not use a Reference Clock to synchronize samples; use this flag for offline post-processing (applies only to AVI_FILE) renderSec : render secondary streams (applies only to AVI_FILE) An AVI file can contain an arbitrary number of multiplexed A/V substreams, usually there are at most 2 substreams (1st: video, 2nd: audio). the AVI_FILE input module will only try to render stream 0x00 (assuming that it's video) and ignore the remaning substreams. Use this flag to force IGraphBuilder->Render(IPin*) calls on substreams 1..n DO NOT SET this flag if your AVI file contains more than one video stream PARAMETRIZED TOKENS: -------------------- inputDevice=? : supported parameters: "WDM_CAP" (WDM_VIDEO_CAPTURE_FILTER) use the DirectShow WDM wrapper to obtain live video input from a streaming capture device such as a IEEE 1394 DV camera or USB webcam. OPTIONAL: set deviceName=? and/or ieee1394id=? for better control over the choice of suitable WDM drivers "AVI_FILE" (ASYNC_FILE_INPUT_FILTER) use an Asynchronous File Input Filter to read & decode AVI video data NOTE: be sure to specify the input file name by pointing fileName=? to a valid AVI file. EXAMPLE: "inputDevive=WDM_CAP", or "inputDevice=AVI_FILE" DEFAULT: "WDM_CAP" will be selected if you omit this token videoWidth=? : preferred video width, EXAMPLE: "videoWidth=720" only applies to WDM_CAP, will be ignored for AVI_FILE videoHeight=? : preferred video height, EXAMPLE: "videoHeight=576" only applies to WDM_CAP, will be ignored for AVI_FILE pixelFormat=? : internal pixel format (see PixelFormat.h for supported types) PERFORMANCE WARNING: Be sure to match your IDirect3DTexture/OpenGL texture formats to whatever you specify here, i.e. use PXtoOpenGL(format), PXtoD3D(format) for creating your textures! (see PixelFormat.h for details) EXAMPLE: "pixelFormat=PIXELFORMAT_RGB32" NOTE: if you omit the pixelFormat=? token, the global constant (default_PIXELFORMAT, usually PIXELFORMAT_RGB32) will be selected. friendlyName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL BE IGNORED IF deviceName=? IS SET."); (WARNING: WDM "friendly names" are locale-dependent), i.e. try to match substring <?> with the "friendly names" of enumerated DirectShow WDM wrappers (ksproxy.ax). EXAMPLE: "friendlyName=Microsoft DV Camera" for IEEE1394 DV devices "friendlyName=QuickCam" for Logitech QuickCam deviceName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL ALWAYS WILL OVERRIDE friendlyName=? i.e. try to match substring <?> with the "device names" of enumerated DirectShow WDM wrappers (ksproxy.ax). Device names look like: "@device:*:{860BB310-5D01-11d0-BD3B-00A0C911CE86} Use GraphEdit (part of the DirectX SDK, under \DXSDK\bin\DxUtils\graphedt.exe) to figure out your camera's device name. EXAMPLE: "deviceName=1394#unibrain&fire-i_1.2#4510000061431408 fileName=? : only applies to AVI_FILE, will be IGNORED if "inputDevice=AVI_FILE" is not set. input file name, if just use a file's name (without its full path), the WIN32 API fuction SearchPath() (Winbase.h) will be used to locate the file. EXAMPLE: "fileName=C:\Some Directory\Another Directory\Video.AVI" "fileName=video.AVI" (will succeed if C:\Some Directory\Another Directory\ is: * the application's startup directory * the current directory * listed in the PATH environment variable) ieee1394id=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Unique 64-bit device identifier, as defined by IEEE 1394. Hexadecimal value expected, i.e. "ieee1394id=437d3b0201460008" Use /bin/IEEE394_id.exe to determine your camera's ID. deinterlaceState=? : supported parameters (see VFX_STATE_names[]) "off" : disable deinterlacing (DEFAULT) "on" : force deinterlacing (even for progressive frames) "auto" : enable deinterlacing only if (VIDEOINFOHEADER.dwInterlaceFlags & AMINTERLACE_IsInterlaced) WARNING: EXPERIMENTAL FEATURE! deinterlaceMethod=? : deinterlacing method (see VFxDeinterlaceParam.h for supported modes) supported parameters (see DEINTERLACE_METHOD_names[]): "blend" : blend fields (best quality) "duplicate1" : duplicate first field "duplicate2" : duplicate second field NOTE: omitting this token results in default mode (DEINTERLACE_BLEND) being used. WARNING: EXPERIMENTAL FEATURE! EXAMPLES: arVideoOpen(NULL); arVideoOpen("inputDevice=WDM_CAP,showDlg"); arVideoOpen("inputDevice=WDM_CAP,flipH,flipV,showDlg"); arVideoOpen("inputDevice=WDM_CAP,pixelFormat=PIXELFORMAT_RGB24,showDlg"); arVideoOpen("inputDevice=WDM_CAP,showDlg,deinterlaceState=on,deinterlaceMethod=duplicate1"); arVideoOpen("inputDevice=WDM_CAP,videoWidth=640,flipH,videoHeight=480,showDlg,deinterlaceState=auto"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,videoWidth=720,videoHeight=480"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Logitech,videoWidth=320,videoHeight=240,flipV"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,ieee1394id=437d3b0201460008"); arVideoOpen("inputDevice=AVI_FILE,fileName=C:\Some Directory\Another Directory\Video.AVI"); arVideoOpen("inputDevice=AVI_FILE,fileName=Video.AVI,pixelFormat=PIXELFORMAT_RGB24"); </pre> </blockquote> </body> </html> |
|
From: Hartmut S. <ret...@us...> - 2007-02-21 03:20:11
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24680/lib/SRC/VideoGStreamer Modified Files: video.c Log Message: Minor enhancement to allow RTSP streaming sources to be used through GStreamer. Added a piece of documentation for the correct configuration string. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer/video.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** video.c 23 Jan 2007 00:39:27 -0000 1.8 --- video.c 21 Feb 2007 03:20:07 -0000 1.9 *************** *** 256,259 **** --- 256,260 ---- gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid); + *************** *** 289,293 **** /* now preroll for V4L v2 interfaces */ if ((strstr(config, "v4l2src") != 0) || ! (strstr(config, "dv1394src") != 0)) { /* set playing state of the pipeline */ --- 290,295 ---- /* now preroll for V4L v2 interfaces */ if ((strstr(config, "v4l2src") != 0) || ! (strstr(config, "dv1394src") != 0) || ! (strstr(config, "rtspsrc") != 0) ) { /* set playing state of the pipeline */ |
|
From: Philip L. <phi...@us...> - 2007-02-06 22:29:14
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12894 Modified Files: ChangeLog.txt README.txt Log Message: Update for 2.72.1 release. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ChangeLog.txt 19 Nov 2006 19:39:21 -0000 1.14 --- ChangeLog.txt 6 Feb 2007 22:29:09 -0000 1.15 *************** *** 3,9 **** ! Changes in version 2.72 (this release) (2006-11-20). ------------------------------------------------------ All platforms: - New feature: ARToolKit now supports querying of SDK and runtime versions. - New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. --- 3,28 ---- ! Changes in version 2.72.1 (this release) (2007-02-07). ------------------------------------------------------ All platforms: + - Bug fix: Removed VRML backgrounds which were still showing when using new OpenVRML-0.16.3. + - Bug fix: The bud_B VRML model does not render correctly with OpenVRML-0.16.3 and has been temporarily removed. + - Enhancement: Debug mode ('d' key) and threshhold adjustment ('+' and '-' keys) are now enabled in all gsub_lite-based examples. + + Windows: + - Bug fix: Fix for issue which made video stream appear white in examples based on the old gsub library. + - Enhancement: added reading of environment variable ARTOOLKIT_CONFIG for DSVL video capture. + + Linux: + - Bug fix: VideoLinuxV4L should now compile correctly on 64-bit x86 systems. + + Mac OS X: + - Bug fix: A long-standing performance problem in the Mac video library has been addressed, allowing correct and optimal buffering of the video stream. + - Enhancement: ARvrml now links to fink-supplied OpenVRML-0.16.3 by default. + + + Changes in version 2.72 (2006-11-20). + ------------------------------------- + All platforms: - New feature: ARToolKit now supports querying of SDK and runtime versions. - New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** README.txt 19 Nov 2006 21:21:21 -0000 1.27 --- README.txt 6 Feb 2007 22:29:09 -0000 1.28 *************** *** 1,4 **** ! Read me for ARToolKit-2.72. ! =========================== --- 1,4 ---- ! Read me for ARToolKit-2.72.1. ! ============================= *************** *** 17,23 **** About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.72. ! ARToolKit version 2.72 is released under the GNU General Public License (GPL). Please read the file COPYING.txt. The latest version of ARToolKit is available from http://sf.net/projects/artoolkit. --- 17,23 ---- About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.72.1. ! ARToolKit version 2.72.1 is released under the GNU General Public License (GPL). Please read the file COPYING.txt. The latest version of ARToolKit is available from http://sf.net/projects/artoolkit. *************** *** 29,33 **** HIT Lab NZ http://www.hitlabnz.org ! 2006-11-20 --- 29,33 ---- HIT Lab NZ http://www.hitlabnz.org ! 2007-02-07 *************** *** 83,87 **** Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.72.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} --- 83,87 ---- Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.72.1.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} *************** *** 122,126 **** Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.72.tgz Configure and build cd ~/ARToolKit --- 122,126 ---- Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.72.1.tgz Configure and build cd ~/ARToolKit *************** *** 132,140 **** The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! Either: ! tar xzvf OpenVRML-0.16.16-bin-MacOSX.tar.gz ~/Desktop/ARToolKit ! Or: ! fink -b install mozilla-dev ! fink install openvrml6-dev openvrml-gl6-dev Then: cd ~/Desktop/ARToolKit/lib/SRC/ARvrml --- 132,137 ---- The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: ! fink -b install mozilla-dev ! fink install openvrml6-dev openvrml-gl6-dev Then: cd ~/Desktop/ARToolKit/lib/SRC/ARvrml *************** *** 146,168 **** ! Changes in version 2.72 (this release) (2006-11-20). ------------------------------------------------------ All platforms: ! - New feature: ARToolKit now supports querying of SDK and runtime versions. ! - New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! - Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! - Enhancement: gsub_lite now supports arDebug mode. ! - Enhancement: ARvrml now builds against OpenVRML-0.16.1. ! - Enhancement: The license model is now stated more clearly in the readme. ! Mac OS X: ! - Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! - Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! - Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. Linux: ! - New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! - Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! - Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. --- 143,163 ---- ! Changes in version 2.72.1 (this release) (2007-02-07). ------------------------------------------------------ All platforms: ! - Bug fix: Removed VRML backgrounds which were still showing when using new OpenVRML-0.16.3. ! - Bug fix: The bud_B VRML model does not render correctly with OpenVRML-0.16.3 and has been temporarily removed. ! - Enhancement: Debug mode ('d' key) and threshhold adjustment ('+' and '-' keys) are now enabled in all gsub_lite-based examples. ! Windows: ! - Bug fix: Fix for issue which made video stream appear white in examples based on the old gsub library. ! - Enhancement: added reading of environment variable ARTOOLKIT_CONFIG for DSVL video capture. Linux: ! - Bug fix: VideoLinuxV4L should now compile correctly on 64-bit x86 systems. ! ! Mac OS X: ! - Bug fix: A long-standing performance problem in the Mac video library has been addressed, allowing correct and optimal buffering of the video stream. ! - Enhancement: ARvrml now links to fink-supplied OpenVRML-0.16.3 by default. |
|
From: Philip L. <phi...@us...> - 2007-02-06 21:44:26
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28456 Modified Files: gsub.c Log Message: Fix for texture alpha problem in Windows GL implementation. Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gsub.c 3 Oct 2006 21:35:44 -0000 1.7 --- gsub.c 6 Feb 2007 21:44:19 -0000 1.8 *************** *** 553,557 **** glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGBA, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGBA, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); --- 553,557 ---- glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGBA, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); *************** *** 747,751 **** glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); --- 747,751 ---- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); *************** *** 964,968 **** glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); --- 964,968 ---- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); *************** *** 1121,1125 **** glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); --- 1121,1125 ---- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); *************** *** 1414,1418 **** glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); --- 1414,1418 ---- glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); |
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30518/doc Modified Files: annotated.html arMulti_8h.html ar_8h.html files.html footer.html globals.html globals_defs.html globals_func.html globals_type.html globals_vars.html gsubUtil_8h.html gsub_8h.html hierarchy.html index.html matrix_8h.html param_8h.html structARMarkerInfo.html structARMarkerInfo2.html structARMat.html structARMultiEachMarkerInfoT.html structARMultiMarkerInfoT.html structARParam.html structARVec.html structarPrevInfo.html video_8h.html Log Message: Update copyright date. Index: structARMultiMarkerInfoT.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMultiMarkerInfoT.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARMultiMarkerInfoT.html 22 May 2006 23:03:18 -0000 1.2 --- structARMultiMarkerInfoT.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 62,66 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 62,66 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARParam.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARParam.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARParam.html 22 May 2006 23:03:18 -0000 1.2 --- structARParam.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 57,61 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 57,61 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals_vars.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_vars.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** globals_vars.html 22 May 2006 23:03:18 -0000 1.2 --- globals_vars.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 45,49 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 45,49 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: files.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/files.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** files.html 22 May 2006 23:03:18 -0000 1.2 --- files.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 31,35 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 31,35 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: footer.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/footer.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** footer.html 22 May 2006 23:03:18 -0000 1.2 --- footer.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 1,5 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 1,5 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARMat.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMat.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARMat.html 22 May 2006 23:03:18 -0000 1.2 --- structARMat.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 61,65 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 61,65 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: matrix_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/matrix_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** matrix_8h.html 22 May 2006 23:03:18 -0000 1.2 --- matrix_8h.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 1087,1091 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 1087,1091 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals_type.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_type.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** globals_type.html 22 May 2006 23:03:18 -0000 1.2 --- globals_type.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 36,40 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 36,40 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARMarkerInfo2.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMarkerInfo2.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARMarkerInfo2.html 22 May 2006 23:03:18 -0000 1.2 --- structARMarkerInfo2.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 65,69 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 65,69 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: hierarchy.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/hierarchy.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hierarchy.html 22 May 2006 23:15:43 -0000 1.1 --- hierarchy.html 23 Jan 2007 00:39:26 -0000 1.2 *************** *** 31,35 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 31,35 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structarPrevInfo.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structarPrevInfo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structarPrevInfo.html 22 May 2006 23:03:18 -0000 1.2 --- structarPrevInfo.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 43,47 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 43,47 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: arMulti_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/arMulti_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arMulti_8h.html 22 May 2006 23:03:18 -0000 1.2 --- arMulti_8h.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 265,269 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 265,269 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals_defs.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_defs.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** globals_defs.html 22 May 2006 23:03:18 -0000 1.2 --- globals_defs.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 38,42 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 38,42 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: gsub_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gsub_8h.html 22 May 2006 23:03:18 -0000 1.2 --- gsub_8h.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 1109,1113 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 1109,1113 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: param_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/param_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** param_8h.html 22 May 2006 23:03:18 -0000 1.2 --- param_8h.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 601,605 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 601,605 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: annotated.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/annotated.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** annotated.html 22 May 2006 23:03:18 -0000 1.2 --- annotated.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 31,35 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 31,35 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** globals.html 17 Nov 2006 03:29:56 -0000 1.4 --- globals.html 23 Jan 2007 00:39:26 -0000 1.5 *************** *** 185,189 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 185,189 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: gsubUtil_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsubUtil_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** gsubUtil_8h.html 22 May 2006 23:03:18 -0000 1.2 --- gsubUtil_8h.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 92,96 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 92,96 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals_func.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_func.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** globals_func.html 17 Nov 2006 03:29:56 -0000 1.4 --- globals_func.html 23 Jan 2007 00:39:26 -0000 1.5 *************** *** 165,169 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 165,169 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: index.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.html 22 May 2006 23:03:18 -0000 1.2 --- index.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 18,22 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 18,22 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARVec.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARVec.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARVec.html 22 May 2006 23:03:18 -0000 1.2 --- structARVec.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 52,56 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 52,56 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARMultiEachMarkerInfoT.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMultiEachMarkerInfoT.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARMultiEachMarkerInfoT.html 22 May 2006 23:03:18 -0000 1.2 --- structARMultiEachMarkerInfoT.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 73,77 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 73,77 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARMarkerInfo.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMarkerInfo.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** structARMarkerInfo.html 22 May 2006 23:03:18 -0000 1.2 --- structARMarkerInfo.html 23 Jan 2007 00:39:26 -0000 1.3 *************** *** 70,74 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 70,74 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: ar_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/ar_8h.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ar_8h.html 17 Nov 2006 03:29:56 -0000 1.4 --- ar_8h.html 23 Jan 2007 00:39:26 -0000 1.5 *************** *** 2343,2347 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 2343,2347 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: video_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video_8h.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** video_8h.html 28 Sep 2006 03:06:34 -0000 1.4 --- video_8h.html 23 Jan 2007 00:39:26 -0000 1.5 *************** *** 664,668 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 664,668 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2007. HIT Lab NZ. All Rights Reserved.</small> </body> </html> |
|
From: Philip L. <phi...@us...> - 2007-01-23 00:39:30
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30518/lib/SRC/VideoMacOSX Modified Files: ARVideoSettingsController.h ARVideoSettingsController.m video.c videoInternal.h Log Message: Update copyright date. Index: ARVideoSettingsController.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ARVideoSettingsController.h 18 Jun 2006 22:52:27 -0000 1.3 --- ARVideoSettingsController.h 23 Jan 2007 00:39:28 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: videoInternal.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/videoInternal.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** videoInternal.h 18 Jun 2006 22:52:27 -0000 1.3 --- videoInternal.h 23 Jan 2007 00:39:28 -0000 1.4 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** video.c 23 Jan 2007 00:27:34 -0000 1.25 --- video.c 23 Jan 2007 00:39:28 -0000 1.26 *************** *** 8,12 **** */ /* ! * Copyright (c) 2003-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 8,12 ---- */ /* ! * Copyright (c) 2003-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: ARVideoSettingsController.m =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.m,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ARVideoSettingsController.m 18 Jun 2006 22:52:27 -0000 1.6 --- ARVideoSettingsController.m 23 Jan 2007 00:39:28 -0000 1.7 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2007-01-23 00:39:30
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30518/lib/SRC/VideoWin32DirectShow Modified Files: videoWin32DirectShow.cpp Log Message: Update copyright date. Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** videoWin32DirectShow.cpp 6 Dec 2006 02:14:32 -0000 1.10 --- videoWin32DirectShow.cpp 23 Jan 2007 00:39:28 -0000 1.11 *************** *** 32,36 **** */ /* ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 32,36 ---- */ /* ! * Copyright (c) 2004-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2007-01-23 00:39:30
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30518/include/AR Modified Files: ar.h gsub_lite.h video.h Log Message: Update copyright date. Index: video.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/video.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** video.h 30 Jun 2006 04:38:40 -0000 1.7 --- video.h 23 Jan 2007 00:39:27 -0000 1.8 *************** *** 1,4 **** /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * --- 1,4 ---- /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * *************** *** 108,113 **** # include <AR/sys/videoLinux1394Cam.h> # endif ! # ifdef AR_INPUT_GSTREAMER ! # include <AR/sys/videoGStreamer.h> # endif #endif --- 108,113 ---- # include <AR/sys/videoLinux1394Cam.h> # endif ! # ifdef AR_INPUT_GSTREAMER ! # include <AR/sys/videoGStreamer.h> # endif #endif Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ar.h 17 Nov 2006 03:22:23 -0000 1.12 --- ar.h 23 Jan 2007 00:39:27 -0000 1.13 *************** *** 1,4 **** /* -------------------------------------------------------------------------- ! * Copyright (c) 20042-2006 HIT Lab NZ. * The distribution policy is described in the file COPYING.txt furnished * with this library. --- 1,4 ---- /* -------------------------------------------------------------------------- ! * Copyright (c) 20042-2007 HIT Lab NZ. * The distribution policy is described in the file COPYING.txt furnished * with this library. Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** gsub_lite.h 18 Jan 2007 22:50:39 -0000 1.16 --- gsub_lite.h 23 Jan 2007 00:39:27 -0000 1.17 *************** *** 4,8 **** * Graphics Subroutines (Lite) for ARToolKit. * ! * Copyright (c) 2003-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 4,8 ---- * Graphics Subroutines (Lite) for ARToolKit. * ! * Copyright (c) 2003-2007 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes *************** *** 110,114 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! @copyright 2003-2006 Philip Lamb @updated 2006-05-23 */ --- 110,114 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! @copyright 2003-2007 Philip Lamb @updated 2006-05-23 */ |
