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
52e8a0d9
Commit
52e8a0d9
authored
Jun 21, 2018
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/libopenjpeg: Support GRAY10, GRAY12 and GRAY14.
parent
78167b49
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
libopenjpegdec.c
libavcodec/libopenjpegdec.c
+1
-0
libopenjpegenc.c
libavcodec/libopenjpegenc.c
+7
-0
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/libopenjpegdec.c
View file @
52e8a0d9
...
...
@@ -45,6 +45,7 @@
AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64
#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \
AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, \
AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA16
#define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUVA420P, \
...
...
libavcodec/libopenjpegenc.c
View file @
52e8a0d9
...
...
@@ -189,6 +189,9 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
switch
(
avctx
->
pix_fmt
)
{
case
AV_PIX_FMT_GRAY8
:
case
AV_PIX_FMT_YA8
:
case
AV_PIX_FMT_GRAY10
:
case
AV_PIX_FMT_GRAY12
:
case
AV_PIX_FMT_GRAY14
:
case
AV_PIX_FMT_GRAY16
:
case
AV_PIX_FMT_YA16
:
color_space
=
OPJ_CLRSPC_GRAY
;
...
...
@@ -612,6 +615,9 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
case
AV_PIX_FMT_YUVA444P
:
cpyresult
=
libopenjpeg_copy_unpacked8
(
avctx
,
frame
,
image
);
break
;
case
AV_PIX_FMT_GRAY10
:
case
AV_PIX_FMT_GRAY12
:
case
AV_PIX_FMT_GRAY14
:
case
AV_PIX_FMT_GRAY16
:
case
AV_PIX_FMT_YUV420P9
:
case
AV_PIX_FMT_YUV422P9
:
...
...
@@ -763,6 +769,7 @@ AVCodec ff_libopenjpeg_encoder = {
AV_PIX_FMT_RGBA64
,
AV_PIX_FMT_GBR24P
,
AV_PIX_FMT_GBRP9
,
AV_PIX_FMT_GBRP10
,
AV_PIX_FMT_GBRP12
,
AV_PIX_FMT_GBRP14
,
AV_PIX_FMT_GBRP16
,
AV_PIX_FMT_GRAY8
,
AV_PIX_FMT_YA8
,
AV_PIX_FMT_GRAY16
,
AV_PIX_FMT_YA16
,
AV_PIX_FMT_GRAY10
,
AV_PIX_FMT_GRAY12
,
AV_PIX_FMT_GRAY14
,
AV_PIX_FMT_YUV420P
,
AV_PIX_FMT_YUV422P
,
AV_PIX_FMT_YUVA420P
,
AV_PIX_FMT_YUV440P
,
AV_PIX_FMT_YUV444P
,
AV_PIX_FMT_YUVA422P
,
AV_PIX_FMT_YUV411P
,
AV_PIX_FMT_YUV410P
,
AV_PIX_FMT_YUVA444P
,
...
...
libavcodec/version.h
View file @
52e8a0d9
...
...
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 20
#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