FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ext/amrwb/gstamrwbparse.*: Fix the duration query. Also set caps on the pads and buffers more correctly. Taken from r...

Browse Source 
Original commit message from CVS:
* ext/amrwb/gstamrwbparse.c:
* ext/amrwb/gstamrwbparse.h:
Fix the duration query. Also set caps on the pads and buffers more
correctly. Taken from recent armnbparse changes.
This commit is contained in:
Stefan Kost 2008-10-09 08:43:41 +00:00
parent 2dde2ebecc
commit 9335055068
3 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-10-09 Stefan Kost <ensonic@users.sf.net>
* ext/amrwb/gstamrwbparse.c:
* ext/amrwb/gstamrwbparse.h:
Fix the duration query. Also set caps on the pads and buffers more
correctly. Taken from recent armnbparse changes.
2008-10-08 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2008-10-08 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/mpegdemux/gstmpegdemux.c: * gst/mpegdemux/gstmpegdemux.c:

48
ext/amrwb/gstamrwbparse.c
View File

@ -205,19 +205,20 @@ gst_amrwbparse_query (GstPad * pad, GstQuery * query)
} }
tot = -1; tot = -1;
res = FALSE;
peer = gst_pad_get_peer (amrwbparse->sinkpad); peer = gst_pad_get_peer (amrwbparse->sinkpad);
if (peer) { if (peer) {
GstFormat pformat; GstFormat pformat;
gint64 pcur, ptot; gint64 ptot;
pformat = GST_FORMAT_BYTES; pformat = GST_FORMAT_BYTES;
res = gst_pad_query_position (peer, &pformat, &pcur);
res = gst_pad_query_duration (peer, &pformat, &ptot); res = gst_pad_query_duration (peer, &pformat, &ptot);
gst_object_unref (GST_OBJECT (peer)); if (res && amrwbparse->block) {
if (res) { tot = gst_util_uint64_scale_int (ptot, 20 * GST_MSECOND,
tot = amrwbparse->ts * ((gdouble) ptot / pcur); amrwbparse->block);
} }
gst_object_unref (GST_OBJECT (peer));
} }
gst_query_set_duration (query, GST_FORMAT_TIME, tot); gst_query_set_duration (query, GST_FORMAT_TIME, tot);
res = TRUE; res = TRUE;
@ -243,7 +244,7 @@ gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer)
{ {
GstAmrwbParse *amrwbparse; GstAmrwbParse *amrwbparse;
GstFlowReturn res = GST_FLOW_OK; GstFlowReturn res = GST_FLOW_OK;
gint block, mode; gint mode;
const guint8 *data; const guint8 *data;
GstBuffer *out; GstBuffer *out;
@ -253,6 +254,8 @@ gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer)
/* init */ /* init */
if (amrwbparse->need_header) { if (amrwbparse->need_header) {
GstEvent *segev;
GstCaps *caps;
if (gst_adapter_available (amrwbparse->adapter) < 9) if (gst_adapter_available (amrwbparse->adapter) < 9)
goto done; goto done;
@ -264,6 +267,17 @@ gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer)
gst_adapter_flush (amrwbparse->adapter, 9); gst_adapter_flush (amrwbparse->adapter, 9);
amrwbparse->need_header = FALSE; amrwbparse->need_header = FALSE;
caps = gst_caps_new_simple ("audio/AMR-WB",
"rate", G_TYPE_INT, 16000, "channels", G_TYPE_INT, 1, NULL);
gst_pad_set_caps (amrwbparse->srcpad, caps);
gst_caps_unref (caps);
GST_DEBUG_OBJECT (amrwbparse, "Sending first segment");
segev = gst_event_new_new_segment_full (FALSE, 1.0, 1.0,
GST_FORMAT_TIME, 0, -1, 0);
gst_pad_push_event (amrwbparse->srcpad, segev);
} }
while (TRUE) { while (TRUE) {
@ -274,26 +288,30 @@ gst_amrwbparse_chain (GstPad * pad, GstBuffer * buffer)
/* get size */ /* get size */
mode = (data[0] >> 3) & 0x0F; mode = (data[0] >> 3) & 0x0F;
block = block_size[mode] + 1; /* add one for the mode */ amrwbparse->block = block_size[mode] + 1; /* add one for the mode */
if (gst_adapter_available (amrwbparse->adapter) < block) if (gst_adapter_available (amrwbparse->adapter) < amrwbparse->block)
break; break;
out = gst_buffer_new_and_alloc (block); out = gst_buffer_new_and_alloc (amrwbparse->block);
data = gst_adapter_peek (amrwbparse->adapter, block); data = gst_adapter_peek (amrwbparse->adapter, amrwbparse->block);
memcpy (GST_BUFFER_DATA (out), data, block); memcpy (GST_BUFFER_DATA (out), data, amrwbparse->block);
/* output */ /* timestamp, all constants that won't overflow */
GST_BUFFER_DURATION (out) = GST_SECOND * L_FRAME16k / 16000; GST_BUFFER_DURATION (out) = GST_SECOND * L_FRAME16k / 16000;
GST_BUFFER_TIMESTAMP (out) = amrwbparse->ts; GST_BUFFER_TIMESTAMP (out) = amrwbparse->ts;
if (GST_CLOCK_TIME_IS_VALID (amrwbparse->ts))
amrwbparse->ts += GST_BUFFER_DURATION (out); amrwbparse->ts += GST_BUFFER_DURATION (out);
gst_buffer_set_caps (out,
(GstCaps *) gst_pad_get_pad_template_caps (amrwbparse->srcpad)); gst_buffer_set_caps (out, GST_PAD_CAPS (amrwbparse->srcpad));
GST_DEBUG_OBJECT (amrwbparse, "Pushing %d bytes of data",
amrwbparse->block);
res = gst_pad_push (amrwbparse->srcpad, out); res = gst_pad_push (amrwbparse->srcpad, out);
gst_adapter_flush (amrwbparse->adapter, block); gst_adapter_flush (amrwbparse->adapter, amrwbparse->block);
} }
done: done:

1
ext/amrwb/gstamrwbparse.h
View File

@ -53,6 +53,7 @@ struct _GstAmrwbParse {
gboolean seekable; gboolean seekable;
gboolean need_header; gboolean need_header;
gint64 offset; gint64 offset;
gint block;
guint64 ts; guint64 ts;
}; };