qsvenc: Add private option to replace coder_type
authorVittorio Giovara <vittorio.giovara@gmail.com>
Wed, 13 Jan 2016 20:27:00 +0000 (15:27 -0500)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Mon, 25 Jan 2016 17:00:16 +0000 (12:00 -0500)
Missing from be00ec832c519427cd92218abac77dafdc1d5487.

libavcodec/qsvenc.c
libavcodec/qsvenc.h

index 9aa865d..453301c 100644 (file)
@@ -447,8 +447,14 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
     if (avctx->codec_id != AV_CODEC_ID_HEVC) {
         q->extco.Header.BufferId      = MFX_EXTBUFF_CODING_OPTION;
         q->extco.Header.BufferSz      = sizeof(q->extco);
-        q->extco.CAVLC                = avctx->coder_type == FF_CODER_TYPE_VLC ?
-                                        MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN;
+#if FF_API_CODER_TYPE
+FF_DISABLE_DEPRECATION_WARNINGS
+        if (avctx->coder_type != 0)
+            q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+        q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON
+                                  : MFX_CODINGOPTION_UNKNOWN;
 
         if (q->rdo >= 0)
             q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
index 97165fc..719e4ec 100644 (file)
@@ -66,6 +66,7 @@
 { "adaptive_i",     "Adaptive I-frame placement",             OFFSET(qsv.adaptive_i),     AV_OPT_TYPE_INT, { .i64 = -1 }, -1,          1, VE }, \
 { "adaptive_b",     "Adaptive B-frame placement",             OFFSET(qsv.adaptive_b),     AV_OPT_TYPE_INT, { .i64 = -1 }, -1,          1, VE }, \
 { "b_strategy",     "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy),    AV_OPT_TYPE_INT, { .i64 = -1 }, -1,          1, VE }, \
+{ "cavlc",          "Enable CAVLC",                           OFFSET(qsv.cavlc),          AV_OPT_TYPE_INT, { .i64 = 0 },   0,          1, VE }, \
 
 typedef struct QSVEncContext {
     AVCodecContext *avctx;
@@ -120,6 +121,7 @@ typedef struct QSVEncContext {
     int adaptive_i;
     int adaptive_b;
     int b_strategy;
+    int cavlc;
 
     int int_ref_type;
     int int_ref_cycle_size;