RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '233d2fa0443197df12b4f7823d591dad964149b3' 

* commit '233d2fa0443197df12b4f7823d591dad964149b3':
  kvazaar: Add libkvazaar HEVC encoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 13:47:32 +01:00
parent a66243a201 233d2fa044
commit 8dde5dc05a
2 changed files with 83 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5346,7 +5346,7 @@ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
check_lib "${gsm_hdr}" gsm_create -lgsm && break; check_lib "${gsm_hdr}" gsm_create -lgsm && break;
done || die "ERROR: libgsm not found"; } done || die "ERROR: libgsm not found"; }
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.0" kvazaar.h kvz_api_get enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.1" kvazaar.h kvz_api_get
enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h" MFXInit
enabled libmodplug && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load enabled libmodplug && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame

139
libavcodec/libkvazaar.c
View File

@ -24,10 +24,13 @@
#include <string.h> #include <string.h>
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/opt.h" #include "libavutil/error.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
@ -43,35 +46,35 @@ typedef struct LibkvazaarContext {
static av_cold int libkvazaar_init(AVCodecContext *avctx) static av_cold int libkvazaar_init(AVCodecContext *avctx)
{ {
int retval = 0; LibkvazaarContext *const ctx = avctx->priv_data;
const kvz_api *const api = ctx->api = kvz_api_get(8);
kvz_config *cfg = NULL; kvz_config *cfg = NULL;
kvz_encoder *enc = NULL; kvz_encoder *enc = NULL;
const kvz_api *const api = kvz_api_get(8);
LibkvazaarContext *const ctx = avctx->priv_data; /* Kvazaar requires width and height to be multiples of eight. */
// Kvazaar requires width and height to be multiples of eight.
if (avctx->width % 8 || avctx->height % 8) { if (avctx->width % 8 || avctx->height % 8) {
av_log(avctx, AV_LOG_ERROR, "Video dimensions are not a multiple of 8.\n"); av_log(avctx, AV_LOG_ERROR,
retval = AVERROR_INVALIDDATA; "Video dimensions are not a multiple of 8 (%dx%d).\n",
goto done; avctx->width, avctx->height);
return AVERROR(ENOSYS);
} }
cfg = api->config_alloc(); ctx->config = cfg = api->config_alloc();
if (!cfg) { if (!cfg) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate kvazaar config structure.\n"); av_log(avctx, AV_LOG_ERROR,
retval = AVERROR(ENOMEM); "Could not allocate kvazaar config structure.\n");
goto done; return AVERROR(ENOMEM);
} }
if (!api->config_init(cfg)) { if (!api->config_init(cfg)) {
av_log(avctx, AV_LOG_ERROR, "Could not initialize kvazaar config structure.\n"); av_log(avctx, AV_LOG_ERROR,
retval = AVERROR_EXTERNAL; "Could not initialize kvazaar config structure.\n");
goto done; return AVERROR_BUG;
} }
cfg->width = avctx->width; cfg->width = avctx->width;
cfg->height = avctx->height; cfg->height = avctx->height;
cfg->framerate = cfg->framerate =
avctx->time_base.den / (double)(avctx->time_base.num * avctx->ticks_per_frame); avctx->time_base.den / (double)(avctx->time_base.num * avctx->ticks_per_frame);
cfg->target_bitrate = avctx->bit_rate; cfg->target_bitrate = avctx->bit_rate;
@ -84,8 +87,7 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
AVDictionaryEntry *entry = NULL; AVDictionaryEntry *entry = NULL;
while ((entry = av_dict_get(dict, "", entry, AV_DICT_IGNORE_SUFFIX))) { while ((entry = av_dict_get(dict, "", entry, AV_DICT_IGNORE_SUFFIX))) {
if (!api->config_parse(cfg, entry->key, entry->value)) { if (!api->config_parse(cfg, entry->key, entry->value)) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING, "Invalid option: %s=%s.\n",
"Invalid option: %s=%s.\n",
entry->key, entry->value); entry->key, entry->value);
} }
} }
@ -93,40 +95,51 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
} }
} }
enc = api->encoder_open(cfg); ctx->encoder = enc = api->encoder_open(cfg);
if (!enc) { if (!enc) {
av_log(avctx, AV_LOG_ERROR, "Could not open kvazaar encoder.\n"); av_log(avctx, AV_LOG_ERROR, "Could not open kvazaar encoder.\n");
retval = AVERROR_EXTERNAL; return AVERROR_BUG;
goto done;
} }
ctx->api = api; if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
ctx->encoder = enc; kvz_data_chunk *data_out = NULL;
ctx->config = cfg; kvz_data_chunk *chunk = NULL;
enc = NULL; uint32_t len_out;
cfg = NULL; uint8_t *p;
done: if (!api->encoder_headers(enc, &data_out, &len_out))
api->config_destroy(cfg); return AVERROR(ENOMEM);
api->encoder_close(enc);
return retval; avctx->extradata = p = av_mallocz(len_out + AV_INPUT_BUFFER_PADDING_SIZE);
if (!p) {
ctx->api->chunk_free(data_out);
return AVERROR(ENOMEM);
}
avctx->extradata_size = len_out;
for (chunk = data_out; chunk != NULL; chunk = chunk->next) {
memcpy(p, chunk->data, chunk->len);
p += chunk->len;
}
ctx->api->chunk_free(data_out);
}
return 0;
} }
static av_cold int libkvazaar_close(AVCodecContext *avctx) static av_cold int libkvazaar_close(AVCodecContext *avctx)
{ {
LibkvazaarContext *ctx = avctx->priv_data; LibkvazaarContext *ctx = avctx->priv_data;
if (!ctx->api) return 0;
if (ctx->encoder) { if (ctx->api) {
ctx->api->encoder_close(ctx->encoder); ctx->api->encoder_close(ctx->encoder);
ctx->encoder = NULL; ctx->api->config_destroy(ctx->config);
} }
if (ctx->config) { if (avctx->extradata)
ctx->api->config_destroy(ctx->config); av_freep(&avctx->extradata);
ctx->config = NULL;
}
return 0; return 0;
} }
@ -136,15 +149,13 @@ static int libkvazaar_encode(AVCodecContext *avctx,
const AVFrame *frame, const AVFrame *frame,
int *got_packet_ptr) int *got_packet_ptr)
{ {
int retval = 0; LibkvazaarContext *ctx = avctx->priv_data;
kvz_picture *img_in = NULL; kvz_picture *input_pic = NULL;
kvz_data_chunk *data_out = NULL;
uint32_t len_out = 0;
kvz_picture *recon_pic = NULL; kvz_picture *recon_pic = NULL;
kvz_frame_info frame_info; kvz_frame_info frame_info;
kvz_data_chunk *data_out = NULL;
LibkvazaarContext *ctx = avctx->priv_data; uint32_t len_out = 0;
int retval = 0;
*got_packet_ptr = 0; *got_packet_ptr = 0;
@ -171,14 +182,14 @@ static int libkvazaar_encode(AVCodecContext *avctx,
} }
// Allocate input picture for kvazaar. // Allocate input picture for kvazaar.
img_in = ctx->api->picture_alloc(frame->width, frame->height); input_pic = ctx->api->picture_alloc(frame->width, frame->height);
if (!img_in) { if (!input_pic) {
av_log(avctx, AV_LOG_ERROR, "Failed to allocate picture.\n"); av_log(avctx, AV_LOG_ERROR, "Failed to allocate picture.\n");
retval = AVERROR(ENOMEM); retval = AVERROR(ENOMEM);
goto done; goto done;
} }
// Copy pixels from frame to img_in. // Copy pixels from frame to input_pic.
{ {
int dst_linesizes[4] = { int dst_linesizes[4] = {
frame->width, frame->width,
@ -186,22 +197,26 @@ static int libkvazaar_encode(AVCodecContext *avctx,
frame->width / 2, frame->width / 2,
0 0
}; };
av_image_copy(img_in->data, dst_linesizes, av_image_copy(input_pic->data, dst_linesizes,
frame->data, frame->linesize, frame->data, frame->linesize,
frame->format, frame->width, frame->height); frame->format, frame->width, frame->height);
} }
img_in->pts = frame->pts; input_pic->pts = frame->pts;
} }
if (!ctx->api->encoder_encode(ctx->encoder, img_in, retval = ctx->api->encoder_encode(ctx->encoder,
input_pic,
&data_out, &len_out, &data_out, &len_out,
&recon_pic, NULL, &recon_pic, NULL,
&frame_info)) { &frame_info);
if (!retval) {
av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n"); av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n");
retval = AVERROR_EXTERNAL; retval = AVERROR_INVALIDDATA;
goto done; goto done;
} }
else
retval = 0; /* kvazaar returns 1 on success */
if (data_out) { if (data_out) {
kvz_data_chunk *chunk = NULL; kvz_data_chunk *chunk = NULL;
@ -218,14 +233,9 @@ static int libkvazaar_encode(AVCodecContext *avctx,
memcpy(avpkt->data + written, chunk->data, chunk->len); memcpy(avpkt->data + written, chunk->data, chunk->len);
written += chunk->len; written += chunk->len;
} }
*got_packet_ptr = 1;
ctx->api->chunk_free(data_out);
data_out = NULL;
avpkt->pts = recon_pic->pts; avpkt->pts = recon_pic->pts;
avpkt->dts = recon_pic->dts; avpkt->dts = recon_pic->dts;
avpkt->flags = 0; avpkt->flags = 0;
// IRAP VCL NAL unit types span the range // IRAP VCL NAL unit types span the range
// [BLA_W_LP (16), RSV_IRAP_VCL23 (23)]. // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)].
@ -233,10 +243,12 @@ static int libkvazaar_encode(AVCodecContext *avctx,
frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) { frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) {
avpkt->flags |= AV_PKT_FLAG_KEY; avpkt->flags |= AV_PKT_FLAG_KEY;
} }
*got_packet_ptr = 1;
} }
done: done:
ctx->api->picture_free(img_in); ctx->api->picture_free(input_pic);
ctx->api->picture_free(recon_pic); ctx->api->picture_free(recon_pic);
ctx->api->chunk_free(data_out); ctx->api->chunk_free(data_out);
return retval; return retval;
@ -247,10 +259,11 @@ static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}; };
#define OFFSET(x) offsetof(LibkvazaarContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "kvazaar-params", "Set kvazaar parameters as a comma-separated list of name=value pairs.", { "kvazaar-params", "Set kvazaar parameters as a comma-separated list of key=value pairs.",
offsetof(LibkvazaarContext, kvz_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, OFFSET(kvz_params), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }, { NULL },
}; };
@ -281,4 +294,6 @@ AVCodec ff_libkvazaar_encoder = {
.init = libkvazaar_init, .init = libkvazaar_init,
.encode2 = libkvazaar_encode, .encode2 = libkvazaar_encode,
.close = libkvazaar_close, .close = libkvazaar_close,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
}; };