From 6aedabc9b68cab7b65833415953e958ac2c77f80 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 17 Jul 2012 12:02:42 +0200 Subject: RTMPS protocol support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- Changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'Changelog') diff --git a/Changelog b/Changelog index de542134ac..d183a38585 100644 --- a/Changelog +++ b/Changelog @@ -35,6 +35,7 @@ version : - TechSmith Screen Codec 2 decoder - AAC encoding via libfdk-aac - Microsoft Expression Encoder Screen decoder +- RTMPS protocol support version 0.8: -- cgit v1.2.3 From 86991ce2dde3358025be134b4c7939923cd81542 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 17 Jul 2012 12:02:43 +0200 Subject: RTMPTS protocol support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- Changelog | 1 + configure | 2 ++ doc/general.texi | 1 + doc/protocols.texi | 8 ++++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rtmphttp.c | 33 +++++++++++++++++++++++++++++---- libavformat/rtmpproto.c | 27 +++++++++++++++++++++++++-- libavformat/version.h | 2 +- 9 files changed, 69 insertions(+), 7 deletions(-) (limited to 'Changelog') diff --git a/Changelog b/Changelog index d183a38585..e158b20896 100644 --- a/Changelog +++ b/Changelog @@ -36,6 +36,7 @@ version : - AAC encoding via libfdk-aac - Microsoft Expression Encoder Screen decoder - RTMPS protocol support +- RTMPTS protocol support version 0.8: diff --git a/configure b/configure index 18963ee3cd..2dd7e7f445 100755 --- a/configure +++ b/configure @@ -1547,6 +1547,8 @@ rtmps_protocol_deps="!librtmp_protocol" rtmps_protocol_select="tls_protocol" rtmpt_protocol_deps="!librtmp_protocol" rtmpt_protocol_select="ffrtmphttp_protocol" +rtmpts_protocol_deps="!librtmp_protocol" +rtmpts_protocol_select="ffrtmphttp_protocol" rtp_protocol_select="udp_protocol" sctp_protocol_deps="network netinet_sctp_h" tcp_protocol_deps="network" diff --git a/doc/general.texi b/doc/general.texi index e0228cfaf9..ccb1818b91 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -847,6 +847,7 @@ performance on systems without hardware floating point support). @item RTMPS @tab X @item RTMPT @tab X @item RTMPTE @tab E +@item RTMPTS @tab X @item RTP @tab X @item SCTP @tab X @item TCP @tab X diff --git a/doc/protocols.texi b/doc/protocols.texi index 45918221f4..aad7184126 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -262,6 +262,14 @@ The Real-Time Messaging Protocol tunneled through HTTP (RTMPT) is used for streaming multimedia content within HTTP requests to traverse firewalls. +@section rtmpts + +Real-Time Messaging Protocol tunneled through HTTPS. + +The Real-Time Messaging Protocol tunneled through HTTPS (RTMPTS) is used +for streaming multimedia content within HTTPS requests to traverse +firewalls. + @section rtmp, rtmpe, rtmps, rtmpt, rtmpte Real-Time Messaging Protocol and its variants supported through diff --git a/libavformat/Makefile b/libavformat/Makefile index abde7d8e9a..af3ebac5f6 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -354,6 +354,7 @@ OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPS_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPT_PROTOCOL) += rtmpproto.o rtmppkt.o +OBJS-$(CONFIG_RTMPTS_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6ded203f27..46b3bc7dad 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -260,6 +260,7 @@ void av_register_all(void) REGISTER_PROTOCOL (RTMP, rtmp); REGISTER_PROTOCOL (RTMPS, rtmps); REGISTER_PROTOCOL (RTMPT, rtmpt); + REGISTER_PROTOCOL (RTMPTS, rtmpts); REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (SCTP, sctp); REGISTER_PROTOCOL (TCP, tcp); diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c index febe4b31d5..9d20b40bb6 100644 --- a/libavformat/rtmphttp.c +++ b/libavformat/rtmphttp.c @@ -30,11 +30,14 @@ #include "libavutil/time.h" #include "internal.h" #include "http.h" +#include "rtmp.h" #define RTMPT_DEFAULT_PORT 80 +#define RTMPTS_DEFAULT_PORT RTMPS_DEFAULT_PORT /* protocol handler context */ typedef struct RTMP_HTTPContext { + const AVClass *class; URLContext *stream; ///< HTTP stream char host[256]; ///< hostname of the server int port; ///< port to connect (default is 80) @@ -46,6 +49,7 @@ typedef struct RTMP_HTTPContext { int initialized; ///< flag indicating when the http context is initialized int finishing; ///< flag indicating when the client closes the connection int nb_bytes_read; ///< number of bytes read since the last request + int tls; ///< use Transport Security Layer (RTMPTS) } RTMP_HTTPContext; static int rtmp_http_send_cmd(URLContext *h, const char *cmd) @@ -185,9 +189,6 @@ static int rtmp_http_open(URLContext *h, const char *uri, int flags) av_url_split(NULL, 0, NULL, 0, rt->host, sizeof(rt->host), &rt->port, NULL, 0, uri); - if (rt->port < 0) - rt->port = RTMPT_DEFAULT_PORT; - /* This is the first request that is sent to the server in order to * register a client on the server and start a new session. The server * replies with a unique id (usually a number) that is used by the client @@ -195,7 +196,15 @@ static int rtmp_http_open(URLContext *h, const char *uri, int flags) * Note: the reply doesn't contain a value for the polling interval. * A successful connect resets the consecutive index that is used * in the URLs. */ - ff_url_join(url, sizeof(url), "http", NULL, rt->host, rt->port, "/open/1"); + if (rt->tls) { + if (rt->port < 0) + rt->port = RTMPTS_DEFAULT_PORT; + ff_url_join(url, sizeof(url), "https", NULL, rt->host, rt->port, "/open/1"); + } else { + if (rt->port < 0) + rt->port = RTMPT_DEFAULT_PORT; + ff_url_join(url, sizeof(url), "http", NULL, rt->host, rt->port, "/open/1"); + } /* alloc the http context */ if ((ret = ffurl_alloc(&rt->stream, url, AVIO_FLAG_READ_WRITE, NULL)) < 0) @@ -240,6 +249,21 @@ fail: return ret; } +#define OFFSET(x) offsetof(RTMP_HTTPContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM + +static const AVOption ffrtmphttp_options[] = { + {"ffrtmphttp_tls", "Use a HTTPS tunneling connection (RTMPTS).", OFFSET(tls), AV_OPT_TYPE_INT, {0}, 0, 1, DEC}, + { NULL }, +}; + +static const AVClass ffrtmphttp_class = { + .class_name = "ffrtmphttp", + .item_name = av_default_item_name, + .option = ffrtmphttp_options, + .version = LIBAVUTIL_VERSION_INT, +}; + URLProtocol ff_ffrtmphttp_protocol = { .name = "ffrtmphttp", .url_open = rtmp_http_open, @@ -248,4 +272,5 @@ URLProtocol ff_ffrtmphttp_protocol = { .url_close = rtmp_http_close, .priv_data_size = sizeof(RTMP_HTTPContext), .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class= &ffrtmphttp_class, }; diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 07af403f50..5c40eb5517 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1111,6 +1111,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) char *old_app; uint8_t buf[2048]; int port; + AVDictionary *opts = NULL; int ret; rt->is_input = !(flags & AVIO_FLAG_WRITE); @@ -1118,7 +1119,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), s->filename); - if (!strcmp(proto, "rtmpt")) { + if (!strcmp(proto, "rtmpt") || !strcmp(proto, "rtmpts")) { + if (!strcmp(proto, "rtmpts")) + av_dict_set(&opts, "ffrtmphttp_tls", "1", 1); + /* open the http tunneling connection */ ff_url_join(buf, sizeof(buf), "ffrtmphttp", NULL, hostname, port, NULL); } else if (!strcmp(proto, "rtmps")) { @@ -1134,7 +1138,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) } if ((ret = ffurl_open(&rt->stream, buf, AVIO_FLAG_READ_WRITE, - &s->interrupt_callback, NULL)) < 0) { + &s->interrupt_callback, &opts)) < 0) { av_log(s , AV_LOG_ERROR, "Cannot open connection %s\n", buf); goto fail; } @@ -1266,6 +1270,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) return 0; fail: + av_dict_free(&opts); rtmp_close(s); return ret; } @@ -1484,3 +1489,21 @@ URLProtocol ff_rtmpt_protocol = { .flags = URL_PROTOCOL_FLAG_NETWORK, .priv_data_class = &rtmpt_class, }; + +static const AVClass rtmpts_class = { + .class_name = "rtmpts", + .item_name = av_default_item_name, + .option = rtmp_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +URLProtocol ff_rtmpts_protocol = { + .name = "rtmpts", + .url_open = rtmp_open, + .url_read = rtmp_read, + .url_write = rtmp_write, + .url_close = rtmp_close, + .priv_data_size = sizeof(RTMPContext), + .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class = &rtmpts_class, +}; diff --git a/libavformat/version.h b/libavformat/version.h index a06a7e5483..4ccb75c704 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 8 +#define LIBAVFORMAT_VERSION_MINOR 9 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- cgit v1.2.3 From 453c02f971fc7865dea396731accbcd7ab6d3728 Mon Sep 17 00:00:00 2001 From: Michael Bradshaw Date: Thu, 17 Nov 2011 16:57:09 -0700 Subject: libopenjpeg: introduce encoding support Based on FFmpeg version from commit 713a7854e06964abc8f7d015b94acbed27769d24 Signed-off-by: Luca Barbato --- Changelog | 1 + configure | 3 +- doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/libopenjpegenc.c | 437 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 7 files changed, 444 insertions(+), 4 deletions(-) create mode 100644 libavcodec/libopenjpegenc.c (limited to 'Changelog') diff --git a/Changelog b/Changelog index e158b20896..b6be51a2f9 100644 --- a/Changelog +++ b/Changelog @@ -37,6 +37,7 @@ version : - Microsoft Expression Encoder Screen decoder - RTMPS protocol support - RTMPTS protocol support +- JPEG 2000 encoding support through OpenJPEG version 0.8: diff --git a/configure b/configure index 2dd7e7f445..93a68aa568 100755 --- a/configure +++ b/configure @@ -178,7 +178,7 @@ External library support: --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no] --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no] --enable-libopencv enable video filtering via libopencv [no] - --enable-libopenjpeg enable JPEG 2000 decoding via OpenJPEG [no] + --enable-libopenjpeg enable JPEG 2000 de/encoding via OpenJPEG [no] --enable-libpulse enable Pulseaudio input via libpulse [no] --enable-librtmp enable RTMP[E] support via librtmp [no] --enable-libschroedinger enable Dirac support via libschroedinger [no] @@ -1462,6 +1462,7 @@ libopencore_amrnb_decoder_deps="libopencore_amrnb" libopencore_amrnb_encoder_deps="libopencore_amrnb" libopencore_amrwb_decoder_deps="libopencore_amrwb" libopenjpeg_decoder_deps="libopenjpeg" +libopenjpeg_encoder_deps="libopenjpeg" libschroedinger_decoder_deps="libschroedinger" libschroedinger_encoder_deps="libschroedinger" libspeex_decoder_deps="libspeex" diff --git a/doc/general.texi b/doc/general.texi index ccb1818b91..38916de79d 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -372,7 +372,7 @@ following image formats are supported: @tab Digital Picture Exchange @item JPEG @tab X @tab X @tab Progressive JPEG is not supported. -@item JPEG 2000 @tab @tab E +@item JPEG 2000 @tab E @tab E @tab decoding supported through external library libopenjpeg @item JPEG-LS @tab X @tab X @item LJPEG @tab X @tab diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fad050e7e6..2cc02b179f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -612,6 +612,7 @@ OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o +OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \ libschroedinger.o OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 1a020c0edb..be67020f2b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -388,7 +388,7 @@ void avcodec_register_all(void) REGISTER_ENCODER (LIBMP3LAME, libmp3lame); REGISTER_ENCDEC (LIBOPENCORE_AMRNB, libopencore_amrnb); REGISTER_DECODER (LIBOPENCORE_AMRWB, libopencore_amrwb); - REGISTER_DECODER (LIBOPENJPEG, libopenjpeg); + REGISTER_ENCDEC (LIBOPENJPEG, libopenjpeg); REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger); REGISTER_ENCDEC (LIBSPEEX, libspeex); REGISTER_ENCODER (LIBTHEORA, libtheora); diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c new file mode 100644 index 0000000000..6a9e138cc8 --- /dev/null +++ b/libavcodec/libopenjpegenc.c @@ -0,0 +1,437 @@ +/* + * JPEG 2000 encoding support via OpenJPEG + * Copyright (c) 2011 Michael Bradshaw + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** +* @file +* JPEG 2000 encoder using libopenjpeg +*/ + +#define OPJ_STATIC +#include + +#include "libavutil/opt.h" +#include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" +#include "avcodec.h" +#include "internal.h" + +typedef struct { + AVClass *avclass; + opj_image_t *image; + opj_cparameters_t enc_params; + opj_cinfo_t *compress; + opj_event_mgr_t event_mgr; + int format; + int profile; + int prog_order; + int cinema_mode; + int numresolution; + int numlayers; + int disto_alloc; + int fixed_alloc; + int fixed_quality; +} LibOpenJPEGContext; + +static void error_callback(const char *msg, void *data) +{ + av_log(data, AV_LOG_ERROR, "%s\n", msg); +} + +static void warning_callback(const char *msg, void *data) +{ + av_log(data, AV_LOG_WARNING, "%s\n", msg); +} + +static void info_callback(const char *msg, void *data) +{ + av_log(data, AV_LOG_DEBUG, "%s\n", msg); +} + +static opj_image_t *libopenjpeg_create_image(AVCodecContext *avctx, + opj_cparameters_t *parameters) +{ + opj_image_cmptparm_t *cmptparm; + OPJ_COLOR_SPACE color_space; + opj_image_t *img; + int i; + int sub_dx[4]; + int sub_dy[4]; + int numcomps = av_pix_fmt_descriptors[avctx->pix_fmt].nb_components; + + sub_dx[0] = sub_dx[3] = 1; + sub_dy[0] = sub_dy[3] = 1; + sub_dx[1] = sub_dx[2] = + 1 << av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_w; + sub_dy[1] = sub_dy[2] = + 1 << av_pix_fmt_descriptors[avctx->pix_fmt].log2_chroma_h; + + + switch (avctx->pix_fmt) { + case PIX_FMT_GRAY8: + case PIX_FMT_GRAY16: + case PIX_FMT_Y400A: + color_space = CLRSPC_GRAY; + break; + case PIX_FMT_RGB24: + case PIX_FMT_RGBA: + case PIX_FMT_RGB48: + color_space = CLRSPC_SRGB; + break; + case PIX_FMT_YUV410P: + case PIX_FMT_YUV411P: + case PIX_FMT_YUV420P: + case PIX_FMT_YUV422P: + case PIX_FMT_YUV440P: + case PIX_FMT_YUV444P: + case PIX_FMT_YUVA420P: + case PIX_FMT_YUV420P9: + case PIX_FMT_YUV422P9: + case PIX_FMT_YUV444P9: + case PIX_FMT_YUV420P10: + case PIX_FMT_YUV422P10: + case PIX_FMT_YUV444P10: + case PIX_FMT_YUV420P16: + case PIX_FMT_YUV422P16: + case PIX_FMT_YUV444P16: + color_space = CLRSPC_SYCC; + break; + default: + av_log(avctx, AV_LOG_ERROR, + "The requested pixel format '%s' is not supported\n", + av_get_pix_fmt_name(avctx->pix_fmt)); + return NULL; + } + + cmptparm = av_mallocz(numcomps * sizeof(*cmptparm)); + if (!cmptparm) { + av_log(avctx, AV_LOG_ERROR, "Not enough memory"); + return NULL; + } + + for (i = 0; i < numcomps; i++) { + cmptparm[i].prec = + av_pix_fmt_descriptors[avctx->pix_fmt].comp[i].depth_minus1 + 1; + cmptparm[i].bpp = + av_pix_fmt_descriptors[avctx->pix_fmt].comp[i].depth_minus1 + 1; + cmptparm[i].sgnd = 0; + cmptparm[i].dx = sub_dx[i]; + cmptparm[i].dy = sub_dy[i]; + cmptparm[i].w = avctx->width / sub_dx[i]; + cmptparm[i].h = avctx->height / sub_dy[i]; + } + + img = opj_image_create(numcomps, cmptparm, color_space); + av_freep(&cmptparm); + return img; +} + +static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx) +{ + LibOpenJPEGContext *ctx = avctx->priv_data; + int err = AVERROR(ENOMEM); + + opj_set_default_encoder_parameters(&ctx->enc_params); + + ctx->enc_params.cp_rsiz = ctx->profile; + ctx->enc_params.mode = !!avctx->global_quality; + ctx->enc_params.cp_cinema = ctx->cinema_mode; + ctx->enc_params.prog_order = ctx->prog_order; + ctx->enc_params.numresolution = ctx->numresolution; + ctx->enc_params.cp_disto_alloc = ctx->disto_alloc; + ctx->enc_params.cp_fixed_alloc = ctx->fixed_alloc; + ctx->enc_params.cp_fixed_quality = ctx->fixed_quality; + ctx->enc_params.tcp_numlayers = ctx->numlayers; + ctx->enc_params.tcp_rates[0] = FFMAX(avctx->compression_level, 0) * 2; + + ctx->compress = opj_create_compress(ctx->format); + if (!ctx->compress) { + av_log(avctx, AV_LOG_ERROR, "Error creating the compressor\n"); + return AVERROR(ENOMEM); + } + + avctx->coded_frame = avcodec_alloc_frame(); + if (!avctx->coded_frame) { + av_log(avctx, AV_LOG_ERROR, "Error allocating coded frame\n"); + goto fail; + } + + ctx->image = libopenjpeg_create_image(avctx, &ctx->enc_params); + if (!ctx->image) { + av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n"); + err = AVERROR(EINVAL); + goto fail; + } + + ctx->event_mgr.info_handler = info_callback; + ctx->event_mgr.error_handler = error_callback; + ctx->event_mgr.warning_handler = warning_callback; + opj_set_event_mgr((opj_common_ptr)ctx->compress, &ctx->event_mgr, avctx); + + return 0; + +fail: + av_freep(&ctx->compress); + av_freep(&avctx->coded_frame); + return err; +} + +static void libopenjpeg_copy_packed8(AVCodecContext *avctx, + const AVFrame *frame, opj_image_t *image) +{ + int compno; + int x, y; + int image_index, frame_index; + const int numcomps = image->numcomps; + + for (compno = 0; compno < numcomps; ++compno) { + for (y = 0; y < avctx->height; ++y) { + image_index = y * avctx->width; + frame_index = y * frame->linesize[0] + compno; + for (x = 0; x < avctx->width; ++x) { + image->comps[compno].data[image_index++] = + frame->data[0][frame_index]; + frame_index += numcomps; + } + } + } +} + +static void libopenjpeg_copy_packed16(AVCodecContext *avctx, + const AVFrame *frame, opj_image_t *image) +{ + int compno; + int x, y; + int image_index, frame_index; + const int numcomps = image->numcomps; + uint16_t *frame_ptr = (uint16_t*)frame->data[0]; + + for (compno = 0; compno < numcomps; ++compno) { + for (y = 0; y < avctx->height; ++y) { + image_index = y * avctx->width; + frame_index = y * (frame->linesize[0] / 2) + compno; + for (x = 0; x < avctx->width; ++x) { + image->comps[compno].data[image_index++] = + frame_ptr[frame_index]; + frame_index += numcomps; + } + } + } +} + +static void libopenjpeg_copy_unpacked8(AVCodecContext *avctx, + const AVFrame *frame, opj_image_t *image) +{ + int compno; + int x, y; + int width, height; + int image_index, frame_index; + const int numcomps = image->numcomps; + + for (compno = 0; compno < numcomps; ++compno) { + width = avctx->width / image->comps[compno].dx; + height = avctx->height / image->comps[compno].dy; + for (y = 0; y < height; ++y) { + image_index = y * width; + frame_index = y * frame->linesize[compno]; + for (x = 0; x < width; ++x) { + image->comps[compno].data[image_index++] = + frame->data[compno][frame_index++]; + } + } + } +} + +static void libopenjpeg_copy_unpacked16(AVCodecContext *avctx, + const AVFrame *frame, + opj_image_t *image) +{ + int compno; + int x, y; + int width, height; + int image_index, frame_index; + const int numcomps = image->numcomps; + uint16_t *frame_ptr; + + for (compno = 0; compno < numcomps; ++compno) { + width = avctx->width / image->comps[compno].dx; + height = avctx->height / image->comps[compno].dy; + frame_ptr = (uint16_t*)frame->data[compno]; + for (y = 0; y < height; ++y) { + image_index = y * width; + frame_index = y * (frame->linesize[compno] / 2); + for (x = 0; x < width; ++x) { + image->comps[compno].data[image_index++] = + frame_ptr[frame_index++]; + } + } + } +} + +static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) +{ + LibOpenJPEGContext *ctx = avctx->priv_data; + opj_cinfo_t *compress = ctx->compress; + opj_image_t *image = ctx->image; + opj_cio_t *stream; + int ret, len; + + // x0, y0 is the top left corner of the image + // x1, y1 is the width, height of the reference grid + image->x0 = 0; + image->y0 = 0; + image->x1 = (avctx->width - 1) * ctx->enc_params.subsampling_dx + 1; + image->y1 = (avctx->height - 1) * ctx->enc_params.subsampling_dy + 1; + + switch (avctx->pix_fmt) { + case PIX_FMT_RGB24: + case PIX_FMT_RGBA: + case PIX_FMT_Y400A: + libopenjpeg_copy_packed8(avctx, frame, image); + break; + case PIX_FMT_RGB48: + libopenjpeg_copy_packed16(avctx, frame, image); + break; + case PIX_FMT_GRAY8: + case PIX_FMT_YUV410P: + case PIX_FMT_YUV411P: + case PIX_FMT_YUV420P: + case PIX_FMT_YUV422P: + case PIX_FMT_YUV440P: + case PIX_FMT_YUV444P: + case PIX_FMT_YUVA420P: + libopenjpeg_copy_unpacked8(avctx, frame, image); + break; + case PIX_FMT_GRAY16: + case PIX_FMT_YUV420P9: + case PIX_FMT_YUV422P9: + case PIX_FMT_YUV444P9: + case PIX_FMT_YUV444P10: + case PIX_FMT_YUV422P10: + case PIX_FMT_YUV420P10: + case PIX_FMT_YUV444P16: + case PIX_FMT_YUV422P16: + case PIX_FMT_YUV420P16: + libopenjpeg_copy_unpacked16(avctx, frame, image); + break; + default: + av_log(avctx, AV_LOG_ERROR, + "The frame's pixel format '%s' is not supported\n", + av_get_pix_fmt_name(avctx->pix_fmt)); + return AVERROR(EINVAL); + break; + } + + opj_setup_encoder(compress, &ctx->enc_params, image); + stream = opj_cio_open((opj_common_ptr)compress, NULL, 0); + if (!stream) { + av_log(avctx, AV_LOG_ERROR, "Error creating the cio stream\n"); + return AVERROR(ENOMEM); + } + + if (!opj_encode(compress, stream, image, NULL)) { + opj_cio_close(stream); + av_log(avctx, AV_LOG_ERROR, "Error during the opj encode\n"); + return -1; + } + + len = cio_tell(stream); + if ((ret = ff_alloc_packet(pkt, len)) < 0) { + opj_cio_close(stream); + return ret; + } + + memcpy(pkt->data, stream->buffer, len); + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + opj_cio_close(stream); + return 0; +} + +static av_cold int libopenjpeg_encode_close(AVCodecContext *avctx) +{ + LibOpenJPEGContext *ctx = avctx->priv_data; + + opj_destroy_compress(ctx->compress); + opj_image_destroy(ctx->image); + av_freep(&avctx->coded_frame); + return 0 ; +} + +#define OFFSET(x) offsetof(LibOpenJPEGContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + { "format", "Codec Format", OFFSET(format), AV_OPT_TYPE_INT, { CODEC_JP2 }, CODEC_J2K, CODEC_JP2, VE, "format" }, + { "j2k", NULL, 0, AV_OPT_TYPE_CONST, { CODEC_J2K }, 0, 0, VE, "format" }, + { "jp2", NULL, 0, AV_OPT_TYPE_CONST, { CODEC_JP2 }, 0, 0, VE, "format" }, + { "profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, { STD_RSIZ }, STD_RSIZ, CINEMA4K, VE, "profile" }, + { "jpeg2000", NULL, 0, AV_OPT_TYPE_CONST, { STD_RSIZ }, 0, 0, VE, "profile" }, + { "cinema2k", NULL, 0, AV_OPT_TYPE_CONST, { CINEMA2K }, 0, 0, VE, "profile" }, + { "cinema4k", NULL, 0, AV_OPT_TYPE_CONST, { CINEMA4K }, 0, 0, VE, "profile" }, + { "cinema_mode", "Digital Cinema", OFFSET(cinema_mode), AV_OPT_TYPE_INT, { OFF }, OFF, CINEMA4K_24, VE, "cinema_mode" }, + { "off", NULL, 0, AV_OPT_TYPE_CONST, { OFF }, 0, 0, VE, "cinema_mode" }, + { "2k_24", NULL, 0, AV_OPT_TYPE_CONST, { CINEMA2K_24 }, 0, 0, VE, "cinema_mode" }, + { "2k_48", NULL, 0, AV_OPT_TYPE_CONST, { CINEMA2K_48 }, 0, 0, VE, "cinema_mode" }, + { "4k_24", NULL, 0, AV_OPT_TYPE_CONST, { CINEMA4K_24 }, 0, 0, VE, "cinema_mode" }, + { "prog_order", "Progression Order", OFFSET(prog_order), AV_OPT_TYPE_INT, { LRCP }, LRCP, CPRL, VE, "prog_order" }, + { "lrcp", NULL, 0, AV_OPT_TYPE_CONST, { LRCP }, 0, 0, VE, "prog_order" }, + { "rlcp", NULL, 0, AV_OPT_TYPE_CONST, { RLCP }, 0, 0, VE, "prog_order" }, + { "rpcl", NULL, 0, AV_OPT_TYPE_CONST, { RPCL }, 0, 0, VE, "prog_order" }, + { "pcrl", NULL, 0, AV_OPT_TYPE_CONST, { PCRL }, 0, 0, VE, "prog_order" }, + { "cprl", NULL, 0, AV_OPT_TYPE_CONST, { CPRL }, 0, 0, VE, "prog_order" }, + { "numresolution", NULL, OFFSET(numresolution), AV_OPT_TYPE_INT, { 6 }, 1, 10, VE }, + { "numlayers", NULL, OFFSET(numlayers), AV_OPT_TYPE_INT, { 1 }, 1, 10, VE }, + { "disto_alloc", NULL, OFFSET(disto_alloc), AV_OPT_TYPE_INT, { 1 }, 0, 1, VE }, + { "fixed_alloc", NULL, OFFSET(fixed_alloc), AV_OPT_TYPE_INT, { 0 }, 0, 1, VE }, + { "fixed_quality", NULL, OFFSET(fixed_quality), AV_OPT_TYPE_INT, { 0 }, 0, 1, VE }, + { NULL }, +}; + +static const AVClass class = { + .class_name = "libopenjpeg", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_libopenjpeg_encoder = { + .name = "libopenjpeg", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_JPEG2000, + .priv_data_size = sizeof(LibOpenJPEGContext), + .init = libopenjpeg_encode_init, + .encode2 = libopenjpeg_encode_frame, + .close = libopenjpeg_encode_close, + .capabilities = 0, + .pix_fmts = (const enum PixelFormat[]){ + PIX_FMT_RGB24, PIX_FMT_RGBA, PIX_FMT_RGB48, + PIX_FMT_GRAY8, PIX_FMT_GRAY16, PIX_FMT_Y400A, + PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_YUVA420P, + PIX_FMT_YUV440P, PIX_FMT_YUV444P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUV420P9, PIX_FMT_YUV422P9, PIX_FMT_YUV444P9, + PIX_FMT_YUV420P10, PIX_FMT_YUV422P10, PIX_FMT_YUV444P10, + PIX_FMT_YUV420P16, PIX_FMT_YUV422P16, PIX_FMT_YUV444P16, + PIX_FMT_NONE + }, + .long_name = NULL_IF_CONFIG_SMALL("OpenJPEG JPEG 2000"), + .priv_class = &class, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 87c69aa04e..a3fbb74913 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,7 +27,7 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MINOR 22 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ -- cgit v1.2.3