mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
GCC 2.95 fixes (#328263).
Original commit message from CVS: 2006-01-23 Andy Wingo <wingo@pobox.com> * ext/alsa/gstalsasink.c: * gst-libs/gst/rtp/gstbasertpdepayload.c: (gst_base_rtp_depayload_setcaps), (gst_base_rtp_depayload_add_to_queue), (gst_base_rtp_depayload_queue_release): GCC 2.95 fixes (#328263). Patch by: Jens Granseuer <jensgr at gmx dot net>
This commit is contained in:
parent
b4c1c1c61c
commit
6b153515b0
3 changed files with 25 additions and 9 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2006-01-23 Andy Wingo <wingo@pobox.com>
|
||||
|
||||
* ext/alsa/gstalsasink.c:
|
||||
* gst-libs/gst/rtp/gstbasertpdepayload.c:
|
||||
(gst_base_rtp_depayload_setcaps),
|
||||
(gst_base_rtp_depayload_add_to_queue),
|
||||
(gst_base_rtp_depayload_queue_release): GCC 2.95 fixes (#328263).
|
||||
|
||||
Patch by: Jens Granseuer <jensgr at gmx dot net>
|
||||
|
||||
2006-01-22 Julien MOUTTE <julien@moutte.net>
|
||||
|
||||
* sys/ximage/ximagesink.c: (gst_ximagesink_ximage_destroy):
|
||||
|
|
|
@ -74,16 +74,18 @@ enum
|
|||
LAST_SIGNAL
|
||||
};
|
||||
|
||||
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
|
||||
# define ALSA_SINK_FACTORY_ENDIANNESS "LITTLE_ENDIAN, BIG_ENDIAN"
|
||||
#else
|
||||
# define ALSA_SINK_FACTORY_ENDIANNESS "BIG_ENDIAN, LITTLE_ENDIAN"
|
||||
#endif
|
||||
|
||||
static GstStaticPadTemplate alsasink_sink_factory =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("audio/x-raw-int, "
|
||||
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
|
||||
"endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
|
||||
#else
|
||||
"endianness = (int) { BIG_ENDIAN, LITTLE_ENDIAN }, "
|
||||
#endif
|
||||
"endianness = (int) { " ALSA_SINK_FACTORY_ENDIANNESS " }, "
|
||||
"signed = (boolean) { TRUE, FALSE }, "
|
||||
"width = (int) 16, "
|
||||
"depth = (int) 16, "
|
||||
|
|
|
@ -173,12 +173,13 @@ static gboolean
|
|||
gst_base_rtp_depayload_setcaps (GstPad * pad, GstCaps * caps)
|
||||
{
|
||||
GstBaseRTPDepayload *filter;
|
||||
GstBaseRTPDepayloadClass *bclass;
|
||||
|
||||
filter = GST_BASE_RTP_DEPAYLOAD (gst_pad_get_parent (pad));
|
||||
g_return_val_if_fail (filter != NULL, FALSE);
|
||||
g_return_val_if_fail (GST_IS_BASE_RTP_DEPAYLOAD (filter), FALSE);
|
||||
|
||||
GstBaseRTPDepayloadClass *bclass = GST_BASE_RTP_DEPAYLOAD_GET_CLASS (filter);
|
||||
bclass = GST_BASE_RTP_DEPAYLOAD_GET_CLASS (filter);
|
||||
|
||||
if (bclass->set_caps)
|
||||
return bclass->set_caps (filter, caps);
|
||||
|
@ -241,6 +242,7 @@ gst_base_rtp_depayload_add_to_queue (GstBaseRTPDepayload * filter,
|
|||
GstBuffer * in)
|
||||
{
|
||||
GQueue *queue = filter->queue;
|
||||
int i;
|
||||
|
||||
/* our first packet, just push it */
|
||||
QUEUE_LOCK (filter);
|
||||
|
@ -255,7 +257,7 @@ gst_base_rtp_depayload_add_to_queue (GstBaseRTPDepayload * filter,
|
|||
queueseq = gst_rtp_buffer_get_seq (GST_BUFFER (g_queue_peek_head (queue)));
|
||||
|
||||
/* look for right place to insert it */
|
||||
int i = 0;
|
||||
i = 0;
|
||||
|
||||
while (seqnum > queueseq) {
|
||||
gpointer data;
|
||||
|
@ -350,6 +352,8 @@ gst_base_rtp_depayload_queue_release (GstBaseRTPDepayload * filter)
|
|||
GQueue *queue = filter->queue;
|
||||
guint32 headts, tailts;
|
||||
GstBaseRTPDepayloadClass *bclass;
|
||||
gfloat q_size_secs;
|
||||
guint maxtsunits;
|
||||
|
||||
if (g_queue_is_empty (queue))
|
||||
return;
|
||||
|
@ -359,8 +363,8 @@ gst_base_rtp_depayload_queue_release (GstBaseRTPDepayload * filter)
|
|||
*/
|
||||
GST_DEBUG_OBJECT (filter, "clockrate %d, queue_delay %d", filter->clock_rate,
|
||||
filter->queue_delay);
|
||||
gfloat q_size_secs = (gfloat) filter->queue_delay / 1000;
|
||||
guint maxtsunits = (gfloat) filter->clock_rate * q_size_secs;
|
||||
q_size_secs = (gfloat) filter->queue_delay / 1000;
|
||||
maxtsunits = (gfloat) filter->clock_rate * q_size_secs;
|
||||
|
||||
QUEUE_LOCK (filter);
|
||||
headts =
|
||||
|
|
Loading…
Reference in a new issue