msdkh265enc: slice size control

Add max-slice-size property to set the maximum slice size
This commit is contained in:
Haihao Xiang 2019-11-26 15:42:03 +08:00
parent 3208e3d371
commit d796707dd4
2 changed files with 19 additions and 0 deletions

View file

@ -45,11 +45,13 @@ enum
PROP_LOW_POWER = GST_MSDKENC_PROP_MAX, PROP_LOW_POWER = GST_MSDKENC_PROP_MAX,
PROP_TILE_ROW, PROP_TILE_ROW,
PROP_TILE_COL, PROP_TILE_COL,
PROP_MAX_SLICE_SIZE,
}; };
#define PROP_LOWPOWER_DEFAULT FALSE #define PROP_LOWPOWER_DEFAULT FALSE
#define PROP_TILE_ROW_DEFAULT 1 #define PROP_TILE_ROW_DEFAULT 1
#define PROP_TILE_COL_DEFAULT 1 #define PROP_TILE_COL_DEFAULT 1
#define PROP_MAX_SLICE_SIZE_DEFAULT 0
#define RAW_FORMATS "NV12, I420, YV12, YUY2, UYVY, BGRA, P010_10LE, VUYA" #define RAW_FORMATS "NV12, I420, YV12, YUY2, UYVY, BGRA, P010_10LE, VUYA"
@ -125,6 +127,7 @@ gst_msdkh265enc_configure (GstMsdkEnc * encoder)
encoder->param.mfx.IdrInterval += 1; encoder->param.mfx.IdrInterval += 1;
/* Enable Extended coding options */ /* Enable Extended coding options */
encoder->option2.MaxSliceSize = h265enc->max_slice_size;
gst_msdkenc_ensure_extended_coding_options (encoder); gst_msdkenc_ensure_extended_coding_options (encoder);
if (h265enc->num_tile_rows > 1 || h265enc->num_tile_cols > 1) { if (h265enc->num_tile_rows > 1 || h265enc->num_tile_cols > 1) {
@ -249,6 +252,10 @@ gst_msdkh265enc_set_property (GObject * object, guint prop_id,
thiz->num_tile_cols = g_value_get_uint (value); thiz->num_tile_cols = g_value_get_uint (value);
break; break;
case PROP_MAX_SLICE_SIZE:
thiz->max_slice_size = g_value_get_uint (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -279,6 +286,10 @@ gst_msdkh265enc_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_uint (value, thiz->num_tile_cols); g_value_set_uint (value, thiz->num_tile_cols);
break; break;
case PROP_MAX_SLICE_SIZE:
g_value_set_uint (value, thiz->max_slice_size);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -342,6 +353,12 @@ gst_msdkh265enc_class_init (GstMsdkH265EncClass * klass)
"number of columns for tiled encoding", 1, 8192, "number of columns for tiled encoding", 1, 8192,
PROP_TILE_COL_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); PROP_TILE_COL_DEFAULT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_MAX_SLICE_SIZE,
g_param_spec_uint ("max-slice-size", "Max Slice Size",
"Maximum slice size in bytes (if enabled MSDK will ignore the control over num-slices)",
0, G_MAXUINT32, PROP_MAX_SLICE_SIZE_DEFAULT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gst_element_class_set_static_metadata (element_class, gst_element_class_set_static_metadata (element_class,
"Intel MSDK H265 encoder", "Intel MSDK H265 encoder",
"Codec/Encoder/Video/Hardware", "Codec/Encoder/Video/Hardware",
@ -359,5 +376,6 @@ gst_msdkh265enc_init (GstMsdkH265Enc * thiz)
thiz->lowpower = PROP_LOWPOWER_DEFAULT; thiz->lowpower = PROP_LOWPOWER_DEFAULT;
thiz->num_tile_rows = PROP_TILE_ROW_DEFAULT; thiz->num_tile_rows = PROP_TILE_ROW_DEFAULT;
thiz->num_tile_cols = PROP_TILE_COL_DEFAULT; thiz->num_tile_cols = PROP_TILE_COL_DEFAULT;
thiz->max_slice_size = PROP_MAX_SLICE_SIZE_DEFAULT;
msdk_enc->num_extra_frames = 1; msdk_enc->num_extra_frames = 1;
} }

View file

@ -57,6 +57,7 @@ struct _GstMsdkH265Enc
gboolean lowpower; gboolean lowpower;
gushort num_tile_rows; gushort num_tile_rows;
gushort num_tile_cols; gushort num_tile_cols;
guint max_slice_size;
mfxExtHEVCTiles ext_tiles; mfxExtHEVCTiles ext_tiles;
/* roi[0] for current ROI and roi[1] for previous ROI */ /* roi[0] for current ROI and roi[1] for previous ROI */