mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

avcfg: rc-min-rate and rc-max-rate are now 64bit integers

Browse source 
Switch the gobject properties and internal handling to support that
This commit is contained in:
Edward Hervey 2016-02-16 16:32:38 +01:00 committed by Edward Hervey
parent 55fd9e3623
commit e3cf542215
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/libav/gstavcfg.c
View file

@ -513,13 +513,19 @@ gst_ffmpeg_cfg_init (void)
gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg, gst_ffmpeg_add_pspec (pspec, config.rc_buffer_aggressivity, FALSE, mpeg,
NULL); NULL);
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT (57, 3, 0)
pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate", pspec = g_param_spec_int ("rc-max-rate", "Ratecontrol Maximum Bitrate",
"Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0, "Ratecontrol Maximum Bitrate", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
#else
pspec = g_param_spec_int64 ("rc-max-rate", "Ratecontrol Maximum Bitrate",
"Ratecontrol Maximum Bitrate", 0, G_MAXINT64, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
#endif
gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_max_rate, FALSE, mpeg, NULL);
pspec = g_param_spec_int ("rc-min-rate", "Ratecontrol Minimum Bitrate", pspec = g_param_spec_int64 ("rc-min-rate", "Ratecontrol Minimum Bitrate",
"Ratecontrol Minimum Bitrate", 0, G_MAXINT, 0, "Ratecontrol Minimum Bitrate", 0, G_MAXINT64, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL); gst_ffmpeg_add_pspec (pspec, config.rc_min_rate, FALSE, mpeg, NULL);
@ -770,6 +776,15 @@ gst_ffmpeg_cfg_install_property (GstFFMpegVidEncClass * klass, guint base)
: pint->default_value, pspec->flags); : pint->default_value, pspec->flags);
break; break;
} }
case G_TYPE_INT64:{
GParamSpecInt64 *pint = G_PARAM_SPEC_INT64 (pspec);
pspec = g_param_spec_int64 (name, nick, blurb,
pint->minimum, pint->maximum,
lavc_default ? G_STRUCT_MEMBER (gint64, ctx, ctx_offset)
: pint->default_value, pspec->flags);
break;
}
case G_TYPE_UINT:{ case G_TYPE_UINT:{
GParamSpecUInt *puint = G_PARAM_SPEC_UINT (pspec); GParamSpecUInt *puint = G_PARAM_SPEC_UINT (pspec);
@ -862,6 +877,11 @@ gst_ffmpeg_cfg_set_property (GObject * object,
G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset) = G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset) =
g_value_get_int (value); g_value_get_int (value);
break; break;
case G_TYPE_INT64:
g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
G_STRUCT_MEMBER (gint64, ffmpegenc, qdata->offset) =
g_value_get_int64 (value);
break;
case G_TYPE_FLOAT: case G_TYPE_FLOAT:
g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE); g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
G_STRUCT_MEMBER (gfloat, ffmpegenc, qdata->offset) = G_STRUCT_MEMBER (gfloat, ffmpegenc, qdata->offset) =
@ -924,6 +944,11 @@ gst_ffmpeg_cfg_get_property (GObject * object,
g_return_val_if_fail (qdata->size == sizeof (gint), TRUE); g_return_val_if_fail (qdata->size == sizeof (gint), TRUE);
g_value_set_int (value, G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset)); g_value_set_int (value, G_STRUCT_MEMBER (gint, ffmpegenc, qdata->offset));
break; break;
case G_TYPE_INT64:
g_return_val_if_fail (qdata->size == sizeof (gint64), TRUE);
g_value_set_int64 (value, G_STRUCT_MEMBER (gint64, ffmpegenc,
qdata->offset));
break;
case G_TYPE_FLOAT: case G_TYPE_FLOAT:
g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE); g_return_val_if_fail (qdata->size == sizeof (gfloat), TRUE);
g_value_set_float (value, g_value_set_float (value,