| Message ID | 20240213063409.2167597-1-darekm@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v5] lavc/libvpxenc: add screen-content-mode option | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | fail | Make fate failed |
On Mon, Feb 12, 2024 at 10:34 PM Dariusz Marcinkiewicz via ffmpeg-devel <ffmpeg-devel@ffmpeg.org> wrote: > > This exposes VP8E_SET_SCREEN_CONTENT_MODE option from libvpx. > > Co-authored-by: Erik Språng <sprang@webrtc.org> > Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com> > --- > doc/encoders.texi | 6 ++++++ > libavcodec/libvpxenc.c | 13 +++++++++++++ > libavcodec/version.h | 2 +- > 3 files changed, 20 insertions(+), 1 deletion(-) > lgtm. I'll submit this soon if there are no other comments. > diff --git a/doc/encoders.texi b/doc/encoders.texi > index c9fe6d6143..13a7084512 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -2237,6 +2237,12 @@ the two temporal layer 2 frames within the temporal period. > @end table > @end table > > +@item VP8-specific options > +@table @option > +@item screen-content-mode > +Screen content mode, one of: (0) off, (1) screen, (2) screen with more aggressive rate control. I swapped the ()s: 0 (off) ...
On Tue, Feb 13, 2024 at 7:26 PM James Zern <jzern@google.com> wrote: > > On Mon, Feb 12, 2024 at 10:34 PM Dariusz Marcinkiewicz via > ffmpeg-devel <ffmpeg-devel@ffmpeg.org> wrote: > > > > This exposes VP8E_SET_SCREEN_CONTENT_MODE option from libvpx. > > > > Co-authored-by: Erik Språng <sprang@webrtc.org> > > Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com> > > --- > > doc/encoders.texi | 6 ++++++ > > libavcodec/libvpxenc.c | 13 +++++++++++++ > > libavcodec/version.h | 2 +- > > 3 files changed, 20 insertions(+), 1 deletion(-) > > > > lgtm. I'll submit this soon if there are no other comments. > Applied. Thanks for the patch.
diff --git a/doc/encoders.texi b/doc/encoders.texi index c9fe6d6143..13a7084512 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2237,6 +2237,12 @@ the two temporal layer 2 frames within the temporal period. @end table @end table +@item VP8-specific options +@table @option +@item screen-content-mode +Screen content mode, one of: (0) off, (1) screen, (2) screen with more aggressive rate control. +@end table + @item VP9-specific options @table @option @item lossless diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 80988a2608..8f765f2dc4 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -121,6 +121,9 @@ typedef struct VPxEncoderContext { int *ts_layer_flags; int current_temporal_idx; + // VP8-only + int screen_content_mode; + // VP9-only int lossless; int tile_columns; @@ -164,6 +167,7 @@ static const char *const ctlidstr[] = { [VP8E_SET_MAX_INTRA_BITRATE_PCT] = "VP8E_SET_MAX_INTRA_BITRATE_PCT", [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", [VP8E_SET_TEMPORAL_LAYER_ID] = "VP8E_SET_TEMPORAL_LAYER_ID", + [VP8E_SET_SCREEN_CONTENT_MODE] = "VP8E_SET_SCREEN_CONTENT_MODE", #if CONFIG_LIBVPX_VP9_ENCODER [VP9E_SET_LOSSLESS] = "VP9E_SET_LOSSLESS", [VP9E_SET_TILE_COLUMNS] = "VP9E_SET_TILE_COLUMNS", @@ -1262,6 +1266,14 @@ static av_cold int vpx_init(AVCodecContext *avctx, #endif } #endif + if (avctx->codec_id == AV_CODEC_ID_VP8 && ctx->screen_content_mode >= 0) { + if (ctx->screen_content_mode == 2 && ctx->is_alpha) { + av_log(avctx, AV_LOG_ERROR, + "Transparency encoding with screen mode with aggressive rate control not supported\n"); + return AVERROR(EINVAL); + } + codecctl_int(avctx, VP8E_SET_SCREEN_CONTENT_MODE, ctx->screen_content_mode); + } av_log(avctx, AV_LOG_DEBUG, "Using deadline: %d\n", ctx->deadline); @@ -1946,6 +1958,7 @@ static const AVOption vp8_options[] = { { "auto-alt-ref", "Enable use of alternate reference " "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, { "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, + { "screen-content-mode", "Encoder screen content mode", OFFSET(screen_content_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, LEGACY_OPTIONS { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index f2f14eaed1..ecdbc51c74 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 39 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \
This exposes VP8E_SET_SCREEN_CONTENT_MODE option from libvpx. Co-authored-by: Erik Språng <sprang@webrtc.org> Signed-off-by: Dariusz Marcinkiewicz <darekm@google.com> --- doc/encoders.texi | 6 ++++++ libavcodec/libvpxenc.c | 13 +++++++++++++ libavcodec/version.h | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-)