| Message ID | 20230805120745.216285-1-nowrep@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] lavc/vaapi_encode: Add filler_data option | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Sa, 2023-08-05 at 14:06 +0200, David Rosca wrote: > --- > libavcodec/vaapi_encode.c | 1 + > libavcodec/vaapi_encode.h | 9 ++++++++- > 2 files changed, 9 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c > index bfca315a7a..f161c76304 100644 > --- a/libavcodec/vaapi_encode.c > +++ b/libavcodec/vaapi_encode.c > @@ -1860,6 +1860,7 @@ rc_mode_found: > #if VA_CHECK_VERSION(1, 3, 0) > .quality_factor = rc_quality, > #endif > + .rc_flags.bits.disable_bit_stuffing = !ctx->filler_data, > }; > vaapi_encode_add_global_param(avctx, > VAEncMiscParameterTypeRateControl, > diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h > index a1e639f56b..a2170cb8b0 100644 > --- a/libavcodec/vaapi_encode.h > +++ b/libavcodec/vaapi_encode.h > @@ -198,6 +198,9 @@ typedef struct VAAPIEncodeContext { > // Max Frame Size > int max_frame_size; > > + // Filler Data > + int filler_data; > + > // Explicitly set RC mode (otherwise attempt to pick from > // available modes). > int explicit_rc_mode; > @@ -490,7 +493,11 @@ int ff_vaapi_encode_close(AVCodecContext *avctx); > { "max_frame_size", \ > "Maximum frame size (in bytes)",\ > OFFSET(common.max_frame_size), AV_OPT_TYPE_INT, \ > - { .i64 = 0 }, 0, INT_MAX, FLAGS } > + { .i64 = 0 }, 0, INT_MAX, FLAGS }, \ > + { "filler_data", \ > + "Enable filler data", \ > + OFFSET(common.filler_data), AV_OPT_TYPE_BOOL, \ > + { .i64 = 1 }, 0, 1, FLAGS } Could you add the description about this new option in encoders.texi ? Thanks Haihao > > #define VAAPI_ENCODE_RC_MODE(name, desc) \ > { #name, desc, 0, AV_OPT_TYPE_CONST, { .i64 = RC_MODE_ ## name }, \
diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index bfca315a7a..f161c76304 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -1860,6 +1860,7 @@ rc_mode_found: #if VA_CHECK_VERSION(1, 3, 0) .quality_factor = rc_quality, #endif + .rc_flags.bits.disable_bit_stuffing = !ctx->filler_data, }; vaapi_encode_add_global_param(avctx, VAEncMiscParameterTypeRateControl, diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index a1e639f56b..a2170cb8b0 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -198,6 +198,9 @@ typedef struct VAAPIEncodeContext { // Max Frame Size int max_frame_size; + // Filler Data + int filler_data; + // Explicitly set RC mode (otherwise attempt to pick from // available modes). int explicit_rc_mode; @@ -490,7 +493,11 @@ int ff_vaapi_encode_close(AVCodecContext *avctx); { "max_frame_size", \ "Maximum frame size (in bytes)",\ OFFSET(common.max_frame_size), AV_OPT_TYPE_INT, \ - { .i64 = 0 }, 0, INT_MAX, FLAGS } + { .i64 = 0 }, 0, INT_MAX, FLAGS }, \ + { "filler_data", \ + "Enable filler data", \ + OFFSET(common.filler_data), AV_OPT_TYPE_BOOL, \ + { .i64 = 1 }, 0, 1, FLAGS } #define VAAPI_ENCODE_RC_MODE(name, desc) \ { #name, desc, 0, AV_OPT_TYPE_CONST, { .i64 = RC_MODE_ ## name }, \