Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-imgsrv
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-apps-imgsrv
Commits
b1a63b79
Commit
b1a63b79
authored
Apr 21, 2016
by
Mikhail Karpenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code to work with interframe_params_t
parent
8970cd36
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
imgsrv.c
imgsrv.c
+2
-2
No files found.
imgsrv.c
View file @
b1a63b79
...
@@ -864,12 +864,12 @@ int sendImage(struct file_set *fset, int bufferImageData, int use_Exif, int sav
...
@@ -864,12 +864,12 @@ int sendImage(struct file_set *fset, int bufferImageData, int use_Exif, int sav
/*! now let's try mmap itself */
/*! now let's try mmap itself */
/// exifIndexPointer=jpeg_start-8;
/// exifIndexPointer=jpeg_start-8;
frameParamPointer
=
jpeg_start
-
sizeof
(
struct
interframe_params_t
);
frameParamPointer
=
jpeg_start
-
sizeof
(
struct
interframe_params_t
)
+
4
;
if
(
frameParamPointer
<
0
)
if
(
frameParamPointer
<
0
)
frameParamPointer
+=
buff_size
;
frameParamPointer
+=
buff_size
;
fprintf
(
stderr
,
"frameParamPointer = 0x%x, jpeg_start = 0x%x, buff_size = 0x%x
\n
"
,
fprintf
(
stderr
,
"frameParamPointer = 0x%x, jpeg_start = 0x%x, buff_size = 0x%x
\n
"
,
frameParamPointer
,
jpeg_start
,
buff_size
);
frameParamPointer
,
jpeg_start
,
buff_size
);
memcpy
(
&
frame_params
,
(
unsigned
long
*
)
&
ccam_dma_buf
[
frameParamPointer
>>
2
],
sizeof
(
struct
interframe_params_t
));
memcpy
(
&
frame_params
,
(
unsigned
long
*
)
&
ccam_dma_buf
[
frameParamPointer
>>
2
],
sizeof
(
struct
interframe_params_t
)
-
4
);
jpeg_len
=
frame_params
.
frame_length
;
jpeg_len
=
frame_params
.
frame_length
;
color_mode
=
frame_params
.
color
;
color_mode
=
frame_params
.
color
;
if
(
frame_params
.
signffff
!=
0xffff
)
{
if
(
frame_params
.
signffff
!=
0xffff
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment