[FFmpeg-devel,5/5] lavc/qsvenc: add an option set MB numbers of each slice

Submitted by Zhong Li on Oct. 25, 2018, 12:36 p.m.

Details

Message ID 1540470971-2838-5-git-send-email-zhong.li@intel.com
State New
Headers show

Commit Message

Zhong Li Oct. 25, 2018, 12:36 p.m.
This option specifies suggested macroblocks numbers in each slice.
MSDK may adjust it based on platform capability.
And slice_number will be ignored if this option set to a non-zero
value.

Signed-off-by: Zhong Li <zhong.li@intel.com>
---
 libavcodec/qsvenc.c      | 1 +
 libavcodec/qsvenc.h      | 1 +
 libavcodec/qsvenc_h264.c | 1 +
 3 files changed, 3 insertions(+)

Patch hide | download patch | download mbox

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index fffca65..40dfaa6 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -651,6 +651,7 @@  FF_ENABLE_DEPRECATION_WARNINGS
 #if QSV_VERSION_ATLEAST(1, 8)
             q->extco2.LookAheadDS = q->look_ahead_downsampling;
             q->extco2.RepeatPPS   = q->repeat_pps ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
+            q->extco2.NumMbPerSlice = q->num_mb_per_slice;
 
 #if FF_API_PRIVATE_OPT
 FF_DISABLE_DEPRECATION_WARNINGS
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 9aebc2a..cc28f4f 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -163,6 +163,7 @@  typedef struct QSVEncContext {
     int recovery_point_sei;
 
     int repeat_pps;
+    int num_mb_per_slice;
 
     int a53_cc;
 
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 893a737..44f2fe0 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -156,6 +156,7 @@  static const AVOption options[] = {
 #endif
 
     { "repeat_pps", "repeat pps for every frame", OFFSET(qsv.repeat_pps), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
+    { "num_mb_per_slice","Suggested macroblocks numbers of each slice", OFFSET(qsv.num_mb_per_slice), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
 
     { NULL },
 };