[FFmpeg-devel] [PATCH] qsvenc: Add adaptive_i and adaptive_b toggles

[Will Kelleher]

Signed-off-by: Will Kelleher <wkelleher at gogoair.com>
---
 libavcodec/qsvenc.c      | 2 ++
 libavcodec/qsvenc.h      | 2 ++
 libavcodec/qsvenc_h264.c | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index df1f777..5e6ace1 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -173,6 +173,8 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
 #endif
 #if QSV_VERSION_ATLEAST(1,8)
         q->extco2.LookAheadDS           = q->look_ahead_downsampling;
+        q->extco2.AdaptiveI = q->adaptive_i ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN;
+        q->extco2.AdaptiveB = q->adaptive_b ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN;
 #endif
 
         q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco2;
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 3dd7afe..a5f9463 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -76,6 +76,8 @@ typedef struct QSVEncContext {
     int look_ahead;
     int look_ahead_depth;
     int look_ahead_downsampling;
+    int adaptive_i;
+    int adaptive_b;
 
     char *load_plugins;
 } QSVEncContext;
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 0e5a26c..507f490 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -97,6 +97,8 @@ static const AVOption options[] = {
     { "slow",        NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_3  },            INT_MIN, INT_MAX, VE, "preset" },
     { "slower",      NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_2  },            INT_MIN, INT_MAX, VE, "preset" },
     { "veryslow",    NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_QUALITY  }, INT_MIN, INT_MAX, VE, "preset" },
+    { "adaptive_i",  "Use AdaptiveI", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_BOOL,   {.i64 = 0}, 0, 1, VE},
+    { "adaptive_b",  "Use AdaptiveB", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_BOOL,   {.i64 = 0}, 0, 1, VE},
 
     { NULL },
 };
-- 
2.6.2