mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Small updates to avimux and the v4l plugins for usability in general

Browse source 
Original commit message from CVS:
Small updates to avimux and the v4l plugins for usability in general
This commit is contained in:
Ronald S. Bultje 2002-02-20 07:25:39 +00:00
parent bd2c426257
commit 7813a24e3f
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/avi/gstavimux.c
View file

@ -62,6 +62,7 @@ enum {
enum { enum {
ARG_0, ARG_0,
ARG_BIGFILE, ARG_BIGFILE,
ARG_FRAMERATE,
}; };
GST_PADTEMPLATE_FACTORY (src_factory, GST_PADTEMPLATE_FACTORY (src_factory,
@ -220,6 +221,10 @@ gst_avimux_class_init (GstAviMuxClass *klass)
g_param_spec_boolean("bigfile","Bigfile Support","Whether to capture large or small AVI files", g_param_spec_boolean("bigfile","Bigfile Support","Whether to capture large or small AVI files",
0,G_PARAM_READWRITE)); 0,G_PARAM_READWRITE));
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FRAMERATE,
g_param_spec_double("framerate","Framerate","Frames/sec",
G_MINDOUBLE,G_MAXDOUBLE,0,G_PARAM_READWRITE));
gstelement_class->request_new_pad = gst_avimux_request_new_pad; gstelement_class->request_new_pad = gst_avimux_request_new_pad;
gstelement_class->change_state = gst_avimux_change_state; gstelement_class->change_state = gst_avimux_change_state;
@ -263,6 +268,8 @@ gst_avimux_init (GstAviMux *avimux)
avimux->write_header = TRUE; avimux->write_header = TRUE;
avimux->enable_large_avi = TRUE; avimux->enable_large_avi = TRUE;
avimux->framerate = 25.;
} }
static GstPadConnectReturn static GstPadConnectReturn
@ -824,7 +831,6 @@ gst_avimux_stop_file (GstAviMux *avimux)
{ {
GstEvent *event; GstEvent *event;
GstBuffer *header; GstBuffer *header;
gfloat fps = 25.0;
/* if bigfile, rewrite header, else write indexes */ /* if bigfile, rewrite header, else write indexes */
if (avimux->num_video_pads) if (avimux->num_video_pads)
@ -848,12 +854,12 @@ gst_avimux_stop_file (GstAviMux *avimux)
avimux->auds_hdr.length = avimux->audio_size/avimux->auds_hdr.scale; avimux->auds_hdr.length = avimux->audio_size/avimux->auds_hdr.scale;
/* TODO: fps calculation!! */ /* TODO: fps calculation!! */
avimux->avi_hdr.us_frame = 1000000/fps; avimux->avi_hdr.us_frame = 1000000/avimux->framerate;
avimux->avi_hdr.max_bps = 0; avimux->avi_hdr.max_bps = 0;
if (avimux->num_audio_pads) if (avimux->num_audio_pads)
avimux->avi_hdr.max_bps += avimux->auds.av_bps; avimux->avi_hdr.max_bps += avimux->auds.av_bps;
if (avimux->num_video_pads) if (avimux->num_video_pads)
avimux->avi_hdr.max_bps += avimux->vids.bit_cnt/8 * fps; avimux->avi_hdr.max_bps += avimux->vids.bit_cnt/8 * avimux->framerate;
/* seek and rewrite the header */ /* seek and rewrite the header */
header = gst_avimux_riff_get_avi_header(avimux); header = gst_avimux_riff_get_avi_header(avimux);
@ -925,7 +931,6 @@ gst_avimux_chain (GstPad *pad, GstBuffer *buf)
if (strncmp(padname, "audio_", 6) == 0) if (strncmp(padname, "audio_", 6) == 0)
{ {
printf("AUDIODATA GIVEN\n");
/* write a audio header + index entry */ /* write a audio header + index entry */
newbuf = gst_avimux_riff_get_audio_header(GST_BUFFER_SIZE(buf)); newbuf = gst_avimux_riff_get_audio_header(GST_BUFFER_SIZE(buf));
avimux->total_data += GST_BUFFER_SIZE(newbuf) + GST_BUFFER_SIZE(buf); avimux->total_data += GST_BUFFER_SIZE(newbuf) + GST_BUFFER_SIZE(buf);
@ -1004,6 +1009,9 @@ gst_avimux_get_property (GObject *object,
case ARG_BIGFILE: case ARG_BIGFILE:
g_value_set_boolean(value, avimux->enable_large_avi); g_value_set_boolean(value, avimux->enable_large_avi);
break; break;
case ARG_FRAMERATE:
g_value_set_double(value, avimux->framerate);
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;
@ -1027,6 +1035,9 @@ gst_avimux_set_property (GObject *object,
case ARG_BIGFILE: case ARG_BIGFILE:
avimux->enable_large_avi = g_value_get_boolean(value); avimux->enable_large_avi = g_value_get_boolean(value);
break; break;
case ARG_FRAMERATE:
avimux->framerate = g_value_get_double(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;

3
gst/avi/gstavimux.h
View file

@ -60,8 +60,7 @@ struct _GstAviMux {
gint num_video_pads; gint num_video_pads;
/* timestamps of first and current frame + num_frames for fps calculation */ /* timestamps of first and current frame + num_frames for fps calculation */
guint64 first_timestamp; gdouble framerate;
guint64 current_timestamp;
/* the AVI header */ /* the AVI header */
gst_riff_avih avi_hdr; gst_riff_avih avi_hdr;