Commit fa0a09c9 authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files

Merge branch 'framepars'

parents d589ff4f e029dc0d

.gitignore

+10 −4
Original line number Diff line number Diff line 
html/*

.project

.cproject

.externalToolBuilders

.settings
 
attic/*

/.project

/.cproject

/.pydevproject

/.externalToolBuilders

/.settings

.directory

generated*

sysroots

bitbake-logs
 
 No newline at end of file

Makefile

+15 −7
Original line number Diff line number Diff line 
PROGS      = camogm

PHPFILES   = camogmstate.php

PHPSCRIPTS = camogmstate.php

CONFIGS    = qt_source



SRCS = camogm.c camogm_ogm.c camogm_jpeg.c camogm_mov.c camogm_kml.c camogm_read.c index_list.c
@@ -8,6 +8,11 @@ OBJS = $(SRCS:.c=.o) 
CFLAGS    += -Wall -I$(STAGING_KERNEL_DIR)/include/elphel -I$(STAGING_DIR_HOST)/usr/include-uapi

LDLIBS    += -logg -pthread -lm



INSTALL    = install

INSTMODE   = 0755

INSTDOCS   = 0644

OWN        = -o root -g root



SYSCONFDIR = /etc/

BINDIR     = /usr/bin/

WWW_PAGES  = /www/pages
@@ -17,12 +22,15 @@ all: $(PROGS) 
$(PROGS): $(OBJS)

	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@



install: 

	install -d $(DESTDIR)$(BINDIR)

	install -m 0755 -t $(DESTDIR)$(BINDIR) $(PROGS)

	install -d $(DESTDIR)$(SYSCONFDIR)

	install -m 0644 -t $(DESTDIR)$(SYSCONFDIR) $(CONFIGS)

install: $(PROGS) $(PHPSCRIPTS) $(CONFIGS)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(BINDIR)

	$(INSTALL) $(OWN) -m $(INSTMODE) $(PROGS)      $(DESTDIR)$(BINDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(SYSCONFDIR)

	$(INSTALL) $(OWN) -m $(INSTDOCS) $(CONFIGS)    $(DESTDIR)$(SYSCONFDIR)

	$(INSTALL) $(OWN) -d $(DESTDIR)$(WWW_PAGES)

	$(INSTALL) $(OWN) -m $(INSTMODE) $(PHPSCRIPTS) $(DESTDIR)$(WWW_PAGES)



clean:

	rm -rf $(PROGS) *.o *~

	
#TODO: implement automatic dependencies!

camogm.c:$(STAGING_DIR_HOST)/usr/include-uapi/elphel/x393_devices.h

camogm.c

+23 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


/** @brief Default debug level */

#define DEFAULT_DEBUG_LVL         6

/** @brief JPEG trailer syze in bytes */

/** @brief JPEG trailer size in bytes */

#define TRAILER_SIZE              0x02

/** @brief Default segment duration in seconds */

#define DEFAULT_DURATION          600
@@ -64,6 +64,7 @@ 


char trailer[TRAILER_SIZE] = { 0xff, 0xd9 };



#if 0

const char *exifFileNames[] = { "/dev/exif_exif0", "/dev/exif_exif1",

                                "/dev/exif_exif2", "/dev/exif_exif3"

};
@@ -77,6 +78,21 @@ const char *ctlFileNames[] = { "/dev/frameparsall0", "/dev/frameparsall1", 
const char *circbufFileNames[] = {"/dev/circbuf0", "/dev/circbuf1",

                                "/dev/circbuf2", "/dev/circbuf3"

};

#else

const char *exifFileNames[] = { DEV393_PATH(DEV393_EXIF0), DEV393_PATH(DEV393_EXIF1),

                                DEV393_PATH(DEV393_EXIF2), DEV393_PATH(DEV393_EXIF3)

};



const char *headFileNames[] = { DEV393_PATH(DEV393_JPEGHEAD0), DEV393_PATH(DEV393_JPEGHEAD1),

                                DEV393_PATH(DEV393_JPEGHEAD2), DEV393_PATH(DEV393_JPEGHEAD3)

};

const char *ctlFileNames[] = {  DEV393_PATH(DEV393_FRAMEPARS0), DEV393_PATH(DEV393_FRAMEPARS1),

                                DEV393_PATH(DEV393_FRAMEPARS2), DEV393_PATH(DEV393_FRAMEPARS3)

};

const char *circbufFileNames[] = {DEV393_PATH(DEV393_CIRCBUF0), DEV393_PATH(DEV393_CIRCBUF1),

                                  DEV393_PATH(DEV393_CIRCBUF2), DEV393_PATH(DEV393_CIRCBUF3)

};

#endif



int lastDaemonBit[SENSOR_PORTS] = {DAEMON_BIT_CAMOGM};

struct framepars_all_t   *frameParsAll[SENSOR_PORTS];

camogm.h

+4 −2
Original line number Diff line number Diff line
@@ -21,10 +21,12 @@ 


#include <pthread.h>

#include <stdbool.h>

#include <exifa.h>

#include <c313a.h>

#include <ogg/ogg.h>

#include "ogmstreams.h"

#include <elphel/exifa.h>

#include <elphel/c313a.h>

#include <elphel/x393_devices.h>





#define CAMOGM_FRAME_NOT_READY    1        ///< frame pointer valid, but not yet acquired

#define CAMOGM_FRAME_INVALID      2        ///< invalid frame pointer

eclipse_project_setup/.cproject

+42 −25
Original line number Diff line number Diff line
@@ -5,45 +5,62 @@ 
			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.531211255" moduleId="org.eclipse.cdt.core.settings" name="Default">

				<externalSettings/>

				<extensions>

					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>

					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

				</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.531211255" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.531211255" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

					<folderInfo id="0.531211255." name="/" resourcePath="">

						<toolChain id="cdt.managedbuild.toolchain.gnu.base.975445528" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">

							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1160083683" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>

							<builder arguments="apps-camogm" cleanBuildTarget="-c clean -f" command="${workspace_loc:/elphel-apps-camogm/run_bitbake.sh}" enableCleanBuild="false" id="cdt.managedbuild.target.gnu.builder.base.1606892613" incrementalBuildTarget="-c compile -f" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>

							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1444842340" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>

							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.834332499" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">

								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2002029678" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>

							</tool>

							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1507138643" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">

								<option id="gnu.c.compiler.option.include.paths.1604866480" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/elphel}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/ogg}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393-tcbootstrap/usr/include/linux}&quot;"/>

						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.471666557" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.471666557.433608340" name=""/>

							<builder arguments="apps-camogm" command="${workspace_loc:/elphel-apps-imgsrv/run_bitbake.sh}" enableAutoBuild="false" enableCleanBuild="false" id="org.eclipse.cdt.build.core.settings.default.builder.1922841623" incrementalBuildTarget="-c compile -f" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.702004608" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.1963286915" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.603462095" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">

									<listOptionValue builtIn="false" value="__GNUC__=1"/>

									<listOptionValue builtIn="false" value="&quot;size_t=unsigned int&quot;"/>

								</option>

								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.228426573" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.574933238" 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 id="cdt.managedbuild.tool.gnu.c.linker.base.1499447246" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>

							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.25167668" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">

								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.42615210" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">

									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

									<additionalInput kind="additionalinput" paths="$(LIBS)"/>

								</inputType>

							<tool id="org.eclipse.cdt.build.core.settings.holder.1479459009" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1243255488" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">

									<listOptionValue builtIn="false" value="__GNUC__=1"/>

									<listOptionValue builtIn="false" value="&quot;size_t=unsigned int&quot;"/>

								</option>

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.854106261" 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 id="cdt.managedbuild.tool.gnu.assembler.base.735143317" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">

								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.308294150" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.910595191" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1738165492" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" useByScannerDiscovery="false" valueType="includePath">

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/ogg}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/linux/source/include/uapi/elphel}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/linux}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/c++/5.3.0/}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/c++/5.3.0/tr1/}&quot;"/>

									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/linux-elphel/sysroots/elphel393/usr/include/c++/5.3.0/arm-poky-linux-gnueabi/}&quot;"/>

								</option>

								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1301792307" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">

									<listOptionValue builtIn="false" value="__GNUC__=1"/>

									<listOptionValue builtIn="false" value="&quot;size_t=unsigned int&quot;"/>

								</option>

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1943978810" 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"/>

							</tool>

						</toolChain>

					</folderInfo>

					<fileInfo id="0.531211255.880371970" name="camogm.c" rcbsApplicability="disable" resourcePath="camogm.c" toolsToInvoke="org.eclipse.cdt.build.core.settings.holder.910595191.1163900395">

						<tool id="org.eclipse.cdt.build.core.settings.holder.910595191.1163900395" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder.1963286915">

							<option id="org.eclipse.cdt.build.core.settings.holder.symbols.822557485" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">

								<listOptionValue builtIn="false" value="__GNUC__=1"/>

								<listOptionValue builtIn="false" value="&quot;size_t=unsigned int&quot;"/>

							</option>

							<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.233015460" 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"/>

						</tool>

					</fileInfo>

				</configuration>

			</storageModule>

			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
@@ -64,7 +81,7 @@ 
	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

	<storageModule moduleId="refreshScope" versionNumber="2">

		<configuration configurationName="Default">

			<resource resourceType="PROJECT" workspacePath="/elphel-apps-camogm"/>

			<resource resourceType="PROJECT" workspacePath="/camogm"/>

		</configuration>

	</storageModule>

	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings">