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
613cbf31
Commit
613cbf31
authored
Dec 27, 2011
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some 1bit png samples, they can be palettised.
Fixes ticket #767.
parent
440e984b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
2 deletions
+19
-2
pngdec.c
libavcodec/pngdec.c
+19
-2
No files found.
libavcodec/pngdec.c
View file @
613cbf31
...
@@ -494,10 +494,10 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -494,10 +494,10 @@ static int decode_frame(AVCodecContext *avctx,
}
else
if
(
s
->
bit_depth
==
16
&&
}
else
if
(
s
->
bit_depth
==
16
&&
s
->
color_type
==
PNG_COLOR_TYPE_RGB
)
{
s
->
color_type
==
PNG_COLOR_TYPE_RGB
)
{
avctx
->
pix_fmt
=
PIX_FMT_RGB48BE
;
avctx
->
pix_fmt
=
PIX_FMT_RGB48BE
;
}
else
if
(
s
->
bit_depth
==
1
)
{
avctx
->
pix_fmt
=
PIX_FMT_MONOBLACK
;
}
else
if
(
s
->
color_type
==
PNG_COLOR_TYPE_PALETTE
)
{
}
else
if
(
s
->
color_type
==
PNG_COLOR_TYPE_PALETTE
)
{
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
avctx
->
pix_fmt
=
PIX_FMT_PAL8
;
}
else
if
(
s
->
bit_depth
==
1
)
{
avctx
->
pix_fmt
=
PIX_FMT_MONOBLACK
;
}
else
if
(
s
->
bit_depth
==
8
&&
}
else
if
(
s
->
bit_depth
==
8
&&
s
->
color_type
==
PNG_COLOR_TYPE_GRAY_ALPHA
)
{
s
->
color_type
==
PNG_COLOR_TYPE_GRAY_ALPHA
)
{
avctx
->
pix_fmt
=
PIX_FMT_GRAY8A
;
avctx
->
pix_fmt
=
PIX_FMT_GRAY8A
;
...
@@ -609,6 +609,23 @@ static int decode_frame(AVCodecContext *avctx,
...
@@ -609,6 +609,23 @@ static int decode_frame(AVCodecContext *avctx,
}
}
exit_loop:
exit_loop:
if
(
s
->
bits_per_pixel
==
1
&&
s
->
color_type
==
PNG_COLOR_TYPE_PALETTE
){
int
i
,
j
;
uint8_t
*
pd
=
s
->
current_picture
->
data
[
0
];
for
(
j
=
0
;
j
<
s
->
height
;
j
++
)
{
for
(
i
=
s
->
width
/
8
-
1
;
i
>=
0
;
i
--
)
{
pd
[
8
*
i
+
7
]
=
pd
[
i
]
&
1
;
pd
[
8
*
i
+
6
]
=
(
pd
[
i
]
>>
1
)
&
1
;
pd
[
8
*
i
+
5
]
=
(
pd
[
i
]
>>
2
)
&
1
;
pd
[
8
*
i
+
4
]
=
(
pd
[
i
]
>>
3
)
&
1
;
pd
[
8
*
i
+
3
]
=
(
pd
[
i
]
>>
4
)
&
1
;
pd
[
8
*
i
+
2
]
=
(
pd
[
i
]
>>
5
)
&
1
;
pd
[
8
*
i
+
1
]
=
(
pd
[
i
]
>>
6
)
&
1
;
pd
[
8
*
i
+
0
]
=
pd
[
i
]
>>
7
;
}
pd
+=
s
->
image_linesize
;
}
}
if
(
s
->
bits_per_pixel
==
2
){
if
(
s
->
bits_per_pixel
==
2
){
int
i
,
j
;
int
i
,
j
;
uint8_t
*
pd
=
s
->
current_picture
->
data
[
0
];
uint8_t
*
pd
=
s
->
current_picture
->
data
[
0
];
...
...
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