Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
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
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
81667608
Unverified
Commit
81667608
authored
Mar 30, 2023
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/j2kenc: Fix funky bpno errors on decoding
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
0adb3753
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
16 deletions
+15
-16
j2kenc.c
libavcodec/j2kenc.c
+1
-2
vsynth1-jpeg2000-97
tests/ref/vsynth/vsynth1-jpeg2000-97
+2
-2
vsynth2-jpeg2000
tests/ref/vsynth/vsynth2-jpeg2000
+2
-2
vsynth2-jpeg2000-97
tests/ref/vsynth/vsynth2-jpeg2000-97
+2
-2
vsynth3-jpeg2000
tests/ref/vsynth/vsynth3-jpeg2000
+2
-2
vsynth3-jpeg2000-97
tests/ref/vsynth/vsynth3-jpeg2000-97
+2
-2
vsynth_lena-jpeg2000
tests/ref/vsynth/vsynth_lena-jpeg2000
+2
-2
vsynth_lena-jpeg2000-97
tests/ref/vsynth/vsynth_lena-jpeg2000-97
+2
-2
No files found.
libavcodec/j2kenc.c
View file @
81667608
...
...
@@ -721,11 +721,10 @@ static void encode_cblk(Jpeg2000EncoderContext *s, Jpeg2000T1Context *t1, Jpeg20
if
(
max
==
0
){
cblk
->
nonzerobits
=
0
;
bpno
=
0
;
}
else
{
cblk
->
nonzerobits
=
av_log2
(
max
)
+
1
-
NMSEDEC_FRACBITS
;
bpno
=
cblk
->
nonzerobits
-
1
;
}
bpno
=
cblk
->
nonzerobits
-
1
;
cblk
->
data
[
0
]
=
0
;
ff_mqc_initenc
(
&
t1
->
mqc
,
cblk
->
data
+
1
);
...
...
tests/ref/vsynth/vsynth1-jpeg2000-97
View file @
81667608
e4d03b2e3c03e56c7f831b1e662c4031
*tests/data/fate/vsynth1-jpeg2000-97.avi
3643
928
tests/data/fate/vsynth1-jpeg2000-97.avi
5e6d32b7205d31245b0d1f015d08b515
*tests/data/fate/vsynth1-jpeg2000-97.avi
3643
886
tests/data/fate/vsynth1-jpeg2000-97.avi
a2262f1da2f49bc196b780a6b47ec4e8 *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
stddev: 4.23 PSNR: 35.59 MAXDIFF: 53 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-jpeg2000
View file @
81667608
8c8a68ca748190c71b3ea43e5ab7f502
*tests/data/fate/vsynth2-jpeg2000.avi
15387
36
tests/data/fate/vsynth2-jpeg2000.avi
bfe90391779a02319aab98b06dd18e6c
*tests/data/fate/vsynth2-jpeg2000.avi
15387
24
tests/data/fate/vsynth2-jpeg2000.avi
64fadc87447268cf90503cb294db7f61 *tests/data/fate/vsynth2-jpeg2000.out.rawvideo
stddev: 4.91 PSNR: 34.29 MAXDIFF: 55 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth2-jpeg2000-97
View file @
81667608
c8f76055f59804ca72dbd66eb4db83a2
*tests/data/fate/vsynth2-jpeg2000-97.avi
246413
8
tests/data/fate/vsynth2-jpeg2000-97.avi
aa5573136c54b1855d8d00efe2a149bd
*tests/data/fate/vsynth2-jpeg2000-97.avi
246413
4
tests/data/fate/vsynth2-jpeg2000-97.avi
1f63c8b065e847e4c63d57ce23442ea8 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
stddev: 3.21 PSNR: 37.99 MAXDIFF: 26 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth3-jpeg2000
View file @
81667608
776bf3234cbf25002f129b89baab42ea
*tests/data/fate/vsynth3-jpeg2000.avi
67
400
tests/data/fate/vsynth3-jpeg2000.avi
1d039969504abdc143b410f99b5f9171
*tests/data/fate/vsynth3-jpeg2000.avi
67
354
tests/data/fate/vsynth3-jpeg2000.avi
098f5980667e1fcd50452b1dc1a74f61 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo
stddev: 5.47 PSNR: 33.36 MAXDIFF: 48 bytes: 86700/ 86700
tests/ref/vsynth/vsynth3-jpeg2000-97
View file @
81667608
cd023db503f03ef72dd83e4617a90c7b
*tests/data/fate/vsynth3-jpeg2000-97.avi
85
60
6 tests/data/fate/vsynth3-jpeg2000-97.avi
522e12684aca4262a9d613cb2db7006c
*tests/data/fate/vsynth3-jpeg2000-97.avi
85
52
6 tests/data/fate/vsynth3-jpeg2000-97.avi
8def36ad1413ab3a5c2af2e1af4603f9 *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo
stddev: 4.51 PSNR: 35.04 MAXDIFF: 47 bytes: 86700/ 86700
tests/ref/vsynth/vsynth_lena-jpeg2000
View file @
81667608
b8aaa45236f77a2a626791d462fd8ac1
*tests/data/fate/vsynth_lena-jpeg2000.avi
118888
6
tests/data/fate/vsynth_lena-jpeg2000.avi
51f061731d7fb987ff4e71789785225e
*tests/data/fate/vsynth_lena-jpeg2000.avi
118888
2
tests/data/fate/vsynth_lena-jpeg2000.avi
39a2c5b61cd0cf2821c6fb4cceba2fa8 *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo
stddev: 4.30 PSNR: 35.45 MAXDIFF: 45 bytes: 7603200/ 7603200
tests/ref/vsynth/vsynth_lena-jpeg2000-97
View file @
81667608
b2d9525433c6300674f504922d762437
*tests/data/fate/vsynth_lena-jpeg2000-97.avi
19372
32
tests/data/fate/vsynth_lena-jpeg2000-97.avi
80fe872c8afaad914da6ef037957d93b
*tests/data/fate/vsynth_lena-jpeg2000-97.avi
19372
16
tests/data/fate/vsynth_lena-jpeg2000-97.avi
1b97333a8dc115a5ba609b0070d89d4d *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
stddev: 2.82 PSNR: 39.10 MAXDIFF: 24 bytes: 7603200/ 7603200
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