Skip to content

E
elphel-apps-imgsrv
Commit 2433f6a3 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

project setup, exif

parent 7320ec95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 377 additions and 122 deletions
eclipse_project_setup/.cproject
View file @ 2433f6a3
......@@ -16,36 +16,37 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="0.253868715" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="0.253868715" name="Default" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<folderInfo id="0.253868715." name="/" resourcePath="">
<toolChain errorParsers="" id="org.eclipse.cdt.build.core.prefbase.toolchain.1179427350" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.eclipse.cdt.build.core.prefbase.toolchain.1179427350.1398057461" name=""/>
<builder arguments="apps-imgsrv" command="${workspace_loc:/elphel-apps-imgsrv/scripts/run_bitbake.sh}" enableCleanBuild="false" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.build.core.settings.default.builder.580164057" incrementalBuildTarget="-c compile -f" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.libs.2129855326" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.745731625" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1859993711" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths"/>
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.798371956" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.incpaths.1859993711" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/elphel-apps-imgsrv/sysroots/usr/include-uapi}&quot;"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.symbols.798371956" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1"/>
<listOptionValue builtIn="true" value="__arm__=1"/>
</option>
<option id="org.eclipse.cdt.build.core.settings.holder.undef.symbols.1804718883" superClass="org.eclipse.cdt.build.core.settings.holder.undef.symbols" valueType="undefDefinedSymbols"/>
<option id="org.eclipse.cdt.build.core.settings.holder.undef.symbols.1804718883" name="Undefined Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.undef.symbols"/>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.58661368" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.1227611439" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.40980442" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/uapi/elphel}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/elphel-apps-imgsrv/sysroots/elphel393/usr/include-uapi}&quot;"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.incpaths.40980442" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/elphel-apps-imgsrv/sysroots/usr/include-uapi}&quot;"/>
</option>
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.10916844" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.symbols.10916844" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1739426241" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GCCErrorParser" id="org.eclipse.cdt.build.core.settings.holder.176385540" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1931881995" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/elphel-apps-imgsrv/sysroots/elphel393/usr/include-uapi}&quot;"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.incpaths.1931881995" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/elphel-apps-imgsrv/sysroots/usr/include-uapi}&quot;"/>
</option>
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.226200006" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.build.core.settings.holder.symbols.226200006" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1408747788" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
......
eclipse_project_setup/.project
View file @ 2433f6a3
......@@ -26,8 +26,13 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch</value>
</dictionary>
</arguments>
</buildCommand>
</buildSpec>
......
src/Exif_template.xml
View file @ 2433f6a3
......@@ -2,13 +2,15 @@
<!--
attributes:
tag - Exif tag (full tag in the camera will combine tag and group<<16
format: format (BYTE/ASCII/SHORT/LONG/RATIONAL/UNDEFINED?SLONG?SRATIONAL
count: number of values (characters in ASCII)
seq: sequence number of the variable data field (stored in a frame buffer)
If not specified - static data
dlen: length of a variable data field, stored in frame buffer
ltag: Exif_tag+(group<<16). If specified, is used by the software, while the Exif output will still have tag
SubSecTimeOriginal should go immediately after DateTimeOriginal (in the sequence numbers, not in the Exif templete)
format: format (BYTE/ASCII/SHORT/LONG/RATIONAL/UNDEFINED?SLONG?SRATIONAL
count: number of values (characters in ASCII)
seq: sequence number of the variable data field (stored in a frame buffer)
If not specified - static data. Values are used only for ordering.
dlen: length of a variable data field, stored in frame buffer
ltag: Exif_tag+(group<<16). If specified, is used by the software, while the Exif output will still have tag (not used)
function: use exif.php to provide value/size
mode: E(Exif only), T(Tiff only), B(Both). If not specified - both
SubSecTimeOriginal should go immediately after DateTimeOriginal (in the sequence numbers, not in the Exif template)
Update, June 2016: PageNumber field is used as sensor port number, HostComputer field is replaced with CameraSerialNumber and
FrameNumber field (which actually was IPTCNAA field) is replaced with standart ImageNumber field.
......@@ -31,6 +33,23 @@
<PageNumber tag="0x129" format="SHORT" count="1" seq="28" dlen="2"/>
<ExifTag tag="0x8769" format="LONG" function="EXIFTAG"/>
<GPSTag tag="0x08825" format="LONG" function="GPSTAG"/>
<!-- Tiff only -->
<NewSubfileType tag="0x00fe" format="LONG" count="1" dlen="4" mode="T">
<value> 0 </value><!-- (not reduced, not multipage, not mask) -->
</NewSubfileType>
<ImageWidth tag="0x0100" format="LONG" count="1" seq="30" dlen="4" mode="T"/>
<ImageLength tag="0x0101" format="LONG" count="1" seq="31" dlen="4" mode="T"/>
<BitsPerSample tag="0x0102" format="SHORT" count="1" seq="32" dlen="2" mode="T"/>
<PhotometricInterpretation tag="0x0106" format="SHORT" count="1" dlen="2" mode="T">
<value> 1 </value><!-- black is zero -->
</PhotometricInterpretation>
<!-- <StripOffsets tag="0x0111" format="LONG" function="STRIPOFFSETS" mode="T"/>--> <!-- offset to actual image -->
<StripOffsets tag="0x0111" format="LONG" count="1" dlen="4" mode="T"/> <!-- offset to actual image -->
<SamplesPerPixel tag="0x0115" format="SHORT" count="1" seq="33" dlen="2" mode="T">
<value> 1 </value><!-- One color per pixel, will be overwritten by driver -->
</SamplesPerPixel>
<RowsPerStrip tag="0x0116" format="SHORT" count="1" seq="34" dlen="2" mode="T"/>
<StripByteCounts tag="0x0117" format="LONG" count="1" seq="35" dlen="4" mode="T"/>
</Image>
<Photo>
<ExposureTime tag="0x829a" format="RATIONAL" seq="3" dlen="4">
......
src/exif.php
View file @ 2433f6a3
This diff is collapsed.
src/imgsrv.c
View file @ 2433f6a3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment