WIP: single threaded app (2e89b4c0) · Commits · Elphel / elphel-apps-camogm

camogm.c

+145 −137

camogm.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -100,8 +100,8 @@ typedef struct {
	int head_size[SENSOR_PORTS]; //! JPEG header size		int head_size[SENSOR_PORTS]; //! JPEG header size
	unsigned char jpegHeader[SENSOR_PORTS][JPEG_HEADER_MAXSIZE];		unsigned char jpegHeader[SENSOR_PORTS][JPEG_HEADER_MAXSIZE];
	int metadata_start;		int metadata_start;
	struct interframe_params_t frame_params;		struct interframe_params_t frame_params[SENSOR_PORTS];
	struct interframe_params_t this_frame_params;		struct interframe_params_t this_frame_params[SENSOR_PORTS];
	int jpeg_len;		int jpeg_len;
	int frame_period[SENSOR_PORTS]; //!in microseconds (1/10 of what is needed for the Ogm header)		int frame_period[SENSOR_PORTS]; //!in microseconds (1/10 of what is needed for the Ogm header)
	int width;		int width;

camogm_jpeg.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -134,6 +134,7 @@ int camogm_frame_jpeg(camogm_state *state)
	struct iovec chunks_iovec[8];		struct iovec chunks_iovec[8];
	unsigned char *split_ptr = NULL;		unsigned char *split_ptr = NULL;
	long split_cntr = 0;		long split_cntr = 0;
			int port = state->port_num;

	if (!state->rawdev_op) {		if (!state->rawdev_op) {
	l = 0;		l = 0;
	@@ -143,7 +144,7 @@ int camogm_frame_jpeg(camogm_state *state)
	l += chunks_iovec[i].iov_len;		l += chunks_iovec[i].iov_len;
	}		}

	sprintf(state->path, "%s%010ld_%06ld.jpeg", state->path_prefix, state->this_frame_params.timestamp_sec, state->this_frame_params.timestamp_usec);		sprintf(state->path, "%s%010ld_%06ld.jpeg", state->path_prefix, state->this_frame_params[port].timestamp_sec, state->this_frame_params[port].timestamp_usec);
	if (((state->ivf = open(state->path, O_RDWR \| O_CREAT, 0777))) < 0) {		if (((state->ivf = open(state->path, O_RDWR \| O_CREAT, 0777))) < 0) {
	D0(fprintf(debug_file, "Error opening %s for writing, returned %d, errno=%d\n", state->path, state->ivf, errno));		D0(fprintf(debug_file, "Error opening %s for writing, returned %d, errno=%d\n", state->path, state->ivf, errno));
	return -CAMOGM_FRAME_FILE_ERR;		return -CAMOGM_FRAME_FILE_ERR;

Original line number	Original line	Diff line number	Diff line
	@@ -226,6 +226,7 @@ unsigned long getGPValue(unsigned int port, unsigned long GPNumber);
	void setGValue(unsigned int port, unsigned long GNumber, unsigned long value);		void setGValue(unsigned int port, unsigned long GNumber, unsigned long value);
	unsigned int select_port(camogm_state *states);		unsigned int select_port(camogm_state *states);
	inline void set_chn_state(camogm_state *s, unsigned int port, unsigned int new_state);		inline void set_chn_state(camogm_state *s, unsigned int port, unsigned int new_state);
			inline int is_chn_active(camogm_state *s, unsigned int port);

	//!======================================================================================================		//!======================================================================================================
	void put_uint16(void *buf, u_int16_t val)		void put_uint16(void *buf, u_int16_t val)
	@@ -368,8 +369,8 @@ int camogm_start(camogm_state *state)
	state->frameno = 0;		state->frameno = 0;
	state->timescale = state->set_timescale; //! current timescale, default 1		state->timescale = state->set_timescale; //! current timescale, default 1
	///debug		///debug
	int * ifp = (int*)&(state->frame_params);		int * ifp = (int*)&(state->frame_params[port]);
	int * ifp_this = (int*)&(state->this_frame_params);		int * ifp_this = (int*)&(state->this_frame_params[port]);
	if (state->kml_enable) camogm_init_kml(); // do nothing		if (state->kml_enable) camogm_init_kml(); // do nothing

	if (state->format != state->set_format) {		if (state->format != state->set_format) {
	@@ -386,127 +387,132 @@ int camogm_start(camogm_state *state)
	state->max_frames = state->set_max_frames;		state->max_frames = state->set_max_frames;
	state->frames_per_chunk = state->set_frames_per_chunk;		state->frames_per_chunk = state->set_frames_per_chunk;
	state->starting = 1; //!may be already set		state->starting = 1; //!may be already set
			FOR_EACH_PORT(int, chn) {
			printf("Checking channel %d\n", chn);
	//! Check/set circbuf read pointer		//! Check/set circbuf read pointer
	D3(fprintf(debug_file, "1: state->cirbuf_rp=0x%x\n", state->cirbuf_rp[port]));		D3(fprintf(debug_file, "1: state->cirbuf_rp=0x%x\n", state->cirbuf_rp[chn]));
	if ((state->cirbuf_rp[port] < 0) \|\| (lseek(state->fd_circ[port], state->cirbuf_rp[port], SEEK_SET) < 0) \|\| (lseek(state->fd_circ[port], LSEEK_CIRC_VALID, SEEK_END) < 0 )) {		if ((state->cirbuf_rp[chn] < 0) \|\| (lseek(state->fd_circ[chn], state->cirbuf_rp[chn], SEEK_SET) < 0) \|\| (lseek(state->fd_circ[chn], LSEEK_CIRC_VALID, SEEK_END) < 0 )) {
	D3(fprintf(debug_file, "2: state->cirbuf_rp=0x%x\n", state->cirbuf_rp[port]));		D3(fprintf(debug_file, "2: state->cirbuf_rp=0x%x\n", state->cirbuf_rp[chn]));
	/* In "greedy" mode try to save as many frames from the circbuf as possible */		/* In "greedy" mode try to save as many frames from the circbuf as possible */
	state->cirbuf_rp[port] = lseek(state->fd_circ[port], state->greedy ? LSEEK_CIRC_SCND : LSEEK_CIRC_LAST, SEEK_END);		state->cirbuf_rp[chn] = lseek(state->fd_circ[chn], state->greedy ? LSEEK_CIRC_SCND : LSEEK_CIRC_LAST, SEEK_END);
	if (!state->ignore_fps) { // don't even try in ignore mode		if (!state->ignore_fps) { // don't even try in ignore mode
	if (((fp = lseek(state->fd_circ[port], LSEEK_CIRC_PREV, SEEK_END))) >= 0) state->cirbuf_rp[port] = fp; //!try to have 2 frames available for fps		if (((fp = lseek(state->fd_circ[chn], LSEEK_CIRC_PREV, SEEK_END))) >= 0) state->cirbuf_rp[chn] = fp; //!try to have 2 frames available for fps
	}		}
	state->buf_overruns[port]++;		state->buf_overruns[chn]++;
	//! file pointer here should match state->rp; so no need to do lseek(state->fd_circ,state->cirbuf_rp,SEEK_SET);		//! file pointer here should match state->rp; so no need to do lseek(state->fd_circ,state->cirbuf_rp,SEEK_SET);
	state->buf_min[port] = getGPValue(state->port_num, G_FREECIRCBUF);		state->buf_min[chn] = getGPValue(chn, G_FREECIRCBUF);

	} else {		} else {
	if (state->buf_min[port] > getGPValue(state->port_num, G_FREECIRCBUF)) state->buf_min[port] = getGPValue(state->port_num, G_FREECIRCBUF);		if (state->buf_min[chn] > getGPValue(chn, G_FREECIRCBUF)) state->buf_min[chn] = getGPValue(chn, G_FREECIRCBUF);

	}		}

Admin message