mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

qsvencoder: Rename property name i-frames to idr-interval

Browse source 
... and clarify the meaning of the value for each h264 and h265
encoder since the usage of mfxInfoMFX::IdrInterval is different
per codec.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2204>
This commit is contained in:
Seungha Yang 2022-04-16 22:27:13 +09:00
parent f848619ff4
commit 86cf307a6c
2 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
subprojects/gst-plugins-bad/sys/qsv/gstqsvh264enc.cpp
View file

@ -137,7 +137,7 @@ enum
PROP_QP_P, PROP_QP_P,
PROP_QP_B, PROP_QP_B,
PROP_GOP_SIZE, PROP_GOP_SIZE,
PROP_I_FRAMES, PROP_IDR_INTERVAL,
PROP_B_FRAMES, PROP_B_FRAMES,
PROP_REF_FRAMES, PROP_REF_FRAMES,
PROP_BITRATE, PROP_BITRATE,
@ -156,7 +156,7 @@ enum
#define DEFAULT_CABAC MFX_CODINGOPTION_UNKNOWN #define DEFAULT_CABAC MFX_CODINGOPTION_UNKNOWN
#define DEFAULT_QP 0 #define DEFAULT_QP 0
#define DEFAULT_GOP_SIZE 30 #define DEFAULT_GOP_SIZE 30
#define DEFAULT_I_FRAMES 0 #define DEFAULT_IDR_INTERVAL 0
#define DEFAULT_B_FRAMES 0 #define DEFAULT_B_FRAMES 0
#define DEFAULT_REF_FRAMES 2 #define DEFAULT_REF_FRAMES 2
#define DEFAULT_BITRATE 2000 #define DEFAULT_BITRATE 2000
@ -211,7 +211,7 @@ typedef struct _GstQsvH264Enc
guint qp_p; guint qp_p;
guint qp_b; guint qp_b;
guint gop_size; guint gop_size;
guint iframes; guint idr_interval;
guint bframes; guint bframes;
guint ref_frames; guint ref_frames;
guint bitrate; guint bitrate;
@ -350,11 +350,12 @@ gst_qsv_h264_enc_class_init (GstQsvH264EncClass * klass, gpointer data)
"Number of pictures within a GOP (0: unspecified)", "Number of pictures within a GOP (0: unspecified)",
0, G_MAXUSHORT, DEFAULT_GOP_SIZE, (GParamFlags) 0, G_MAXUSHORT, DEFAULT_GOP_SIZE, (GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (object_class, PROP_I_FRAMES, g_object_class_install_property (object_class, PROP_IDR_INTERVAL,
g_param_spec_uint ("i-frames", "I Frames", g_param_spec_uint ("idr-interval", "IDR interval",
"Number of I frames between IDR frames" "IDR-frame interval in terms of I-frames. "
"(0: every I frame is an IDR frame)", "0: every I-frame is an IDR frame, "
0, G_MAXUSHORT, DEFAULT_I_FRAMES, (GParamFlags) "N: \"N\" I-frames are inserted between IDR-frames",
0, G_MAXUSHORT, DEFAULT_IDR_INTERVAL, (GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (object_class, PROP_B_FRAMES, g_object_class_install_property (object_class, PROP_B_FRAMES,
g_param_spec_uint ("b-frames", "B Frames", g_param_spec_uint ("b-frames", "B Frames",
@ -475,7 +476,7 @@ gst_qsv_h264_enc_init (GstQsvH264Enc * self)
self->qp_p = DEFAULT_QP; self->qp_p = DEFAULT_QP;
self->qp_b = DEFAULT_QP; self->qp_b = DEFAULT_QP;
self->gop_size = DEFAULT_GOP_SIZE; self->gop_size = DEFAULT_GOP_SIZE;
self->iframes = DEFAULT_I_FRAMES; self->idr_interval = DEFAULT_IDR_INTERVAL;
self->bframes = DEFAULT_B_FRAMES; self->bframes = DEFAULT_B_FRAMES;
self->ref_frames = DEFAULT_REF_FRAMES; self->ref_frames = DEFAULT_REF_FRAMES;
self->bitrate = DEFAULT_BITRATE; self->bitrate = DEFAULT_BITRATE;
@ -600,8 +601,8 @@ gst_qsv_h264_enc_set_property (GObject * object, guint prop_id,
gst_qsv_h264_enc_check_update_uint (self, &self->gop_size, gst_qsv_h264_enc_check_update_uint (self, &self->gop_size,
g_value_get_uint (value), FALSE); g_value_get_uint (value), FALSE);
break; break;
case PROP_I_FRAMES: case PROP_IDR_INTERVAL:
gst_qsv_h264_enc_check_update_uint (self, &self->iframes, gst_qsv_h264_enc_check_update_uint (self, &self->idr_interval,
g_value_get_uint (value), FALSE); g_value_get_uint (value), FALSE);
break; break;
case PROP_B_FRAMES: case PROP_B_FRAMES:
@ -709,8 +710,8 @@ gst_qsv_h264_enc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_GOP_SIZE: case PROP_GOP_SIZE:
g_value_set_uint (value, self->gop_size); g_value_set_uint (value, self->gop_size);
break; break;
case PROP_I_FRAMES: case PROP_IDR_INTERVAL:
g_value_set_uint (value, self->iframes); g_value_set_uint (value, self->idr_interval);
break; break;
case PROP_B_FRAMES: case PROP_B_FRAMES:
g_value_set_uint (value, self->bframes); g_value_set_uint (value, self->bframes);
@ -1227,7 +1228,7 @@ gst_qsv_h264_enc_set_format (GstQsvEncoder * encoder,
param->mfx.CodecProfile = mfx_profile; param->mfx.CodecProfile = mfx_profile;
param->mfx.GopRefDist = bframes + 1; param->mfx.GopRefDist = bframes + 1;
param->mfx.GopPicSize = self->gop_size; param->mfx.GopPicSize = self->gop_size;
param->mfx.IdrInterval = self->iframes; param->mfx.IdrInterval = self->idr_interval;
param->mfx.RateControlMethod = self->rate_control; param->mfx.RateControlMethod = self->rate_control;
param->mfx.NumRefFrame = self->ref_frames; param->mfx.NumRefFrame = self->ref_frames;

30
subprojects/gst-plugins-bad/sys/qsv/gstqsvh265enc.cpp
View file

@ -106,7 +106,7 @@ enum
PROP_QP_P, PROP_QP_P,
PROP_QP_B, PROP_QP_B,
PROP_GOP_SIZE, PROP_GOP_SIZE,
PROP_I_FRAMES, PROP_IDR_INTERVAL,
PROP_B_FRAMES, PROP_B_FRAMES,
PROP_REF_FRAMES, PROP_REF_FRAMES,
PROP_BITRATE, PROP_BITRATE,
@ -120,7 +120,7 @@ enum
#define DEFAULT_QP 0 #define DEFAULT_QP 0
#define DEFAULT_GOP_SIZE 30 #define DEFAULT_GOP_SIZE 30
#define DEFAULT_I_FRAMES 0 #define DEFAULT_IDR_INTERVAL 1
#define DEFAULT_B_FRAMES 0 #define DEFAULT_B_FRAMES 0
#define DEFAULT_REF_FRAMES 2 #define DEFAULT_REF_FRAMES 2
#define DEFAULT_BITRATE 2000 #define DEFAULT_BITRATE 2000
@ -170,7 +170,7 @@ typedef struct _GstQsvH265Enc
guint qp_p; guint qp_p;
guint qp_b; guint qp_b;
guint gop_size; guint gop_size;
guint iframes; guint idr_interval;
guint bframes; guint bframes;
guint ref_frames; guint ref_frames;
guint bitrate; guint bitrate;
@ -303,11 +303,13 @@ gst_qsv_h265_enc_class_init (GstQsvH265EncClass * klass, gpointer data)
"Number of pictures within a GOP (0: unspecified)", "Number of pictures within a GOP (0: unspecified)",
0, G_MAXUSHORT, DEFAULT_GOP_SIZE, (GParamFlags) 0, G_MAXUSHORT, DEFAULT_GOP_SIZE, (GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (object_class, PROP_I_FRAMES, g_object_class_install_property (object_class, PROP_IDR_INTERVAL,
g_param_spec_uint ("i-frames", "I Frames", g_param_spec_uint ("idr-interval", "IDR interval",
"Number of I frames between IDR frames" "IDR-frame interval in terms of I-frames. "
"(0: every I frame is an IDR frame)", "0: only first I-frame is is an IDR frame, "
0, G_MAXUSHORT, DEFAULT_I_FRAMES, (GParamFlags) "1: every I-frame is an IDR frame, "
"N: \"N - 1\" I-frames are inserted between IDR-frames",
0, G_MAXUSHORT, DEFAULT_IDR_INTERVAL, (GParamFlags)
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS))); (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
g_object_class_install_property (object_class, PROP_B_FRAMES, g_object_class_install_property (object_class, PROP_B_FRAMES,
g_param_spec_uint ("b-frames", "B Frames", g_param_spec_uint ("b-frames", "B Frames",
@ -407,7 +409,7 @@ gst_qsv_h265_enc_init (GstQsvH265Enc * self)
self->qp_p = DEFAULT_QP; self->qp_p = DEFAULT_QP;
self->qp_b = DEFAULT_QP; self->qp_b = DEFAULT_QP;
self->gop_size = DEFAULT_GOP_SIZE; self->gop_size = DEFAULT_GOP_SIZE;
self->iframes = DEFAULT_I_FRAMES; self->idr_interval = DEFAULT_IDR_INTERVAL;
self->bframes = DEFAULT_B_FRAMES; self->bframes = DEFAULT_B_FRAMES;
self->ref_frames = DEFAULT_REF_FRAMES; self->ref_frames = DEFAULT_REF_FRAMES;
self->bitrate = DEFAULT_BITRATE; self->bitrate = DEFAULT_BITRATE;
@ -520,8 +522,8 @@ gst_qsv_h265_enc_set_property (GObject * object, guint prop_id,
gst_qsv_h265_enc_check_update_uint (self, &self->gop_size, gst_qsv_h265_enc_check_update_uint (self, &self->gop_size,
g_value_get_uint (value), FALSE); g_value_get_uint (value), FALSE);
break; break;
case PROP_I_FRAMES: case PROP_IDR_INTERVAL:
gst_qsv_h265_enc_check_update_uint (self, &self->iframes, gst_qsv_h265_enc_check_update_uint (self, &self->idr_interval,
g_value_get_uint (value), FALSE); g_value_get_uint (value), FALSE);
break; break;
case PROP_B_FRAMES: case PROP_B_FRAMES:
@ -610,8 +612,8 @@ gst_qsv_h265_enc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_GOP_SIZE: case PROP_GOP_SIZE:
g_value_set_uint (value, self->gop_size); g_value_set_uint (value, self->gop_size);
break; break;
case PROP_I_FRAMES: case PROP_IDR_INTERVAL:
g_value_set_uint (value, self->iframes); g_value_set_uint (value, self->idr_interval);
break; break;
case PROP_B_FRAMES: case PROP_B_FRAMES:
g_value_set_uint (value, self->bframes); g_value_set_uint (value, self->bframes);
@ -1005,7 +1007,7 @@ gst_qsv_h265_enc_set_format (GstQsvEncoder * encoder,
param->mfx.CodecProfile = mfx_profile; param->mfx.CodecProfile = mfx_profile;
param->mfx.GopRefDist = self->bframes + 1; param->mfx.GopRefDist = self->bframes + 1;
param->mfx.GopPicSize = self->gop_size; param->mfx.GopPicSize = self->gop_size;
param->mfx.IdrInterval = self->iframes; param->mfx.IdrInterval = self->idr_interval;
param->mfx.RateControlMethod = self->rate_control; param->mfx.RateControlMethod = self->rate_control;
param->mfx.NumRefFrame = self->ref_frames; param->mfx.NumRefFrame = self->ref_frames;