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

audioencoder: push pending events and tags before EOS

Browse source 
if there are tags or events pending and an EOS is received, push those
events and tags before the EOS.
This commit is contained in:
Thiago Santos 2014-01-29 12:32:16 -03:00
parent 4fefd48f05
commit e00dc5b879
1 changed files with 51 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
gst-libs/gst/audio/gstaudioencoder.c
View file

@ -579,6 +579,50 @@ gst_audio_encoder_push_event (GstAudioEncoder * enc, GstEvent * event)
return gst_pad_push_event (enc->srcpad, event); return gst_pad_push_event (enc->srcpad, event);
} }
static inline void
gst_audio_encoder_push_pending_events (GstAudioEncoder * enc)
{
GstAudioEncoderPrivate *priv = enc->priv;
if (priv->pending_events) {
GList *pending_events, *l;
pending_events = priv->pending_events;
priv->pending_events = NULL;
GST_DEBUG_OBJECT (enc, "Pushing pending events");
for (l = pending_events; l; l = l->next)
gst_audio_encoder_push_event (enc, l->data);
g_list_free (pending_events);
}
}
static inline void
gst_audio_encoder_check_and_push_ending_tags (GstAudioEncoder * enc)
{
if (G_UNLIKELY (enc->priv->tags && enc->priv->tags_changed)) {
#if 0
GstCaps *caps;
#endif
/* add codec info to pending tags */
#if 0
if (!enc->priv->tags)
enc->priv->tags = gst_tag_list_new ();
enc->priv->tags = gst_tag_list_make_writable (enc->priv->tags);
caps = gst_pad_get_current_caps (enc->srcpad);
gst_pb_utils_add_codec_description_to_tag_list (enc->priv->tags,
GST_TAG_CODEC, caps);
gst_pb_utils_add_codec_description_to_tag_list (enc->priv->tags,
GST_TAG_AUDIO_CODEC, caps);
#endif
GST_DEBUG_OBJECT (enc, "sending tags %" GST_PTR_FORMAT, enc->priv->tags);
gst_audio_encoder_push_event (enc,
gst_event_new_tag (gst_tag_list_ref (enc->priv->tags)));
enc->priv->tags_changed = FALSE;
}
}
/** /**
* gst_audio_encoder_finish_frame: * gst_audio_encoder_finish_frame:
* @enc: a #GstAudioEncoder * @enc: a #GstAudioEncoder
@ -642,40 +686,10 @@ gst_audio_encoder_finish_frame (GstAudioEncoder * enc, GstBuffer * buf,
if (G_LIKELY (buf)) if (G_LIKELY (buf))
priv->got_data = TRUE; priv->got_data = TRUE;
if (priv->pending_events) { gst_audio_encoder_push_pending_events (enc);
GList *pending_events, *l;
pending_events = priv->pending_events;
priv->pending_events = NULL;
GST_DEBUG_OBJECT (enc, "Pushing pending events");
for (l = pending_events; l; l = l->next)
gst_audio_encoder_push_event (enc, l->data);
g_list_free (pending_events);
}
/* send after pending events, which likely includes newsegment event */ /* send after pending events, which likely includes newsegment event */
if (G_UNLIKELY (enc->priv->tags && enc->priv->tags_changed)) { gst_audio_encoder_check_and_push_ending_tags (enc);
#if 0
GstCaps *caps;
#endif
/* add codec info to pending tags */
#if 0
if (!enc->priv->tags)
enc->priv->tags = gst_tag_list_new ();
enc->priv->tags = gst_tag_list_make_writable (enc->priv->tags);
caps = gst_pad_get_current_caps (enc->srcpad);
gst_pb_utils_add_codec_description_to_tag_list (enc->priv->tags,
GST_TAG_CODEC, caps);
gst_pb_utils_add_codec_description_to_tag_list (enc->priv->tags,
GST_TAG_AUDIO_CODEC, caps);
#endif
GST_DEBUG_OBJECT (enc, "sending tags %" GST_PTR_FORMAT, enc->priv->tags);
gst_audio_encoder_push_event (enc,
gst_event_new_tag (gst_tag_list_ref (enc->priv->tags)));
enc->priv->tags_changed = FALSE;
}
/* remove corresponding samples from input */ /* remove corresponding samples from input */
if (samples < 0) if (samples < 0)
@ -1486,6 +1500,11 @@ gst_audio_encoder_sink_event_default (GstAudioEncoder * enc, GstEvent * event)
case GST_EVENT_EOS: case GST_EVENT_EOS:
GST_AUDIO_ENCODER_STREAM_LOCK (enc); GST_AUDIO_ENCODER_STREAM_LOCK (enc);
gst_audio_encoder_drain (enc); gst_audio_encoder_drain (enc);
/* check for pending events and tags */
gst_audio_encoder_push_pending_events (enc);
gst_audio_encoder_check_and_push_ending_tags (enc);
GST_AUDIO_ENCODER_STREAM_UNLOCK (enc); GST_AUDIO_ENCODER_STREAM_UNLOCK (enc);
/* forward immediately because no buffer or serialized event /* forward immediately because no buffer or serialized event