mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

avenc: change properties of type ulong to int

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-06-09 16:41:28 +01:00
parent c4ca1e86f8
commit 7956478011
3 changed files with 19 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ext/ffmpeg/gstffmpegcfg.c
View file

@ -823,15 +823,6 @@ gst_ffmpeg_cfg_install_property (GstFFMpegEncClass * klass, guint base)
: puint->default_value, pspec->flags); : puint->default_value, pspec->flags);
break; break;
} }
case G_TYPE_ULONG:{
GParamSpecULong *pulong = G_PARAM_SPEC_ULONG (pspec);
pspec = g_param_spec_ulong (name, nick, blurb,
pulong->minimum, pulong->maximum,
lavc_default ? G_STRUCT_MEMBER (gulong, ctx, ctx_offset)
: pulong->default_value, pspec->flags);
break;
}
case G_TYPE_FLOAT:{ case G_TYPE_FLOAT:{
GParamSpecFloat *pfloat = G_PARAM_SPEC_FLOAT (pspec); GParamSpecFloat *pfloat = G_PARAM_SPEC_FLOAT (pspec);
@ -913,11 +904,6 @@ 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_ULONG:
g_return_val_if_fail (qdata->size == sizeof (gulong), TRUE);
G_STRUCT_MEMBER (glong, ffmpegenc, qdata->offset) =
g_value_get_ulong (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) =
@ -980,11 +966,6 @@ 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_ULONG:
g_return_val_if_fail (qdata->size == sizeof (gulong), TRUE);
g_value_set_ulong (value,
G_STRUCT_MEMBER (glong, 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,

29
ext/ffmpeg/gstffmpegenc.c
View file

@ -198,9 +198,11 @@ gst_ffmpegenc_class_init (GstFFMpegEncClass * klass)
gobject_class->get_property = gst_ffmpegenc_get_property; gobject_class->get_property = gst_ffmpegenc_get_property;
if (klass->in_plugin->type == AVMEDIA_TYPE_VIDEO) { if (klass->in_plugin->type == AVMEDIA_TYPE_VIDEO) {
/* FIXME: could use -1 for a sensible per-codec default based on
* e.g. input resolution and framerate */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE,
g_param_spec_ulong ("bitrate", "Bit Rate", g_param_spec_int ("bitrate", "Bit Rate",
"Target Video Bitrate", 0, G_MAXULONG, DEFAULT_VIDEO_BITRATE, "Target Video Bitrate", 0, G_MAXINT, DEFAULT_VIDEO_BITRATE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GOP_SIZE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_GOP_SIZE,
g_param_spec_int ("gop-size", "GOP Size", g_param_spec_int ("gop-size", "GOP Size",
@ -214,22 +216,23 @@ gst_ffmpegenc_class_init (GstFFMpegEncClass * klass)
/* FIXME 0.11: Make this property read-only */ /* FIXME 0.11: Make this property read-only */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFSIZE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFSIZE,
g_param_spec_ulong ("buffer-size", "Buffer Size", g_param_spec_int ("buffer-size", "Buffer Size",
"Size of the video buffers. " "Size of the video buffers. "
"Note: Setting this property has no effect " "Note: Setting this property has no effect "
"and is deprecated!", 0, G_MAXULONG, 0, "and is deprecated!", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), g_object_class_install_property (G_OBJECT_CLASS (klass),
ARG_RTP_PAYLOAD_SIZE, g_param_spec_ulong ("rtp-payload-size", ARG_RTP_PAYLOAD_SIZE, g_param_spec_int ("rtp-payload-size",
"RTP Payload Size", "Target GOB length", 0, G_MAXULONG, 0, "RTP Payload Size", "Target GOB length", 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/* register additional properties, possibly dependent on the exact CODEC */ /* register additional properties, possibly dependent on the exact CODEC */
gst_ffmpeg_cfg_install_property (klass, ARG_CFG_BASE); gst_ffmpeg_cfg_install_property (klass, ARG_CFG_BASE);
} else if (klass->in_plugin->type == AVMEDIA_TYPE_AUDIO) { } else if (klass->in_plugin->type == AVMEDIA_TYPE_AUDIO) {
/* FIXME: could use -1 for a sensible per-codec defaults */
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BIT_RATE,
g_param_spec_ulong ("bitrate", "Bit Rate", g_param_spec_int ("bitrate", "Bit Rate",
"Target Audio Bitrate", 0, G_MAXULONG, DEFAULT_AUDIO_BITRATE, "Target Audio Bitrate", 0, G_MAXINT, DEFAULT_AUDIO_BITRATE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
} }
@ -1285,7 +1288,7 @@ gst_ffmpegenc_set_property (GObject * object,
/* Check the argument id to see which argument we're setting. */ /* Check the argument id to see which argument we're setting. */
switch (prop_id) { switch (prop_id) {
case ARG_BIT_RATE: case ARG_BIT_RATE:
ffmpegenc->bitrate = g_value_get_ulong (value); ffmpegenc->bitrate = g_value_get_int (value);
break; break;
case ARG_GOP_SIZE: case ARG_GOP_SIZE:
ffmpegenc->gop_size = g_value_get_int (value); ffmpegenc->gop_size = g_value_get_int (value);
@ -1296,7 +1299,7 @@ gst_ffmpegenc_set_property (GObject * object,
case ARG_BUFSIZE: case ARG_BUFSIZE:
break; break;
case ARG_RTP_PAYLOAD_SIZE: case ARG_RTP_PAYLOAD_SIZE:
ffmpegenc->rtp_payload_size = g_value_get_ulong (value); ffmpegenc->rtp_payload_size = g_value_get_int (value);
break; break;
default: default:
if (!gst_ffmpeg_cfg_set_property (object, value, pspec)) if (!gst_ffmpeg_cfg_set_property (object, value, pspec))
@ -1317,7 +1320,7 @@ gst_ffmpegenc_get_property (GObject * object,
switch (prop_id) { switch (prop_id) {
case ARG_BIT_RATE: case ARG_BIT_RATE:
g_value_set_ulong (value, ffmpegenc->bitrate); g_value_set_int (value, ffmpegenc->bitrate);
break; break;
case ARG_GOP_SIZE: case ARG_GOP_SIZE:
g_value_set_int (value, ffmpegenc->gop_size); g_value_set_int (value, ffmpegenc->gop_size);
@ -1326,10 +1329,10 @@ gst_ffmpegenc_get_property (GObject * object,
g_value_set_enum (value, ffmpegenc->me_method); g_value_set_enum (value, ffmpegenc->me_method);
break; break;
case ARG_BUFSIZE: case ARG_BUFSIZE:
g_value_set_ulong (value, ffmpegenc->buffer_size); g_value_set_int (value, ffmpegenc->buffer_size);
break; break;
case ARG_RTP_PAYLOAD_SIZE: case ARG_RTP_PAYLOAD_SIZE:
g_value_set_ulong (value, ffmpegenc->rtp_payload_size); g_value_set_int (value, ffmpegenc->rtp_payload_size);
break; break;
default: default:
if (!gst_ffmpeg_cfg_get_property (object, value, pspec)) if (!gst_ffmpeg_cfg_get_property (object, value, pspec))

6
ext/ffmpeg/gstffmpegenc.h
View file

@ -47,11 +47,11 @@ struct _GstFFMpegEnc
gboolean discont; gboolean discont;
/* cache */ /* cache */
gulong bitrate; gint bitrate;
gint me_method; gint me_method;
gint gop_size; gint gop_size;
gulong buffer_size; gint buffer_size;
gulong rtp_payload_size; gint rtp_payload_size;
guint8 *working_buf; guint8 *working_buf;
gulong working_buf_size; gulong working_buf_size;