mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mad/gstmad.c: Send newsegment event before calling gst_pad_alloc_buffer_and_set_caps(), makes mad behave better i...

Browse source 
Original commit message from CVS:
Patch by: Michael Dominic K.  < mdk at mdk org pl>
* ext/mad/gstmad.c: (gst_mad_chain):
Send newsegment event before calling
gst_pad_alloc_buffer_and_set_caps(), makes mad behave better
in connection with pad blocking (#342594). While we're at it,
do some minor clean-ups.
This commit is contained in:
Michael Dominic K 2006-06-17 19:35:41 +00:00 committed by Tim-Philipp Müller
parent 370f10f1a0
commit 7a9ac30688
2 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2006-06-17 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Michael Dominic K. < mdk at mdk org pl>
* ext/mad/gstmad.c: (gst_mad_chain):
Send newsegment event before calling
gst_pad_alloc_buffer_and_set_caps(), makes mad behave better
in connection with pad blocking (#342594). While we're at it,
do some minor clean-ups.
2006-06-17 Tim-Philipp Müller <tim at centricular dot net> 2006-06-17 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac: * configure.ac:

46
ext/mad/gstmad.c
View file

@ -29,10 +29,10 @@
#define GST_MAD(obj) \ #define GST_MAD(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MAD,GstMad)) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MAD,GstMad))
#define GST_MAD_CLASS(klass) \ #define GST_MAD_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MAD,GstMad)) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MAD,GstMadClass))
#define GST_IS_MAD(obj) \ #define GST_IS_MAD(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MAD)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MAD))
#define GST_IS_MAD_CLASS(obj) \ #define GST_IS_MAD_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MAD)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MAD))
@ -99,24 +99,14 @@ static const GstElementDetails gst_mad_details =
GST_ELEMENT_DETAILS ("mad mp3 decoder", GST_ELEMENT_DETAILS ("mad mp3 decoder",
"Codec/Decoder/Audio", "Codec/Decoder/Audio",
"Uses mad code to decode mp3 streams", "Uses mad code to decode mp3 streams",
"Wim Taymans <wim.taymans@chello.be>"); "Wim Taymans <wim@fluendo.com>");
/* Mad signals and args */
enum
{
/* FILL ME */
LAST_SIGNAL
};
enum enum
{ {
ARG_0, ARG_0,
ARG_HALF, ARG_HALF,
ARG_IGNORE_CRC, ARG_IGNORE_CRC
ARG_METADATA,
ARG_STREAMINFO
/* FILL ME */
}; };
GST_DEBUG_CATEGORY_STATIC (mad_debug); GST_DEBUG_CATEGORY_STATIC (mad_debug);
@ -898,8 +888,6 @@ gst_mad_set_property (GObject * object, guint prop_id,
{ {
GstMad *mad; GstMad *mad;
g_return_if_fail (GST_IS_MAD (object));
mad = GST_MAD (object); mad = GST_MAD (object);
switch (prop_id) { switch (prop_id) {
@ -920,8 +908,6 @@ gst_mad_get_property (GObject * object, guint prop_id,
{ {
GstMad *mad; GstMad *mad;
g_return_if_fail (GST_IS_MAD (object));
mad = GST_MAD (object); mad = GST_MAD (object);
switch (prop_id) { switch (prop_id) {
@ -1545,6 +1531,18 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
gint32 *outdata; gint32 *outdata;
mad_fixed_t const *left_ch, *right_ch; mad_fixed_t const *left_ch, *right_ch;
if (mad->need_newsegment) {
gint64 start = time_offset;
GST_DEBUG ("Sending NEWSEGMENT event, start=%" GST_TIME_FORMAT,
GST_TIME_ARGS (start));
gst_pad_push_event (mad->srcpad,
gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME,
start, GST_CLOCK_TIME_NONE, start));
mad->need_newsegment = FALSE;
}
/* will attach the caps to the buffer */ /* will attach the caps to the buffer */
result = result =
gst_pad_alloc_buffer_and_set_caps (mad->srcpad, 0, gst_pad_alloc_buffer_and_set_caps (mad->srcpad, 0,
@ -1586,18 +1584,6 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
} }
} }
if (mad->need_newsegment) {
gint64 start = GST_BUFFER_TIMESTAMP (outbuffer);
GST_DEBUG ("Sending NEWSEGMENT event, start=%" GST_TIME_FORMAT,
GST_TIME_ARGS (start));
gst_pad_push_event (mad->srcpad,
gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME,
start, GST_CLOCK_TIME_NONE, start));
mad->need_newsegment = FALSE;
}
result = gst_pad_push (mad->srcpad, outbuffer); result = gst_pad_push (mad->srcpad, outbuffer);
if (result != GST_FLOW_OK) { if (result != GST_FLOW_OK) {
/* Head for the exit, dropping samples as we go */ /* Head for the exit, dropping samples as we go */