| Message ID | 1539874930-3459-1-git-send-email-hwrenx@126.com |
|---|---|
| State | Accepted |
| Commit | 9c190ad39481452a7424e65c3692c7cbf9533d84 |
| Headers | show |
On Thu, Oct 18, 2018 at 11:02 PM hwren <hwrenx@126.com> wrote: > > Signed-off-by: hwren <hwrenx@126.com> > --- > libavcodec/libxavs2.c | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > > diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c > index 2b47d0c..1152c63 100644 > --- a/libavcodec/libxavs2.c > +++ b/libavcodec/libxavs2.c > @@ -78,18 +78,18 @@ static av_cold int xavs2_init(AVCodecContext *avctx) > return AVERROR(ENOMEM); > } > > - xavs2_opt_set2("width", "%d", avctx->width); > - xavs2_opt_set2("height", "%d", avctx->height); > - xavs2_opt_set2("bframes", "%d", avctx->max_b_frames); > - xavs2_opt_set2("bitdepth", "%d", bit_depth); > - xavs2_opt_set2("log", "%d", cae->log_level); > - xavs2_opt_set2("preset", "%d", cae->preset_level); > + xavs2_opt_set2("Width", "%d", avctx->width); > + xavs2_opt_set2("Height", "%d", avctx->height); > + xavs2_opt_set2("BFrames", "%d", avctx->max_b_frames); > + xavs2_opt_set2("BitDepth", "%d", bit_depth); > + xavs2_opt_set2("Log", "%d", cae->log_level); > + xavs2_opt_set2("Preset", "%d", cae->preset_level); > > /* not the same parameter as the IntraPeriod in xavs2 log */ > - xavs2_opt_set2("intraperiod", "%d", avctx->gop_size); > + xavs2_opt_set2("IntraPeriod", "%d", avctx->gop_size); > > - xavs2_opt_set2("thread_frames", "%d", avctx->thread_count); > - xavs2_opt_set2("thread_rows", "%d", cae->lcu_row_threads); > + xavs2_opt_set2("ThreadFrames", "%d", avctx->thread_count); > + xavs2_opt_set2("ThreadRows", "%d", cae->lcu_row_threads); > > xavs2_opt_set2("OpenGOP", "%d", 1); > > @@ -109,11 +109,11 @@ static av_cold int xavs2_init(AVCodecContext *avctx) > if (avctx->bit_rate > 0) { > xavs2_opt_set2("RateControl", "%d", 1); > xavs2_opt_set2("TargetBitRate", "%"PRId64"", avctx->bit_rate); > - xavs2_opt_set2("initial_qp", "%d", cae->initial_qp); > - xavs2_opt_set2("max_qp", "%d", cae->max_qp); > - xavs2_opt_set2("min_qp", "%d", cae->min_qp); > + xavs2_opt_set2("InitialQP", "%d", cae->initial_qp); > + xavs2_opt_set2("MaxQP", "%d", cae->max_qp); > + xavs2_opt_set2("MinQP", "%d", cae->min_qp); > } else { > - xavs2_opt_set2("initial_qp", "%d", cae->qp); > + xavs2_opt_set2("InitialQP", "%d", cae->qp); > } > > Patchset LGTM, tks
diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c index 2b47d0c..1152c63 100644 --- a/libavcodec/libxavs2.c +++ b/libavcodec/libxavs2.c @@ -78,18 +78,18 @@ static av_cold int xavs2_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - xavs2_opt_set2("width", "%d", avctx->width); - xavs2_opt_set2("height", "%d", avctx->height); - xavs2_opt_set2("bframes", "%d", avctx->max_b_frames); - xavs2_opt_set2("bitdepth", "%d", bit_depth); - xavs2_opt_set2("log", "%d", cae->log_level); - xavs2_opt_set2("preset", "%d", cae->preset_level); + xavs2_opt_set2("Width", "%d", avctx->width); + xavs2_opt_set2("Height", "%d", avctx->height); + xavs2_opt_set2("BFrames", "%d", avctx->max_b_frames); + xavs2_opt_set2("BitDepth", "%d", bit_depth); + xavs2_opt_set2("Log", "%d", cae->log_level); + xavs2_opt_set2("Preset", "%d", cae->preset_level); /* not the same parameter as the IntraPeriod in xavs2 log */ - xavs2_opt_set2("intraperiod", "%d", avctx->gop_size); + xavs2_opt_set2("IntraPeriod", "%d", avctx->gop_size); - xavs2_opt_set2("thread_frames", "%d", avctx->thread_count); - xavs2_opt_set2("thread_rows", "%d", cae->lcu_row_threads); + xavs2_opt_set2("ThreadFrames", "%d", avctx->thread_count); + xavs2_opt_set2("ThreadRows", "%d", cae->lcu_row_threads); xavs2_opt_set2("OpenGOP", "%d", 1); @@ -109,11 +109,11 @@ static av_cold int xavs2_init(AVCodecContext *avctx) if (avctx->bit_rate > 0) { xavs2_opt_set2("RateControl", "%d", 1); xavs2_opt_set2("TargetBitRate", "%"PRId64"", avctx->bit_rate); - xavs2_opt_set2("initial_qp", "%d", cae->initial_qp); - xavs2_opt_set2("max_qp", "%d", cae->max_qp); - xavs2_opt_set2("min_qp", "%d", cae->min_qp); + xavs2_opt_set2("InitialQP", "%d", cae->initial_qp); + xavs2_opt_set2("MaxQP", "%d", cae->max_qp); + xavs2_opt_set2("MinQP", "%d", cae->min_qp); } else { - xavs2_opt_set2("initial_qp", "%d", cae->qp); + xavs2_opt_set2("InitialQP", "%d", cae->qp); }
Signed-off-by: hwren <hwrenx@126.com> --- libavcodec/libxavs2.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)