Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cmp_tool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dominik Loidolt
cmp_tool
Commits
b8829a8f
Commit
b8829a8f
authored
1 year ago
by
Dominik Loidolt
Browse files
Options
Downloads
Patches
Plain Diff
Change subservice for SST_FCx_S_BACKGROUND_VALUES form 3 to 25 TBC!
parent
6187310c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!26
Adapt cmp_tool to the chunk decompression
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/common/cmp_data_types.c
+2
-5
2 additions, 5 deletions
lib/common/cmp_data_types.c
lib/common/cmp_data_types.h
+1
-1
1 addition, 1 deletion
lib/common/cmp_data_types.h
lib/icu_compress/cmp_icu.c
+5
-0
5 additions, 0 deletions
lib/icu_compress/cmp_icu.c
with
8 additions
and
6 deletions
lib/common/cmp_data_types.c
+
2
−
5
View file @
b8829a8f
...
@@ -405,11 +405,8 @@ enum cmp_data_type convert_subservice_to_cmp_data_type(uint8_t subservice)
...
@@ -405,11 +405,8 @@ enum cmp_data_type convert_subservice_to_cmp_data_type(uint8_t subservice)
return
DATA_TYPE_F_CAM_IMAGETTE
;
return
DATA_TYPE_F_CAM_IMAGETTE
;
case
SST_FCx_S_SCIENCE_OFFSET_VALUES
:
case
SST_FCx_S_SCIENCE_OFFSET_VALUES
:
return
DATA_TYPE_F_CAM_OFFSET
;
return
DATA_TYPE_F_CAM_OFFSET
;
/* TODO: SST_FCx_S_BACKGROUND_VALUES and SST_NCxx_S_SCIENCE_IMAGETTE has
case
SST_FCx_S_BACKGROUND_VALUES
:
* the same subservice number*/
return
DATA_TYPE_F_CAM_BACKGROUND
;
/* case SST_FCx_S_BACKGROUND_VALUES: */
/* return DATA_TYPE_F_CAM_BACKGROUND; */
/* break; */
default:
default:
return
DATA_TYPE_UNKNOWN
;
return
DATA_TYPE_UNKNOWN
;
};
};
...
...
This diff is collapsed.
Click to expand it.
lib/common/cmp_data_types.h
+
1
−
1
View file @
b8829a8f
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
/* subservice types for service 228 */
/* subservice types for service 228 */
#define SST_FCx_S_SCIENCE_IMAGETTE 1
/* Imagettes from F-camera. */
#define SST_FCx_S_SCIENCE_IMAGETTE 1
/* Imagettes from F-camera. */
#define SST_FCx_S_SCIENCE_OFFSET_VALUES 2
/* Offset values Mean of the pixels of offset windows */
#define SST_FCx_S_SCIENCE_OFFSET_VALUES 2
/* Offset values Mean of the pixels of offset windows */
#define SST_FCx_S_BACKGROUND_VALUES
3
/* Background values. Mean of the pixels of background windows */
#define SST_FCx_S_BACKGROUND_VALUES
25
/*
TBC:
Background values. Mean of the pixels of background windows */
/* size of a collection (multi entry) header */
/* size of a collection (multi entry) header */
#define COLLECTION_HDR_SIZE 12
#define COLLECTION_HDR_SIZE 12
...
...
This diff is collapsed.
Click to expand it.
lib/icu_compress/cmp_icu.c
+
5
−
0
View file @
b8829a8f
...
@@ -2479,6 +2479,11 @@ static enum chunk_type get_chunk_type(uint16_t subservice)
...
@@ -2479,6 +2479,11 @@ static enum chunk_type get_chunk_type(uint16_t subservice)
case
SST_NCxx_S_SCIENCE_L_FX_EFX_NCOB_ECOB
:
case
SST_NCxx_S_SCIENCE_L_FX_EFX_NCOB_ECOB
:
chunk_type
=
CHUNK_TYPE_LONG_CADENCE
;
chunk_type
=
CHUNK_TYPE_LONG_CADENCE
;
break
;
break
;
case
SST_FCx_S_SCIENCE_IMAGETTE
:
case
SST_FCx_S_SCIENCE_OFFSET_VALUES
:
case
SST_FCx_S_BACKGROUND_VALUES
:
chunk_type
=
CHUNK_TYPE_F_CHAIN
;
break
;
case
SST_NCxx_S_SCIENCE_F_FX
:
case
SST_NCxx_S_SCIENCE_F_FX
:
case
SST_NCxx_S_SCIENCE_F_FX_EFX
:
case
SST_NCxx_S_SCIENCE_F_FX_EFX
:
case
SST_NCxx_S_SCIENCE_F_FX_NCOB
:
case
SST_NCxx_S_SCIENCE_F_FX_NCOB
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment