@@ -45,6 +45,7 @@ typedef struct libx265Context {
int forced_idr;
char *preset;
char *tune;
+ char *profile;
char *x265_opts;
} libx265Context;
@@ -220,6 +221,14 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
}
}
+ if (ctx->profile) {
+ if (ctx->api->param_apply_profile(ctx->params, ctx->profile) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid or incompatible profile set : %s.\n", ctx->profile);
+ av_log(avctx, AV_LOG_INFO, "Profile must match bit depth and chroma sampling of output stream.\n");
+ return AVERROR(EINVAL);
+ }
+ }
+
ctx->encoder = ctx->api->encoder_open(ctx->params);
if (!ctx->encoder) {
av_log(avctx, AV_LOG_ERROR, "Cannot open libx265 encoder.\n");
@@ -392,6 +401,7 @@ static const AVOption options[] = {
{ "forced-idr", "if forcing keyframes, force them as IDR frames", OFFSET(forced_idr),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
{ "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
+ { "x265-profile","set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
{ NULL }
};
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 6
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MICRO 103
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
Attached patch allows users to set x265 encoding profile. Addresses ticket #6894. Regards, Gyan From e45cd99804dab980d3441c0450b22c5b69b18474 Mon Sep 17 00:00:00 2001 From: Gyan Doshi <gyandoshi@gmail.com> Date: Tue, 5 Dec 2017 13:17:53 +0530 Subject: [PATCH] avcodec/libx265.c - Add named option to set profile Adds call to x265_param_apply_profile after x265_param_parse. Added as private option since HEVC profiles other than Main, Main 10 and MSP in AVCodecContext are consolidated in a single constant. --- libavcodec/libx265.c | 10 ++++++++++ libavcodec/version.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)