virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

lavc: add support for OpenJPEG 2.3.0

Browse Source 
Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
This commit is contained in:
Michael Bradshaw 2017-10-04 15:37:11 -07:00
parent d96d65dfeb
commit 41d6d62702
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -1930,6 +1930,7 @@ HEADERS_LIST="
machine_ioctl_meteor_h machine_ioctl_meteor_h
malloc_h malloc_h
opencv2_core_core_c_h opencv2_core_core_c_h
openjpeg_2_3_openjpeg_h
openjpeg_2_2_openjpeg_h openjpeg_2_2_openjpeg_h
openjpeg_2_1_openjpeg_h openjpeg_2_1_openjpeg_h
openjpeg_2_0_openjpeg_h openjpeg_2_0_openjpeg_h
@ -5950,7 +5951,9 @@ enabled libopencv && { check_header opencv2/core/core_c.h &&
require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
enabled libopenjpeg && { { check_lib libopenjpeg openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } || enabled libopenjpeg && { { check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
check_lib libopenjpeg openjpeg-2.3/openjpeg.h opj_version -lopenjp2 ||
{ 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.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 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 || check_lib libopenjpeg openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||

8
libavcodec/libopenjpegdec.c
View File

@ -34,7 +34,9 @@
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
#if HAVE_OPENJPEG_2_2_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H
# include <openjpeg-2.3/openjpeg.h>
#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
# include <openjpeg-2.2/openjpeg.h> # include <openjpeg-2.2/openjpeg.h>
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h> # include <openjpeg-2.1/openjpeg.h>
@ -46,7 +48,7 @@
# include <openjpeg.h> # include <openjpeg.h>
#endif #endif
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
# define OPENJPEG_MAJOR_VERSION 2 # define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x # define OPJ(x) OPJ_##x
#else #else
@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
opj_stream_set_read_function(stream, stream_read); opj_stream_set_read_function(stream, stream_read);
opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_skip_function(stream, stream_skip);
opj_stream_set_seek_function(stream, stream_seek); opj_stream_set_seek_function(stream, stream_seek);
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
opj_stream_set_user_data(stream, &reader, NULL); opj_stream_set_user_data(stream, &reader, NULL);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data(stream, &reader); opj_stream_set_user_data(stream, &reader);

10
libavcodec/libopenjpegenc.c
View File

@ -32,7 +32,9 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#if HAVE_OPENJPEG_2_2_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H
# include <openjpeg-2.3/openjpeg.h>
#elif HAVE_OPENJPEG_2_2_OPENJPEG_H
# include <openjpeg-2.2/openjpeg.h> # include <openjpeg-2.2/openjpeg.h>
#elif HAVE_OPENJPEG_2_1_OPENJPEG_H #elif HAVE_OPENJPEG_2_1_OPENJPEG_H
# include <openjpeg-2.1/openjpeg.h> # include <openjpeg-2.1/openjpeg.h>
@ -44,7 +46,7 @@
# include <openjpeg.h> # include <openjpeg.h>
#endif #endif
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
# define OPENJPEG_MAJOR_VERSION 2 # define OPENJPEG_MAJOR_VERSION 2
# define OPJ(x) OPJ_##x # define OPJ(x) OPJ_##x
#else #else
@ -307,7 +309,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
opj_set_default_encoder_parameters(&ctx->enc_params); opj_set_default_encoder_parameters(&ctx->enc_params);
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
switch (ctx->cinema_mode) { switch (ctx->cinema_mode) {
case OPJ_CINEMA2K_24: case OPJ_CINEMA2K_24:
ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K; ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
@ -771,7 +773,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
opj_stream_set_write_function(stream, stream_write); opj_stream_set_write_function(stream, stream_write);
opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_skip_function(stream, stream_skip);
opj_stream_set_seek_function(stream, stream_seek); opj_stream_set_seek_function(stream, stream_seek);
#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H #if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
opj_stream_set_user_data(stream, &writer, NULL); opj_stream_set_user_data(stream, &writer, NULL);
#elif HAVE_OPENJPEG_2_0_OPENJPEG_H #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
opj_stream_set_user_data(stream, &writer); opj_stream_set_user_data(stream, &writer);