Message ID | d7f6f199-5b62-57d2-3e8b-a5362d5b53f5@gmail.com |
---|---|
State | Superseded |
Headers | show |
On Tue, 5 Dec 2017 19:46:09 +0530 Gyan Doshi <gyandoshi@gmail.com> wrote: > From 13ad80871978fe7e5837863e0e2f7b7d6b356155 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 - 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 | 9 +++++++++ > libavcodec/version.h | 2 +- > 2 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c > index 4456e300f2..4058deac1c 100644 > --- a/libavcodec/libx265.c > +++ b/libavcodec/libx265.c > @@ -45,6 +45,7 @@ typedef struct libx265Context { > int forced_idr; > char *preset; > char *tune; > + char *profile; > char *x265_opts; > } libx265Context; > > @@ -220,6 +221,13 @@ 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); Nit: change "set :" to "set:". Would it be possible to list the profiles with x265_profile_names similar to what is done for libx264?
can it list profiles and levels? On Wed, Dec 6, 2017 at 6:38 AM, Lou Logan <lou@lrcd.com> wrote: > On Tue, 5 Dec 2017 19:46:09 +0530 > Gyan Doshi <gyandoshi@gmail.com> wrote: > > > From 13ad80871978fe7e5837863e0e2f7b7d6b356155 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 - 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 | 9 +++++++++ > > libavcodec/version.h | 2 +- > > 2 files changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c > > index 4456e300f2..4058deac1c 100644 > > --- a/libavcodec/libx265.c > > +++ b/libavcodec/libx265.c > > @@ -45,6 +45,7 @@ typedef struct libx265Context { > > int forced_idr; > > char *preset; > > char *tune; > > + char *profile; > > char *x265_opts; > > } libx265Context; > > > > @@ -220,6 +221,13 @@ 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); > > Nit: change "set :" to "set:". > > Would it be possible to list the profiles with x265_profile_names > similar to what is done for libx264? > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >
On Tue, Dec 5, 2017, at 03:28 PM, Bang He wrote:
> can it list profiles and levels?
I don't know (also, too lazy to look into it). That's why I asked.
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4456e300f2..4058deac1c 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -45,6 +45,7 @@ typedef struct libx265Context { int forced_idr; char *preset; char *tune; + char *profile; char *x265_opts; } libx265Context; @@ -220,6 +221,13 @@ 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); + 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 +400,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 }, + { "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 } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d67b689142..3b5c3000be 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -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, \