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
078322f3
Commit
078322f3
authored
Jun 23, 2017
by
Reino17
Committed by
Michael Bradshaw
Jun 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for LibOpenJPEG v2.2/git
Signed-off-by:
Michael Bradshaw
<
mjbshaw@google.com
>
parent
a579dbb4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
8 deletions
+15
-8
configure
configure
+4
-1
libopenjpegdec.c
libavcodec/libopenjpegdec.c
+5
-3
libopenjpegenc.c
libavcodec/libopenjpegenc.c
+6
-4
No files found.
configure
View file @
078322f3
...
...
@@ -1868,6 +1868,7 @@ HEADERS_LIST="
machine_ioctl_meteor_h
malloc_h
opencv2_core_core_c_h
openjpeg_2_2_openjpeg_h
openjpeg_2_1_openjpeg_h
openjpeg_2_0_openjpeg_h
openjpeg_1_5_openjpeg_h
...
...
@@ -5851,7 +5852,9 @@ enabled libopencv && { check_header opencv2/core/core_c.h &&
require opencv opencv2/core/core_c.h cvCreateImageHeader
-lopencv_core
-lopencv_imgproc
;
}
||
require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
;
}
enabled libopenh264
&&
require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
enabled libopenjpeg
&&
{
{
check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version
-lopenjp2
-DOPJ_STATIC
&&
add_cppflags
-DOPJ_STATIC
;
}
||
enabled libopenjpeg
&&
{
{
check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version
-lopenjp2
-DOPJ_STATIC
&&
add_cppflags
-DOPJ_STATIC
;
}
||
check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version
-lopenjp2
||
{
check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version
-lopenjp2
-DOPJ_STATIC
&&
add_cppflags
-DOPJ_STATIC
;
}
||
check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version
-lopenjp2
||
{
check_lib libopenjpeg openjpeg-2.0/openjpeg.h opj_version
-lopenjp2
-DOPJ_STATIC
&&
add_cppflags
-DOPJ_STATIC
;
}
||
{
check_lib libopenjpeg openjpeg-1.5/openjpeg.h opj_version
-lopenjpeg
-DOPJ_STATIC
&&
add_cppflags
-DOPJ_STATIC
;
}
||
...
...
libavcodec/libopenjpegdec.c
View file @
078322f3
...
...
@@ -34,7 +34,9 @@
#include "internal.h"
#include "thread.h"
#if HAVE_OPENJPEG_2_1_OPENJPEG_H
#if HAVE_OPENJPEG_2_2_OPENJPEG_H
# include <openjpeg-2.2/openjpeg.h>
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h>
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
# include <openjpeg-2.0/openjpeg.h>
...
...
@@ -44,7 +46,7 @@
# include <openjpeg.h>
#endif
#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
#if HAVE_OPENJPEG_2_
2_OPENJPEG_H || HAVE_OPENJPEG_2_
1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
# define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x
#else
...
...
@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
opj_stream_set_read_function
(
stream
,
stream_read
);
opj_stream_set_skip_function
(
stream
,
stream_skip
);
opj_stream_set_seek_function
(
stream
,
stream_seek
);
#if HAVE_OPENJPEG_2_1_OPENJPEG_H
#if HAVE_OPENJPEG_2_
2_OPENJPEG_H || HAVE_OPENJPEG_2_
1_OPENJPEG_H
opj_stream_set_user_data
(
stream
,
&
reader
,
NULL
);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data
(
stream
,
&
reader
);
...
...
libavcodec/libopenjpegenc.c
View file @
078322f3
...
...
@@ -32,7 +32,9 @@
#include "avcodec.h"
#include "internal.h"
#if HAVE_OPENJPEG_2_1_OPENJPEG_H
#if HAVE_OPENJPEG_2_2_OPENJPEG_H
# include <openjpeg-2.2/openjpeg.h>
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h>
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
# include <openjpeg-2.0/openjpeg.h>
...
...
@@ -42,7 +44,7 @@
# include <openjpeg.h>
#endif
#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
#if HAVE_OPENJPEG_2_
2_OPENJPEG_H || HAVE_OPENJPEG_2_
1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
# define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x
#else
...
...
@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
opj_set_default_encoder_parameters
(
&
ctx
->
enc_params
);
#if HAVE_OPENJPEG_2_1_OPENJPEG_H
#if HAVE_OPENJPEG_2_
2_OPENJPEG_H || HAVE_OPENJPEG_2_
1_OPENJPEG_H
switch
(
ctx
->
cinema_mode
)
{
case
OPJ_CINEMA2K_24
:
ctx
->
enc_params
.
rsiz
=
OPJ_PROFILE_CINEMA_2K
;
...
...
@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
opj_stream_set_write_function
(
stream
,
stream_write
);
opj_stream_set_skip_function
(
stream
,
stream_skip
);
opj_stream_set_seek_function
(
stream
,
stream_seek
);
#if HAVE_OPENJPEG_2_1_OPENJPEG_H
#if HAVE_OPENJPEG_2_
2_OPENJPEG_H || HAVE_OPENJPEG_2_
1_OPENJPEG_H
opj_stream_set_user_data
(
stream
,
&
writer
,
NULL
);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data
(
stream
,
&
writer
);
...
...
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