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
6fcf7adc
Commit
6fcf7adc
authored
Mar 09, 2019
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/tiff: Support decoding 16bit cmyk.
parent
4b32f8b3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
tiff.c
libavcodec/tiff.c
+16
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/tiff.c
View file @
6fcf7adc
...
...
@@ -1547,6 +1547,22 @@ again:
}
dst
+=
p
->
linesize
[
plane
];
}
}
else
if
(
s
->
photometric
==
TIFF_PHOTOMETRIC_SEPARATED
&&
s
->
avctx
->
pix_fmt
==
AV_PIX_FMT_RGBA64BE
)
{
dst
=
p
->
data
[
plane
];
for
(
i
=
0
;
i
<
s
->
height
;
i
++
)
{
for
(
j
=
0
;
j
<
s
->
width
;
j
++
)
{
uint64_t
k
=
65535
-
AV_RB16
(
dst
+
8
*
j
+
6
);
uint64_t
r
=
(
65535
-
AV_RB16
(
dst
+
8
*
j
))
*
k
;
uint64_t
g
=
(
65535
-
AV_RB16
(
dst
+
8
*
j
+
2
))
*
k
;
uint64_t
b
=
(
65535
-
AV_RB16
(
dst
+
8
*
j
+
4
))
*
k
;
AV_WB16
(
dst
+
8
*
j
,
r
*
65537
>>
32
);
AV_WB16
(
dst
+
8
*
j
+
2
,
g
*
65537
>>
32
);
AV_WB16
(
dst
+
8
*
j
+
4
,
b
*
65537
>>
32
);
AV_WB16
(
dst
+
8
*
j
+
6
,
65535
);
}
dst
+=
p
->
linesize
[
plane
];
}
}
}
...
...
libavcodec/version.h
View file @
6fcf7adc
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 47
#define LIBAVCODEC_VERSION_MICRO 10
3
#define LIBAVCODEC_VERSION_MICRO 10
4
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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