Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
86a2602e
Commit
86a2602e
authored
Jul 01, 2013
by
Michael Niedermayer
Committed by
Luca Barbato
Jul 02, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jpeg2000: Drop unused and writeonly fields
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
ac921338
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
9 deletions
+3
-9
jpeg2000.h
libavcodec/jpeg2000.h
+0
-4
jpeg2000dec.c
libavcodec/jpeg2000dec.c
+3
-5
No files found.
libavcodec/jpeg2000.h
View file @
86a2602e
...
...
@@ -136,8 +136,6 @@ typedef struct Jpeg2000CodingStyle {
log2_cblk_height
;
// exponent of codeblock size
uint8_t
transform
;
// DWT type
uint8_t
csty
;
// coding style
uint8_t
log2_prec_width
,
log2_prec_height
;
// precinct size
uint8_t
nlayers
;
// number of layers
uint8_t
mct
;
// multiple component transformation
uint8_t
cblk_style
;
// codeblock coding style
...
...
@@ -172,7 +170,6 @@ typedef struct Jpeg2000Cblk {
}
Jpeg2000Cblk
;
// code block
typedef
struct
Jpeg2000Prec
{
uint16_t
xi0
,
yi0
;
// codeblock indexes ([xi0, xi1))
uint16_t
nb_codeblocks_width
;
uint16_t
nb_codeblocks_height
;
Jpeg2000TgtNode
*
zerobits
;
...
...
@@ -186,7 +183,6 @@ typedef struct Jpeg2000Prec {
typedef
struct
Jpeg2000Band
{
uint16_t
coord
[
2
][
2
];
// border coordinates {{x0, x1}, {y0, y1}}
uint16_t
log2_cblk_width
,
log2_cblk_height
;
uint16_t
cblknx
,
cblkny
;
float
stepsize
;
// quantization stepsize
Jpeg2000Prec
*
prec
;
}
Jpeg2000Band
;
// subband
...
...
libavcodec/jpeg2000dec.c
View file @
86a2602e
...
...
@@ -318,6 +318,9 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c)
c
->
log2_prec_widths
[
i
]
=
byte
&
0x0F
;
// precinct PPx
c
->
log2_prec_heights
[
i
]
=
(
byte
>>
4
)
&
0x0F
;
// precinct PPy
}
}
else
{
memset
(
c
->
log2_prec_widths
,
15
,
sizeof
(
c
->
log2_prec_widths
));
memset
(
c
->
log2_prec_heights
,
15
,
sizeof
(
c
->
log2_prec_heights
));
}
return
0
;
}
...
...
@@ -332,9 +335,6 @@ static int get_cod(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c,
if
(
bytestream2_get_bytes_left
(
&
s
->
g
)
<
5
)
return
AVERROR_INVALIDDATA
;
tmp
.
log2_prec_width
=
tmp
.
log2_prec_height
=
15
;
tmp
.
csty
=
bytestream2_get_byteu
(
&
s
->
g
);
// get progression order
...
...
@@ -650,8 +650,6 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s,
if
(
band
->
coord
[
0
][
0
]
==
band
->
coord
[
0
][
1
]
||
band
->
coord
[
1
][
0
]
==
band
->
coord
[
1
][
1
])
continue
;
prec
->
yi0
=
0
;
prec
->
xi0
=
0
;
nb_code_blocks
=
prec
->
nb_codeblocks_height
*
prec
->
nb_codeblocks_width
;
for
(
cblkno
=
0
;
cblkno
<
nb_code_blocks
;
cblkno
++
)
{
...
...
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