artoolkit-commits Mailing List for ARToolKit (Page 6)
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...> - 2006-10-03 21:35:23
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv16981 Modified Files: calib_dist.c Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** calib_dist.c 15 Sep 2006 03:08:18 -0000 1.15 --- calib_dist.c 3 Oct 2006 21:35:19 -0000 1.16 *************** *** 401,404 **** --- 401,406 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + *p1 = ((255 - *(p)) < gThresh ? 0 : 255); #else # error Unknown default pixel format defined in config.h |
|
From: Hartmut S. <ret...@us...> - 2006-09-28 05:50:22
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18182/lib/SRC/VideoWin32DirectShow Modified Files: videoWin32DirectShow.cpp Log Message: - minor fix for situations when ar2VideoClose is been called twice. Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** videoWin32DirectShow.cpp 29 Aug 2006 04:19:16 -0000 1.8 --- videoWin32DirectShow.cpp 28 Sep 2006 05:50:16 -0000 1.9 *************** *** 172,185 **** int ar2VideoClose(AR2VideoParamT *vid) { ! if (vid == NULL) return (-1); ! if (vid->graphManager == NULL) return (-1); ! if (vid->bufferCheckedOut) vid->graphManager->CheckinMemoryBuffer(vid->g_Handle, true); ! vid->graphManager->Stop(); ! delete vid->graphManager; ! vid->graphManager = NULL; ! free (vid); ! return(0); } --- 172,200 ---- int ar2VideoClose(AR2VideoParamT *vid) { ! int _ret = -1; ! ! if (vid == NULL) return (_ret); ! ! if (vid->graphManager != NULL) { ! if (vid->bufferCheckedOut) ! vid->graphManager->CheckinMemoryBuffer(vid->g_Handle, true); ! ! vid->graphManager->Stop(); ! delete vid->graphManager; ! vid->graphManager = NULL; ! ! _ret = 0; ! } ! ! free(vid); ! ! // do not assume free NULL's the pointer ! vid = NULL; ! ! // COM should be closed down in the same context ! CoUninitialize(); ! return(_ret); } |
|
From: Philip L. <phi...@us...> - 2006-09-28 03:09:42
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22639 Modified Files: CompositePage.html Log Message: Update docs. Index: CompositePage.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CompositePage.html 22 May 2006 23:03:19 -0000 1.7 --- CompositePage.html 28 Sep 2006 03:09:39 -0000 1.8 *************** *** 169,175 **** </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><font class="function">arglCameraView</font><!-- /a -->( ! <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], ! <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> --- 169,175 ---- </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><font class="function">arglCameraView</font><!-- /a -->( ! <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], ! <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> |
|
From: Philip L. <phi...@us...> - 2006-09-28 03:09:28
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22604 Modified Files: Functions.html Log Message: Update docs. Index: Functions.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions/Functions.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Functions.html 22 May 2006 23:03:19 -0000 1.6 --- Functions.html 28 Sep 2006 03:09:26 -0000 1.7 *************** *** 108,114 **** </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><font class="function">arglCameraView</font><!-- /a -->( ! <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], ! <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> --- 108,114 ---- </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><font class="function">arglCameraView</font><!-- /a -->( ! <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], ! <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> |
|
From: Philip L. <phi...@us...> - 2006-09-28 03:06:50
|
Update of /cvsroot/artoolkit/artoolkit/doc/video In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21287 Modified Files: index.html Log Message: Update docs. Index: index.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.html 18 Sep 2006 04:48:31 -0000 1.3 --- index.html 28 Sep 2006 03:06:45 -0000 1.4 *************** *** 1,19 **** ! <!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: -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 Return images with pixels in format cccc, where cccc is either a numeric pixel format number or a valid 4-character-code for a pixel format. The following values are supported: 32, BGRA, RGBA, ABGR, 24, 24BG, 2vuy, yuvs. (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.) </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> --- 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: -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 Return images with pixels in format cccc, where cccc is either a numeric pixel format number or a valid 4-character-code for a pixel format. The following values are supported: 32, BGRA, RGBA, ABGR, 24, 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.) </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 |
|
From: Philip L. <phi...@us...> - 2006-09-28 03:06:39
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv21251 Modified Files: globals.html ar_8h.html video_8h.html globals_func.html Log Message: Update docs. Index: ar_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/ar_8h.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ar_8h.html 22 May 2006 23:03:18 -0000 1.2 --- ar_8h.html 28 Sep 2006 03:06:34 -0000 1.3 *************** *** 64,67 **** --- 64,70 ---- <tr><td class="mdescLeft"> </td><td class="mdescRight">ARToolKit pixel-format specifiers. <a href="#641bf68ce0529b6b323ec156e69c5590"></a><br></td></tr> <tr><td colspan="2"><br><h2>Functions</h2></td></tr> + <tr><td class="memItemLeft" nowrap align="right" valign="top">ARUint32 </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#5f6a6f78cfce8c8dfc80479b47232eb4">arGetVersion</a> (char **versionStringRef)</td></tr> + + <tr><td class="mdescLeft"> </td><td class="mdescRight">Get the ARToolKit version information in numberic and string format. <a href="#5f6a6f78cfce8c8dfc80479b47232eb4"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#52f12a73083b810427e2a9066e69a0f2">arInitCparam</a> (<a class="el" href="structARParam.html">ARParam</a> *param)</td></tr> *************** *** 129,133 **** <tr><td class="memItemLeft" nowrap align="right" valign="top">ARInt16 * </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">arLabeling</a> (ARUint8 *image, int thresh, int *label_num, int **area, double **pos, int **clip, int **label_ref)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">extracted connected component from image. <a href="#42ad9c96a619e0d62be0627634332dfe"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#4909575c338b25813a1c824d46b2f4fe">arGetImgFeature</a> (int *num, int **area, int **clip, double **pos)</td></tr> --- 132,136 ---- <tr><td class="memItemLeft" nowrap align="right" valign="top">ARInt16 * </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">arLabeling</a> (ARUint8 *image, int thresh, int *label_num, int **area, double **pos, int **clip, int **label_ref)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">extract connected components from image. <a href="#42ad9c96a619e0d62be0627634332dfe"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#4909575c338b25813a1c824d46b2f4fe">arGetImgFeature</a> (int *num, int **area, int **clip, double **pos)</td></tr> *************** *** 144,148 **** <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#5f9a199367ae02c106c1845f8706727e">arGetPatt</a> (ARUint8 *image, int *x_coord, int *y_coord, int *vertex, ARUint8 ext_pat[AR_PATT_SIZE_Y][AR_PATT_SIZE_X][3])</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">return a normalized pattern from a video image. <a href="#5f9a199367ae02c106c1845f8706727e"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#870cde1dfb861bfdbb12f2a71baa2a4e">arGetLine</a> (int x_coord[], int y_coord[], int coord_num, int vertex[], double line[4][3], double v[4][2])</td></tr> --- 147,151 ---- <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#5f9a199367ae02c106c1845f8706727e">arGetPatt</a> (ARUint8 *image, int *x_coord, int *y_coord, int *vertex, ARUint8 ext_pat[AR_PATT_SIZE_Y][AR_PATT_SIZE_X][3])</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Get a normalized pattern from a video image. <a href="#5f9a199367ae02c106c1845f8706727e"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#870cde1dfb861bfdbb12f2a71baa2a4e">arGetLine</a> (int x_coord[], int y_coord[], int coord_num, int vertex[], double line[4][3], double v[4][2])</td></tr> *************** *** 1250,1256 **** <p> ! return a normalized pattern from a video image. <p> ! This function return a normalized pattern from a video image. The format is a table with AR_PATT_SIZE_X by AR_PATT_SIZE_Y <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> <tr><td valign="top"></td><td valign="top"><em>image</em> </td><td>video input image </td></tr> --- 1253,1259 ---- <p> ! Get a normalized pattern from a video image. <p> ! This function returns a normalized pattern from a video image. The format is a table with AR_PATT_SIZE_X by AR_PATT_SIZE_Y <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> <tr><td valign="top"></td><td valign="top"><em>image</em> </td><td>video input image </td></tr> *************** *** 1453,1456 **** --- 1456,1496 ---- </tr> </table> + <a class="anchor" name="5f6a6f78cfce8c8dfc80479b47232eb4"></a><!-- doxytag: member="ar.h::arGetVersion" ref="5f6a6f78cfce8c8dfc80479b47232eb4" args="(char **versionStringRef)" --><p> + <table class="mdTable" cellpadding="2" cellspacing="0"> + <tr> + <td class="mdRow"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + <td class="md" nowrap valign="top">ARUint32 arGetVersion </td> + <td class="md" valign="top">( </td> + <td class="md" nowrap valign="top">char ** </td> + <td class="mdname1" valign="top" nowrap> <em>versionStringRef</em> </td> + <td class="md" valign="top"> ) </td> + <td class="md" nowrap></td> + </tr> + </table> + </td> + </tr> + </table> + <table cellspacing="5" cellpadding="0" border="0"> + <tr> + <td> + + </td> + <td> + + <p> + Get the ARToolKit version information in numberic and string format. + <p> + As of version 2.72, ARToolKit now allows querying of the version number of the toolkit available at runtime. It is highly recommended that any calling program that depends on features in a certain ARToolKit version, check at runtime that it is linked to a version of ARToolKit that can supply those features. It is NOT sufficient to check the ARToolKit SDK header versions, since with ARToolKit implemented in dynamically-loaded libraries, there is no guarantee that the version of ARToolKit installed on the machine at run-time will as recent as the version of the ARToolKit SDK which the host program was compiled against. The version information is reported in binary-coded decimal format, and optionally in an ASCII string. See the config.h header for more discussion of the definition of major, minor, tiny and build version numbers.<p> + <dl compact><dt><b>Parameters:</b></dt><dd> + <table border="0" cellspacing="2" cellpadding="0"> + <tr><td valign="top"></td><td valign="top"><em>versionStringRef</em> </td><td>If non-NULL, the location pointed to will be filled with a pointer to a string containing the version information. Fields in the version string are separated by spaces. As of version 2.72.0, there is only one field implemented, and this field contains the major, minor and tiny version numbers in dotted-decimal format. The string is guaranteed to contain at least this field in all future versions of the toolkit. Later versions of the toolkit may add other fields to this string to report other types of version information. The storage for the string is malloc'ed inside the function. The caller is responsible for free'ing the string.</td></tr> + </table> + </dl> + <dl compact><dt><b>Returns:</b></dt><dd>Returns the full version number of the ARToolKit in binary coded decimal (BCD) format. BCD format allows simple tests of version number in the caller e.g. if ((arGetVersion(NULL) >> 16) > 0x0272) printf("This release is later than 2.72\n"); The major version number is encoded in the most-significant byte (bits 31-24), the minor version number in the second-most-significant byte (bits 23-16), the tiny version number in the third-most-significant byte (bits 15-8), and the build version number in the least-significant byte (bits 7-0). </dd></dl> + </td> + </tr> + </table> <a class="anchor" name="52f12a73083b810427e2a9066e69a0f2"></a><!-- doxytag: member="ar.h::arInitCparam" ref="52f12a73083b810427e2a9066e69a0f2" args="(ARParam *param)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> *************** *** 1553,1570 **** <p> ! extracted connected component from image. <p> ! Labeling the input image, i.e. extracted connected component from the inptu video image. <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> ! <tr><td valign="top"></td><td valign="top"><em>image</em> </td><td>input image </td></tr> <tr><td valign="top"></td><td valign="top"><em>thresh</em> </td><td>lighting threshold </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>label_num</em> </td><td>number of detected components </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>area</em> </td><td>XXXBK </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>pos</em> </td><td>XXXBK </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>clip</em> </td><td>XXXBK </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>label_ref</em> </td><td>XXXBK </td></tr> </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>XXXBK </dd></dl> </td> </tr> --- 1593,1610 ---- <p> ! extract connected components from image. <p> ! Label the input image, i.e. extract connected components from the input video image. <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> ! <tr><td valign="top"></td><td valign="top"><em>image</em> </td><td>input image, as returned by <a class="el" href="video_8h.html#aba310982da09d39a4a92c5cd394d0dd">arVideoGetImage()</a> </td></tr> <tr><td valign="top"></td><td valign="top"><em>thresh</em> </td><td>lighting threshold </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>label_num</em> </td><td>Ouput- number of detected components </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>area</em> </td><td>On return, if label_num > 0, points to an array of ints, one for each detected component. </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>pos</em> </td><td>On return, if label_num > 0, points to an array of doubles, one for each detected component. </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>clip</em> </td><td>On return, if label_num > 0, points to an array of ints, one for each detected component. </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>label_ref</em> </td><td>On return, if label_num > 0, points to an array of ints, one for each detected component. </td></tr> </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>returns a pointer to the labeled output image, ready for passing onto the next stage of processing. </dd></dl> </td> </tr> Index: video_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video_8h.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** video_8h.html 22 May 2006 23:03:18 -0000 1.3 --- video_8h.html 28 Sep 2006 03:06:34 -0000 1.4 *************** *** 80,84 **** This library provides multi-platform video input support for ARToolKit. It abstracts access to hardware video input available on different machines and operating systems.<p> The actual supported platforms (and the driver/library used) are:<ul> ! <li>Windows: with Microsoft DirectShow (VFW obsolete).</li><li>Linux: with Video4Linux library, IEEE1394 camera library, and DV camera library.</li><li>Macintosh: with QuickTime.</li><li>SGI: with VL.</li></ul> <p> This library provides two sets of functions, depending on whether your program needs to use only one video stream, or more than one video stream. These two sets are functionally identical.<ul> --- 80,84 ---- This library provides multi-platform video input support for ARToolKit. It abstracts access to hardware video input available on different machines and operating systems.<p> The actual supported platforms (and the driver/library used) are:<ul> ! <li>Windows: with Microsoft DirectShow (VFW obsolete).</li><li>Linux: with Video4Linux library, GStreamer, IEEE1394 camera library and DV camera library.</li><li>Macintosh: with QuickTime.</li><li>SGI: with VL.</li></ul> <p> This library provides two sets of functions, depending on whether your program needs to use only one video stream, or more than one video stream. These two sets are functionally identical.<ul> *************** *** 87,95 **** More information on establishing video streams is available in the ARToolKit manual.<p> <dl compact><dt><b>Remarks:</b></dt><dd>The arVideo* functions maintain the current video stream in a global variable and internally call the ar2Video* functions.</dd></dl> ! History : modified by Thomas Pintaric (<a href="mailto:pin...@im...">pin...@im...</a>) to add a fully transparent DirectShow Driver.<p> <dl compact><dt><b>Author:</b></dt><dd>Hirokazu Kato <a href="mailto:ka...@sy...">ka...@sy...</a> <p> Atsishi Nakazawa <a href="mailto:nak...@in...">nak...@in...</a> <p> Thomas Pintaric <a href="mailto:pin...@im...">pin...@im...</a> (Windows DirectShow video support). <p> ! Philip Lamb <a href="mailto:ph...@ed...">ph...@ed...</a> (Macintosh Quicktime video support). </dd></dl> <dl compact><dt><b>Version:</b></dt><dd>4.3b </dd></dl> <dl compact><dt><b>Date:</b></dt><dd>03/02/02 </dd></dl> --- 87,96 ---- More information on establishing video streams is available in the ARToolKit manual.<p> <dl compact><dt><b>Remarks:</b></dt><dd>The arVideo* functions maintain the current video stream in a global variable and internally call the ar2Video* functions.</dd></dl> ! History : modified by Thomas Pintaric (<a href="mailto:pin...@im...">pin...@im...</a>) to add a fully transparent DirectShow Driver. modified by Hartmut Seichter (<a href="mailto:ha...@te...">ha...@te...</a>) to add GStreamer video support<p> <dl compact><dt><b>Author:</b></dt><dd>Hirokazu Kato <a href="mailto:ka...@sy...">ka...@sy...</a> <p> Atsishi Nakazawa <a href="mailto:nak...@in...">nak...@in...</a> <p> Thomas Pintaric <a href="mailto:pin...@im...">pin...@im...</a> (Windows DirectShow video support). <p> ! Philip Lamb <a href="mailto:ph...@ed...">ph...@ed...</a> (Macintosh Quicktime video support). <p> ! Hartmut Seichter <a href="mailto:ha...@te...">ha...@te...</a> (GStreamer Video support) </dd></dl> <dl compact><dt><b>Version:</b></dt><dd>4.3b </dd></dl> <dl compact><dt><b>Date:</b></dt><dd>03/02/02 </dd></dl> Index: globals.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** globals.html 22 May 2006 23:03:18 -0000 1.2 --- globals.html 28 Sep 2006 03:06:33 -0000 1.3 *************** *** 84,88 **** : <a class="el" href="ar_8h.html#37f711816374205f2479501fd7ed9dc8">ar.h</a><li>arGetTransMat() : <a class="el" href="ar_8h.html#01eddf593ac98e4547e7131263e0d8c6">ar.h</a><li>arGetTransMatCont() ! : <a class="el" href="ar_8h.html#701276e28f11b53f13877b0316b5f6ec">ar.h</a><li>argInit() : <a class="el" href="gsub_8h.html#07b1fb9faa954efc65f5d2b8f6f637e6">gsub.h</a><li>argInqSetting() : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>ARGL_CONTEXT_SETTINGS_REF --- 84,89 ---- : <a class="el" href="ar_8h.html#37f711816374205f2479501fd7ed9dc8">ar.h</a><li>arGetTransMat() : <a class="el" href="ar_8h.html#01eddf593ac98e4547e7131263e0d8c6">ar.h</a><li>arGetTransMatCont() ! : <a class="el" href="ar_8h.html#701276e28f11b53f13877b0316b5f6ec">ar.h</a><li>arGetVersion() ! : <a class="el" href="ar_8h.html#5f6a6f78cfce8c8dfc80479b47232eb4">ar.h</a><li>argInit() : <a class="el" href="gsub_8h.html#07b1fb9faa954efc65f5d2b8f6f637e6">gsub.h</a><li>argInqSetting() : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>ARGL_CONTEXT_SETTINGS_REF Index: globals_func.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_func.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** globals_func.html 22 May 2006 23:03:18 -0000 1.2 --- globals_func.html 28 Sep 2006 03:06:34 -0000 1.3 *************** *** 77,81 **** : <a class="el" href="ar_8h.html#37f711816374205f2479501fd7ed9dc8">ar.h</a><li>arGetTransMat() : <a class="el" href="ar_8h.html#01eddf593ac98e4547e7131263e0d8c6">ar.h</a><li>arGetTransMatCont() ! : <a class="el" href="ar_8h.html#701276e28f11b53f13877b0316b5f6ec">ar.h</a><li>argInit() : <a class="el" href="gsub_8h.html#07b1fb9faa954efc65f5d2b8f6f637e6">gsub.h</a><li>argInqSetting() : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>arglCameraFrustum() --- 77,82 ---- : <a class="el" href="ar_8h.html#37f711816374205f2479501fd7ed9dc8">ar.h</a><li>arGetTransMat() : <a class="el" href="ar_8h.html#01eddf593ac98e4547e7131263e0d8c6">ar.h</a><li>arGetTransMatCont() ! : <a class="el" href="ar_8h.html#701276e28f11b53f13877b0316b5f6ec">ar.h</a><li>arGetVersion() ! : <a class="el" href="ar_8h.html#5f6a6f78cfce8c8dfc80479b47232eb4">ar.h</a><li>argInit() : <a class="el" href="gsub_8h.html#07b1fb9faa954efc65f5d2b8f6f637e6">gsub.h</a><li>argInqSetting() : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>arglCameraFrustum() |
|
From: Philip L. <phi...@us...> - 2006-09-27 23:41:18
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1644 Modified Files: arUtil.c Log Message: Add version checking support - missing header. Index: arUtil.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arUtil.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arUtil.c 27 Sep 2006 23:31:45 -0000 1.2 --- arUtil.c 27 Sep 2006 23:41:14 -0000 1.3 *************** *** 12,15 **** --- 12,16 ---- #include <stdio.h> #include <math.h> + #include <string.h> #ifdef _WIN32 #include <sys/timeb.h> |
|
From: Philip L. <phi...@us...> - 2006-09-27 23:32:00
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30186 Modified Files: README.txt ChangeLog.txt Log Message: Add version checking support. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ChangeLog.txt 15 Sep 2006 04:05:05 -0000 1.9 --- ChangeLog.txt 27 Sep 2006 23:31:56 -0000 1.10 *************** *** 3,13 **** ! Changes in version 2.71.4 (this release) (2006-06-23). ------------------------------------------------------ ! - Fix for an error in the VRML library inclusion on Mac OS X. ! - Now detect if running emulated on Mac OS X on Intel, and optimise for this case. ! - Linux builds: Support for gstreamer video capture added, thanks to Hartmut Seichter. - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. - Linux 1394 DC: Major changes to 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 --- 3,15 ---- ! Changes in version 2.72 (this release) (2006-XX-XX). ------------------------------------------------------ ! - All platforms: ARToolKit now supports querying of SDK and runtime versions. ! - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. ! - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. + - Linux: Support for gstreamer video capture added, thanks to Hartmut Seichter. - Linux 1394 DC: Major changes to 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 + - Linux DV: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** README.txt 10 Jul 2006 04:35:17 -0000 1.23 --- README.txt 27 Sep 2006 23:31:56 -0000 1.24 *************** *** 125,134 **** ! Changes in version 2.71.4 (this release) (2006-06-23). ------------------------------------------------------ ! - Fix for an error in the VRML library inclusion on Mac OS X. ! - Now detect if running emulated on Mac OS X on Intel, and optimise for this case. ! - Linux builds: Support for gstreamer video capture added, thanks to Hartmut Seichter. - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. --- 125,137 ---- ! Changes in version 2.72 (this release) (2006-XX-XX). ------------------------------------------------------ ! - All platforms: ARToolKit now supports querying of SDK and runtime versions. ! - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. ! - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. + - Linux: Support for gstreamer video capture added, thanks to Hartmut Seichter. + - Linux 1394 DC: Major changes to 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 + - Linux DV: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. |
|
From: Philip L. <phi...@us...> - 2006-09-27 23:31:48
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30173 Modified Files: arUtil.c Log Message: Add version checking support. Index: arUtil.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arUtil.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** arUtil.c 4 Nov 2004 08:51:27 -0000 1.1.1.1 --- arUtil.c 27 Sep 2006 23:31:45 -0000 1.2 *************** *** 37,40 **** --- 37,63 ---- double arsMatR2L[3][4]; + ARUint32 arGetVersion(char **versionStringRef) + { + const char version[] = AR_HEADER_VERSION_STRING; + char *s; + + if (versionStringRef) { + arMalloc(s, char, sizeof(version)); + strncpy(s, version, sizeof(version)); + *versionStringRef = s; + } + // Represent full version number (major, minor, tiny, build) in + // binary coded decimal. N.B: Integer division. + return (0x10000000u * ((unsigned int)AR_HEADER_VERSION_MAJOR / 10u) + + 0x01000000u * ((unsigned int)AR_HEADER_VERSION_MAJOR % 10u) + + 0x00100000u * ((unsigned int)AR_HEADER_VERSION_MINOR / 10u) + + 0x00010000u * ((unsigned int)AR_HEADER_VERSION_MINOR % 10u) + + 0x00001000u * ((unsigned int)AR_HEADER_VERSION_TINY / 10u) + + 0x00000100u * ((unsigned int)AR_HEADER_VERSION_TINY % 10u) + + 0x00000010u * ((unsigned int)AR_HEADER_VERSION_BUILD / 10u) + + 0x00000001u * ((unsigned int)AR_HEADER_VERSION_BUILD % 10u) + ); + } + static int arGetLine2(int x_coord[], int y_coord[], int coord_num, int vertex[], double line[4][3], double v[4][2], double *dist_factor); *************** *** 288,289 **** --- 311,313 ---- return; } + |
|
From: Philip L. <phi...@us...> - 2006-09-27 23:31:37
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30152 Modified Files: ar.h config.h.in Log Message: Add version checking support. Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ar.h 25 May 2006 04:08:19 -0000 1.9 --- ar.h 27 Sep 2006 23:31:35 -0000 1.10 *************** *** 271,274 **** --- 271,317 ---- /** + * \brief Get the ARToolKit version information in numberic and string format. + * + * As of version 2.72, ARToolKit now allows querying of the version number + * of the toolkit available at runtime. It is highly recommended that + * any calling program that depends on features in a certain + * ARToolKit version, check at runtime that it is linked to a version + * of ARToolKit that can supply those features. It is NOT sufficient + * to check the ARToolKit SDK header versions, since with ARToolKit implemented + * in dynamically-loaded libraries, there is no guarantee that the + * version of ARToolKit installed on the machine at run-time will as + * recent as the version of the ARToolKit SDK which the host + * program was compiled against. + * The version information is reported in binary-coded decimal format, + * and optionally in an ASCII string. See the config.h header + * for more discussion of the definition of major, minor, tiny and build + * version numbers. + * + * \param versionStringRef + * If non-NULL, the location pointed to will be filled + * with a pointer to a string containing the version information. + * Fields in the version string are separated by spaces. As of version + * 2.72.0, there is only one field implemented, and this field + * contains the major, minor and tiny version numbers + * in dotted-decimal format. The string is guaranteed to contain + * at least this field in all future versions of the toolkit. + * Later versions of the toolkit may add other fields to this string + * to report other types of version information. The storage for the + * string is malloc'ed inside the function. The caller is responsible + * for free'ing the string. + * + * \return Returns the full version number of the ARToolKit in + * binary coded decimal (BCD) format. + * BCD format allows simple tests of version number in the caller + * e.g. if ((arGetVersion(NULL) >> 16) > 0x0272) printf("This release is later than 2.72\n"); + * The major version number is encoded in the most-significant byte + * (bits 31-24), the minor version number in the second-most-significant + * byte (bits 23-16), the tiny version number in the third-most-significant + * byte (bits 15-8), and the build version number in the least-significant + * byte (bits 7-0). + */ + ARUint32 arGetVersion(char **versionStringRef); + + /** * \brief initialize camera parameters. * *************** *** 594,600 **** /** ! * \brief return a normalized pattern from a video image. * ! * This function return a normalized pattern from a video image. The * format is a table with AR_PATT_SIZE_X by AR_PATT_SIZE_Y * \param image video input image --- 637,643 ---- /** ! * \brief Get a normalized pattern from a video image. * ! * This function returns a normalized pattern from a video image. The * format is a table with AR_PATT_SIZE_X by AR_PATT_SIZE_Y * \param image video input image Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.h.in 27 Sep 2006 21:47:46 -0000 1.11 --- config.h.in 27 Sep 2006 23:31:35 -0000 1.12 *************** *** 2,5 **** --- 2,51 ---- #define AR_CONFIG_H + // + // As of version 2.72, ARToolKit supports an OpenGL-like + // versioning system, with both header versions (for the version + // of the ARToolKit SDK installed) and runtime version reporting + // via arGetVersion(). + // + + // The MAJOR version number defines non-backwards compatible + // changes in the ARToolKit API. Range: [0-99]. + #define AR_HEADER_VERSION_MAJOR 2 + + // The MINOR version number defines additions to the ARToolKit + // API, or (occsasionally) other significant backwards-compatible + // changes in runtime functionality. Range: [0-99]. + #define AR_HEADER_VERSION_MINOR 72 + + // The TINY version number defines bug-fixes to existing + // functionality. Range: [0-99]. + #define AR_HEADER_VERSION_TINY 0 + + // The BUILD version number will always be zero in releases, + // but may be non-zero in internal builds or in version-control + // repository-sourced code. Range: [0-99]. + #define AR_HEADER_VERSION_BUILD 0 + + // The string representation below must match the major, minor + // and tiny release numbers. + #define AR_HEADER_VERSION_STRING "2.72.0" + + // The macros below are convenience macros to enable use + // of certain ARToolKit header functionality by the release + // version in which it appeared. + // Each time the major version number is incremented, all + // existing macros must be removed, and just one new one + // added for the new major version. + // Each time the minor version number is incremented, a new + // AR_HAVE_HEADER_VERSION_ macro definition must be added. + // Tiny version numbers (being bug-fix releases, by definition) + // are NOT included in the AR_HAVE_HEADER_VERSION_ system. + #define AR_HAVE_HEADER_VERSION_2 + #define AR_HAVE_HEADER_VERSION_2_72 + + // + // End version definitions. + // + #define AR_PIXEL_FORMAT_RGB 1 #define AR_PIXEL_FORMAT_BGR 2 |
|
From: Philip L. <phi...@us...> - 2006-09-27 21:47:58
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23061 Modified Files: video.c Log Message: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV/video.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** video.c 19 Sep 2006 03:12:35 -0000 1.3 --- video.c 27 Sep 2006 21:47:55 -0000 1.4 *************** *** 8,11 **** --- 8,15 ---- #include <AR/video.h> + #define VIDEO_MODE_PAL 0 + #define VIDEO_MODE_NTSC 1 + #define DEFAULT_VIDEO_MODE VIDEO_MODE_NTSC + #define ARV_BUF_FRAME_DATA 150000 #define ARV_NTSC_FRAME_SIZE 120000 *************** *** 150,158 **** return 0; } ! } ! else if( strncmp( a, "-debug", 6 ) == 0 ) { vid->debug = 1; ! } ! else { ar2VideoDispOption(); free( vid ); --- 154,160 ---- return 0; } ! } else if( strncmp( a, "-debug", 6 ) == 0 ) { vid->debug = 1; ! } else { ar2VideoDispOption(); free( vid ); *************** *** 165,169 **** ! if((vid->handle = raw1394_new_handle()) == NULL) { free( vid ); perror("raw1394 - couldn't get handle"); --- 167,171 ---- ! if ((vid->handle = raw1394_new_handle()) == NULL) { free( vid ); perror("raw1394 - couldn't get handle"); *************** *** 179,183 **** if( vid->debug ) { printf("NUMCARDS = %d\n", numcards); ! for( i = 0; i < numcards; i++ ) { printf("%2d: %s\n", g_pinf[i].nodes, g_pinf[i].name); } --- 181,185 ---- if( vid->debug ) { printf("NUMCARDS = %d\n", numcards); ! for (i = 0; i < numcards; i++) { printf("%2d: %s\n", g_pinf[i].nodes, g_pinf[i].name); } *************** *** 186,199 **** if (raw1394_set_port(vid->handle, 0) < 0) { ! free( vid ); perror("raw1394 - couldn't set port"); return NULL; } ! if( (vid->dv_decoder = dv_decoder_new(TRUE,FALSE,FALSE)) == 0 ) { return NULL; } vid->dv_decoder->quality = 5; ! //dv_init(); arMalloc( vid->buffer, AR2VideoBufferT, 1 ); --- 188,209 ---- if (raw1394_set_port(vid->handle, 0) < 0) { ! free(vid); perror("raw1394 - couldn't set port"); return NULL; } ! if ((vid->dv_decoder = dv_decoder_new((vid->mode == VIDEO_MODE_NTSC), FALSE, FALSE)) == 0) { ! free(vid); return NULL; } vid->dv_decoder->quality = 5; ! if (vid->mode == VIDEO_MODE_NTSC) { ! vid->dv_decoder->height = 480; ! vid->dv_decoder->arg_video_system = 1; // video standard: 0=autoselect [default], 1=525/60 4:1:1 (NTSC), 2=625/50 4:2:0 (PAL,IEC 61834 DV), 3=625/50 4:1:1 (PAL,SMPTE 314M DV). ! } else { // (vid->mode == VIDEO_MODE_PAL) ! vid->dv_decoder->height = 576; ! vid->dv_decoder->arg_video_system = 2; ! } ! dv_init(FALSE, FALSE); arMalloc( vid->buffer, AR2VideoBufferT, 1 ); *************** *** 201,205 **** ar2VideoBufferInit( vid->buffer, ARV_BUF_FRAME_DATA ); ! arMalloc( vid->image, ARUint8, 720*576*4 ); return vid; --- 211,215 ---- ar2VideoBufferInit( vid->buffer, ARV_BUF_FRAME_DATA ); ! arMalloc( vid->image, ARUint8, 720*576*4 ); // Make buffer big enough for PAL BGRA images. return vid; *************** *** 329,333 **** } - ARUint8 *ar2VideoGetImage( AR2VideoParamT *vid ) { --- 339,342 ---- *************** *** 380,388 **** pitches[0] = 720*AR_PIX_SIZE_DEFAULT; pixels[0] = vid->image; ! #ifdef AR_PIXEL_FORMAT_DEFAULT_RGB dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches ); ! #endif ! #ifdef AR_PIXEL_FORMAT_DEFAULT_BGRA dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches ); #endif --- 389,398 ---- pitches[0] = 720*AR_PIX_SIZE_DEFAULT; pixels[0] = vid->image; ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches ); + #else + # error Unsupported pixel format defined in <AR/config.h>. #endif *************** *** 405,416 **** } - - - - - - - - static int ar2VideoBufferInit(AR2VideoBufferT *buffer, int size) { --- 415,418 ---- |
|
From: Philip L. <phi...@us...> - 2006-09-27 21:47:56
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23048 Modified Files: config.h.in Log Message: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** config.h.in 15 Sep 2006 03:55:22 -0000 1.10 --- config.h.in 27 Sep 2006 21:47:46 -0000 1.11 *************** *** 118,124 **** # ifdef AR_INPUT_DV ! # define VIDEO_MODE_PAL 0 ! # define VIDEO_MODE_NTSC 1 ! # define DEFAULT_VIDEO_MODE VIDEO_MODE_NTSC # endif --- 118,122 ---- # ifdef AR_INPUT_DV ! /* Defines all moved into video.c now - they are not used anywhere else */ # endif |
|
From: Philip L. <phi...@us...> - 2006-09-19 03:13:22
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30621 Modified Files: video.c Log Message: Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** video.c 10 Jul 2006 04:35:17 -0000 1.21 --- video.c 19 Sep 2006 03:13:20 -0000 1.22 *************** *** 1244,1248 **** ! AR2VideoParamT *ar2VideoOpen(char *config) { static int initF = 0; --- 1244,1248 ---- ! AR2VideoParamT *ar2VideoOpen(char *config_in) { static int initF = 0; *************** *** 1259,1263 **** int err_i = 0; AR2VideoParamT *vid = NULL; ! char *a, line[256]; #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME int weLocked = 0; --- 1259,1263 ---- int err_i = 0; AR2VideoParamT *vid = NULL; ! char *config, *a, line[256]; #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME int weLocked = 0; *************** *** 1269,1272 **** --- 1269,1288 ---- long cpuType; + /* 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); + } + // Process configuration options. a = config; |
|
From: Philip L. <phi...@us...> - 2006-09-19 03:13:14
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30348 Modified Files: video.c Log Message: Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** video.c 18 Sep 2006 23:31:01 -0000 1.13 --- video.c 19 Sep 2006 03:13:10 -0000 1.14 *************** *** 288,292 **** ARUint32 p1,p2; quadlet_t value; ! char *config *a, line[256]; int i; --- 288,292 ---- ARUint32 p1,p2; quadlet_t value; ! char *config, *a, line[256]; int i; *************** *** 315,319 **** /* None suppplied, lets see if the user supplied one from the shell */ char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf) { config = envconf; printf ("Using config string from environment [%s].\n", envconf); --- 315,319 ---- /* 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); |
|
From: Philip L. <phi...@us...> - 2006-09-19 03:12:58
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30213 Modified Files: video.c Log Message: Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer/video.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** video.c 18 Sep 2006 23:31:29 -0000 1.6 --- video.c 19 Sep 2006 03:12:54 -0000 1.7 *************** *** 195,199 **** /* None suppplied, lets see if the user supplied one from the shell */ char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf) { config = envconf; g_printf ("Using config string from environment [%s].\n", envconf); --- 195,199 ---- /* None suppplied, lets see if the user supplied one from the shell */ char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf && envconf[0]) { config = envconf; g_printf ("Using config string from environment [%s].\n", envconf); |
|
From: Philip L. <phi...@us...> - 2006-09-19 03:12:47
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30199 Modified Files: video.c Log Message: Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** video.c 18 Sep 2006 23:31:18 -0000 1.7 --- video.c 19 Sep 2006 03:12:45 -0000 1.8 *************** *** 159,163 **** /* None suppplied, lets see if the user supplied one from the shell */ char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if (envconf) { config = envconf; printf ("Using config string from environment [%s].\n", envconf); --- 159,163 ---- /* 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); |
|
From: Philip L. <phi...@us...> - 2006-09-19 03:12:37
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30169 Modified Files: video.c Log Message: Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV/video.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** video.c 5 Apr 2006 05:47:24 -0000 1.2 --- video.c 19 Sep 2006 03:12:35 -0000 1.3 *************** *** 107,115 **** } ! AR2VideoParamT *ar2VideoOpen( char *config ) { struct raw1394_portinfo g_pinf[16]; AR2VideoParamT *vid; ! char *a, line[256]; int numcards; int i; --- 107,115 ---- } ! AR2VideoParamT *ar2VideoOpen( char *config_in ) { struct raw1394_portinfo g_pinf[16]; AR2VideoParamT *vid; ! char *config, *a, line[256]; int numcards; int i; *************** *** 120,123 **** --- 120,139 ---- 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) { |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:39:21
|
Update of /cvsroot/artoolkit/artoolkit/examples/simple In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12823 Modified Files: simpleTest.c Log Message: Default vconf is now consistent across all examples except twoView. Index: simpleTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** simpleTest.c 18 Sep 2006 05:24:05 -0000 1.11 --- simpleTest.c 18 Sep 2006 23:39:18 -0000 1.12 *************** *** 19,41 **** // Camera configuration. // ! char *vconf = ! #if defined(_WIN32) ! "Data\\WDM_camera_flipV.xml"; ! #elif defined(__APPLE__) ! ""; ! #elif defined (__linux) ! #if defined (AR_INPUT_GSTREAMER) ! ""; ! #elif defined (AR_INPUT_V4L) ! ""; ! #elif defined (AR_INPUT_DV) ! ""; ! #elif defined (AR_INPUT_1394CAM) ! ""; ! #else ! #error Unknown Linux video interface type ! #endif /* __linux */ #else ! #error Unknown system type (Win32, Apple, SGI, or Linux only) #endif --- 19,26 ---- // Camera configuration. // ! #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else ! char *vconf = ""; #endif |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:39:13
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12782 Modified Files: simpleVRML.c Log Message: Default vconf is now consistent across all examples except twoView. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** simpleVRML.c 29 Aug 2006 01:36:52 -0000 1.14 --- simpleVRML.c 18 Sep 2006 23:39:11 -0000 1.15 *************** *** 396,406 **** const char *cparam_name = "Data/camera_para.dat"; ! char *vconf = // Camera configuration. ! #if defined(_WIN32) ! "Data\\WDM_camera_flipV.xml"; ! #elif defined(__APPLE__) ! ""; #else ! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; #endif char objectDataFilename[] = "Data/object_data_vrml"; --- 396,403 ---- const char *cparam_name = "Data/camera_para.dat"; ! #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else ! char *vconf = ""; #endif char objectDataFilename[] = "Data/object_data_vrml"; |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:39:06
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12440 Modified Files: simpleLite.c Log Message: Default vconf is now consistent across all examples except twoView. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** simpleLite.c 18 Sep 2006 04:48:33 -0000 1.17 --- simpleLite.c 18 Sep 2006 23:39:03 -0000 1.18 *************** *** 416,432 **** // Camera configuration. // ! char *vconf = ! #if defined(_WIN32) ! "Data\\WDM_camera_flipV.xml"; ! #elif defined(__APPLE__) ! ""; ! #elif defined(__linux) ! # if defined(AR_INPUT_GSTREAMER) ! ""; ! # else ! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; ! # endif #else ! ""; #endif const char *patt_name = "Data/patt.hiro"; --- 416,423 ---- // Camera configuration. // ! #ifdef _WIN32 ! char *vconf = "Data\\WDM_camera_flipV.xml"; #else ! char *vconf = ""; #endif const char *patt_name = "Data/patt.hiro"; |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:31:31
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9390 Modified Files: video.c Log Message: Make default behaviour consistent across Linux video libs. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer/video.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** video.c 18 Sep 2006 04:48:33 -0000 1.5 --- video.c 18 Sep 2006 23:31:29 -0000 1.6 *************** *** 34,40 **** int width, height; ! /* the actual video buffer */ ARUint8 *videoBuffer; ! }; --- 34,40 ---- int width, height; ! /* the actual video buffer */ ARUint8 *videoBuffer; ! }; *************** *** 181,185 **** AR2VideoParamT* ! ar2VideoOpen(char *config ) { AR2VideoParamT *vid = 0; --- 181,185 ---- AR2VideoParamT* ! ar2VideoOpen(char *config_in ) { AR2VideoParamT *vid = 0; *************** *** 189,208 **** GstXML *xml; GstStateChangeReturn _ret; ! /* following plainly copied from Wayne :) */ ! /* If no config string is supplied, we should use the environment variable otherwise set a sane default */ ! if (!strcmp (config, "")) { ! ! /* None suppplied, lets see if the user supplied one from the shell */ ! char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if ((envconf != NULL) && (strcmp (envconf, ""))) { config = envconf; ! printf ("Using config string from environment [%s]\n", config); ! } ! else { ! g_printf ("No config string supplied, please consult documentation\n"); } ! } else ! g_print ("Using supplied config string [%s]\n", config); /* initialise GStreamer */ --- 189,209 ---- GstXML *xml; GstStateChangeReturn _ret; + char *config; ! /* 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) { config = envconf; ! g_printf ("Using config string from environment [%s].\n", envconf); ! } else { ! config = NULL; ! g_printf ("No video config string supplied, using defaults.\n"); } ! } else { ! config = config_in; ! g_printf ("Using supplied video config string [%s].\n", config_in); ! } /* initialise GStreamer */ |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:31:21
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9349 Modified Files: video.c Log Message: Make default behaviour consistent across Linux video libs. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** video.c 18 Sep 2006 05:24:06 -0000 1.6 --- video.c 18 Sep 2006 23:31:18 -0000 1.7 *************** *** 144,148 **** } ! AR2VideoParamT *ar2VideoOpen( char *config ) { AR2VideoParamT *vid; --- 144,148 ---- } ! AR2VideoParamT *ar2VideoOpen( char *config_in ) { AR2VideoParamT *vid; *************** *** 150,175 **** struct video_channel vc[MAXCHANNEL]; struct video_picture vp; ! char *a, line[256]; int i; int adjust = 1; ! /* following plainly copied from Wayne :) */ ! /* If no config string is supplied, we should use the environment variable otherwise set a sane default */ ! if (!strcmp (config, "")) { ! ! /* None suppplied, lets see if the user supplied one from the shell */ ! char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if ((envconf != NULL) && (strcmp (envconf, ""))) { config = envconf; ! printf ("Using config string from environment [%s]\n", config); ! } ! else { ! printf ("No config string supplied, please consult documentation\n"); } ! } else ! printf ("Using supplied config string [%s]\n", config); ! ! arMalloc( vid, AR2VideoParamT, 1 ); --- 150,173 ---- struct video_channel vc[MAXCHANNEL]; struct video_picture vp; ! char *config, *a, line[256]; int i; int adjust = 1; ! /* 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) { 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); ! } arMalloc( vid, AR2VideoParamT, 1 ); *************** *** 192,196 **** vid->videoBuffer=NULL; ! a = config; if( a != NULL) { for(;;) { --- 190,194 ---- vid->videoBuffer=NULL; ! a = config; if( a != NULL) { for(;;) { |
|
From: Philip L. <phi...@us...> - 2006-09-18 23:31:05
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8979 Modified Files: video.c Log Message: Make default behaviour consistent across Linux video libs. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** video.c 15 Sep 2006 04:44:21 -0000 1.12 --- video.c 18 Sep 2006 23:31:01 -0000 1.13 *************** *** 282,286 **** } ! AR2VideoParamT *ar2VideoOpen( char *config ) { char video1394devname [128]; --- 282,286 ---- } ! AR2VideoParamT *ar2VideoOpen( char *config_in ) { char video1394devname [128]; *************** *** 288,292 **** ARUint32 p1,p2; quadlet_t value; ! char *a, line[256]; int i; --- 288,292 ---- ARUint32 p1,p2; quadlet_t value; ! char *config *a, line[256]; int i; *************** *** 311,333 **** vid->status = 0; ! /* If no config string is supplied, we should use the environment variable otherwise set a sane default */ ! if (!strcmp (config, "")) ! { ! /* None suppplied, lets see if the user supplied one from the shell */ ! char *envconf = getenv ("ARTOOLKIT_CONFIG"); ! if ((envconf != NULL) && (strcmp (envconf, ""))) ! { ! config = envconf; ! printf ("Using config string from environment [%s]\n", config); ! } ! else ! { ! printf ("No config string supplied, assuming 640x480 with YUV411 encoding\n"); ! } ! } ! else ! printf ("Using supplied config string [%s]\n", config); ! ! a = config; if( a != NULL) { for(;;) { --- 311,331 ---- 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) { ! 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(;;) { |
|
From: Hartmut S. <ret...@us...> - 2006-09-18 05:24:09
|
Update of /cvsroot/artoolkit/artoolkit/util/videoTest In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10204/util/videoTest Modified Files: videoTest.c Log Message: V4L now also configurable through ARTOOLKIT_CONFIG Index: videoTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** videoTest.c 18 Sep 2006 04:48:34 -0000 1.9 --- videoTest.c 18 Sep 2006 05:24:06 -0000 1.10 *************** *** 28,32 **** ""; # else ! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; # endif #else --- 28,32 ---- ""; # else ! ""; # endif #else |
|
From: Hartmut S. <ret...@us...> - 2006-09-18 05:24:09
|
Update of /cvsroot/artoolkit/artoolkit/examples/simple In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10204/examples/simple Modified Files: simpleTest.c Log Message: V4L now also configurable through ARTOOLKIT_CONFIG Index: simpleTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simpleTest.c 18 Sep 2006 04:48:33 -0000 1.10 --- simpleTest.c 18 Sep 2006 05:24:05 -0000 1.11 *************** *** 28,32 **** ""; #elif defined (AR_INPUT_V4L) ! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; #elif defined (AR_INPUT_DV) ""; --- 28,32 ---- ""; #elif defined (AR_INPUT_V4L) ! ""; #elif defined (AR_INPUT_DV) ""; |
