#include "avcodec.h"
#include "internal.h"
+#include "packet_internal.h"
typedef struct LibkvazaarContext {
const AVClass *class;
cfg->height = avctx->height;
if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
- if (avctx->ticks_per_frame > INT_MAX / avctx->framerate.den) {
- av_log(avctx, AV_LOG_ERROR,
- "Could not set framerate for kvazaar: integer overflow\n");
- return AVERROR(EINVAL);
- }
cfg->framerate_num = avctx->framerate.num;
- cfg->framerate_denom = avctx->time_base.den * avctx->ticks_per_frame;
+ cfg->framerate_denom = avctx->framerate.den;
} else {
if (avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) {
av_log(avctx, AV_LOG_ERROR,
cfg->target_bitrate = avctx->bit_rate;
cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
cfg->vui.sar_height = avctx->sample_aspect_ratio.den;
+ if (avctx->bit_rate) {
+ cfg->rc_algorithm = KVZ_LAMBDA;
+ }
if (ctx->kvz_params) {
AVDictionary *dict = NULL;
entry->key, entry->value);
}
}
- av_dict_free(&dict);
}
+ av_dict_free(&dict);
}
ctx->encoder = enc = api->encoder_open(cfg);
ctx->api->config_destroy(ctx->config);
}
- if (avctx->extradata)
- av_freep(&avctx->extradata);
-
return 0;
}
kvz_data_chunk *data_out = NULL;
uint32_t len_out = 0;
int retval = 0;
+ int pict_type;
*got_packet_ptr = 0;
avpkt->flags |= AV_PKT_FLAG_KEY;
}
+ switch (frame_info.slice_type) {
+ case KVZ_SLICE_I:
+ pict_type = AV_PICTURE_TYPE_I;
+ break;
+ case KVZ_SLICE_P:
+ pict_type = AV_PICTURE_TYPE_P;
+ break;
+ case KVZ_SLICE_B:
+ pict_type = AV_PICTURE_TYPE_B;
+ break;
+ default:
+ av_log(avctx, AV_LOG_ERROR, "Unknown picture type encountered.\n");
+ return AVERROR_EXTERNAL;
+ }
+
+ ff_side_data_set_encoder_stats(avpkt, frame_info.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
+
*got_packet_ptr = 1;
}
{ NULL },
};
-AVCodec ff_libkvazaar_encoder = {
+const AVCodec ff_libkvazaar_encoder = {
.name = "libkvazaar",
.long_name = NULL_IF_CONFIG_SMALL("libkvazaar H.265 / HEVC"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_HEVC,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
.pix_fmts = pix_fmts,
.priv_class = &class,
.encode2 = libkvazaar_encode,
.close = libkvazaar_close,
- .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
+ FF_CODEC_CAP_AUTO_THREADS,
.wrapper_name = "libkvazaar",
};