summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/ogg/gstoggmux.c156
-rw-r--r--ext/ogg/gstoggmux.h3
-rw-r--r--gst/audioresample/resample.c8
-rw-r--r--gst/audiotestsrc/gstaudiotestsrc.c24
-rw-r--r--gst/videoscale/vs_4tap.c4
-rw-r--r--gst/videotestsrc/generate_sine_table.c4
-rw-r--r--gst/videotestsrc/videotestsrc.c4
-rw-r--r--tests/icles/test-xoverlay.c6
8 files changed, 64 insertions, 145 deletions
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index b5ab6ef39..0cc6ab0f0 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -683,24 +683,18 @@ gst_ogg_mux_compare_pads (GstOggMux * ogg_mux, GstOggPadData * first,
/* if the first pad doesn't contain anything or is even NULL, return
* the second pad as best candidate and vice versa */
- if (first == NULL || (first->buffer == NULL && first->next_buffer == NULL))
+ if (first == NULL)
return 1;
- if (second == NULL || (second->buffer == NULL && second->next_buffer == NULL))
+ if (second == NULL)
return -1;
/* no timestamp on first buffer, it must go first */
- if (first->buffer)
- firsttime = GST_BUFFER_TIMESTAMP (first->buffer);
- else
- firsttime = GST_BUFFER_TIMESTAMP (first->next_buffer);
+ firsttime = GST_BUFFER_TIMESTAMP (first->buffer);
if (firsttime == GST_CLOCK_TIME_NONE)
return -1;
/* no timestamp on second buffer, it must go first */
- if (second->buffer)
- secondtime = GST_BUFFER_TIMESTAMP (second->buffer);
- else
- secondtime = GST_BUFFER_TIMESTAMP (second->next_buffer);
+ secondtime = GST_BUFFER_TIMESTAMP (second->buffer);
if (secondtime == GST_CLOCK_TIME_NONE)
return 1;
@@ -844,14 +838,16 @@ no_granule:
*
* returns a pointer to an oggpad that holds the best buffer, or
* NULL when no pad was usable. "best" means the buffer marked
- * with the lowest timestamp. If best->buffer == NULL then nothing
- * should be done until more data arrives */
+ * with the lowest timestamp. If best->buffer == NULL then either
+ * we're at EOS (popped = FALSE), or a buffer got dropped, so retry. */
static GstOggPadData *
-gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
+gst_ogg_mux_queue_pads (GstOggMux * ogg_mux, gboolean * popped)
{
- GstOggPadData *bestpad = NULL, *still_hungry = NULL;
+ GstOggPadData *bestpad = NULL;
GSList *walk;
+ *popped = FALSE;
+
/* try to make sure we have a buffer from each usable pad first */
walk = ogg_mux->collect->data;
while (walk) {
@@ -869,19 +865,13 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
if (pad->buffer == NULL) {
GstBuffer *buf;
- /* shift the buffer along if needed (it's okay if next_buffer is NULL) */
- if (pad->buffer == NULL) {
- GST_LOG_OBJECT (data->pad, "shifting buffer %" GST_PTR_FORMAT,
- pad->next_buffer);
- pad->buffer = pad->next_buffer;
- pad->next_buffer = NULL;
- }
-
buf = gst_collect_pads_pop (ogg_mux->collect, data);
GST_LOG_OBJECT (data->pad, "popped buffer %" GST_PTR_FORMAT, buf);
/* On EOS we get a NULL buffer */
if (buf != NULL) {
+ *popped = TRUE;
+
if (ogg_mux->delta_pad == NULL &&
GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT))
ogg_mux->delta_pad = pad;
@@ -961,52 +951,24 @@ gst_ogg_mux_queue_pads (GstOggMux * ogg_mux)
if (G_UNLIKELY (!buf))
GST_DEBUG_OBJECT (data->pad, "buffer clipped");
}
- } else {
- GST_DEBUG_OBJECT (data->pad, "EOS on pad");
- if (!pad->eos) {
- ogg_page page;
-
- /* it's no longer active */
- ogg_mux->active_pads--;
-
- /* Just gone to EOS. Flush existing page(s) */
- pad->eos = TRUE;
-
- while (ogg_stream_flush (&pad->map.stream, &page)) {
- /* Place page into the per-pad queue */
- gst_ogg_mux_pad_queue_page (ogg_mux, pad, &page, pad->first_delta);
- /* increment the page number counter */
- pad->pageno++;
- /* mark other pages as delta */
- pad->first_delta = TRUE;
- }
- }
}
- pad->next_buffer = buf;
+ pad->buffer = buf;
}
/* we should have a buffer now, see if it is the best pad to
* pull on */
- if (pad->buffer || pad->next_buffer) {
+ if (pad->buffer) {
if (gst_ogg_mux_compare_pads (ogg_mux, bestpad, pad) > 0) {
GST_LOG_OBJECT (data->pad,
- "new best pad, with buffers %" GST_PTR_FORMAT
- " and %" GST_PTR_FORMAT, pad->buffer, pad->next_buffer);
+ "new best pad, with buffer %" GST_PTR_FORMAT, pad->buffer);
bestpad = pad;
}
- } else if (!pad->eos) {
- GST_LOG_OBJECT (data->pad, "hungry pad");
- still_hungry = pad;
}
}
- if (still_hungry)
- /* drop back into collectpads... */
- return still_hungry;
- else
- return bestpad;
+ return bestpad;
}
static GList *
@@ -1057,8 +1019,7 @@ gst_ogg_mux_get_headers (GstOggPadData * pad)
pad->always_flush_page = TRUE;
} else if (gst_structure_has_name (structure, "video/x-dirac")) {
res = g_list_append (res, pad->buffer);
- pad->buffer = pad->next_buffer;
- pad->next_buffer = NULL;
+ pad->buffer = NULL;
pad->always_flush_page = TRUE;
} else {
GST_LOG_OBJECT (thepad, "caps don't have streamheader");
@@ -1143,7 +1104,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
GST_LOG_OBJECT (mux, "looking at pad %s:%s", GST_DEBUG_PAD_NAME (thepad));
/* if the pad has no buffer, we don't care */
- if (pad->buffer == NULL && pad->next_buffer == NULL)
+ if (pad->buffer == NULL)
continue;
/* now figure out the headers */
@@ -1180,9 +1141,6 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
} else if (pad->buffer) {
buf = pad->buffer;
gst_buffer_ref (buf);
- } else if (pad->next_buffer) {
- buf = pad->next_buffer;
- gst_buffer_ref (buf);
} else {
/* fixme -- should be caught in the previous list traversal. */
GST_OBJECT_LOCK (thepad);
@@ -1357,16 +1315,18 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPadData * best)
gboolean delta_unit;
gint64 granulepos = 0;
GstClockTime timestamp, gp_time;
+ GstBuffer *next_buf;
GST_LOG_OBJECT (ogg_mux, "best pad %" GST_PTR_FORMAT
", currently pulling from %" GST_PTR_FORMAT, best->collect.pad,
ogg_mux->pulling);
- /* best->buffer is non-NULL, either the pad is EOS's or there is a next
- * buffer */
- if (best->next_buffer == NULL && !best->eos) {
- GST_WARNING_OBJECT (ogg_mux, "no subsequent buffer and EOS not reached");
- return GST_FLOW_WRONG_STATE;
+ next_buf = gst_collect_pads_peek (ogg_mux->collect, &best->collect);
+ if (next_buf) {
+ best->eos = FALSE;
+ gst_buffer_unref (next_buf);
+ } else {
+ best->eos = TRUE;
}
/* if we were already pulling from one pad, but the new "best" buffer is
@@ -1472,7 +1432,7 @@ gst_ogg_mux_process_best_pad (GstOggMux * ogg_mux, GstOggPadData * best)
GST_GP_CAST (packet.granulepos), (gint64) packet.packetno,
packet.bytes);
- packet.e_o_s = (pad->eos ? 1 : 0);
+ packet.e_o_s = best->eos ? 1 : 0;
tmpbuf = NULL;
/* we flush when we see a new keyframe */
@@ -1655,23 +1615,20 @@ static gboolean
all_pads_eos (GstCollectPads * pads)
{
GSList *walk;
- gboolean alleos = TRUE;
walk = pads->data;
while (walk) {
- GstBuffer *buf;
- GstCollectData *data = (GstCollectData *) walk->data;
+ GstOggPadData *oggpad = (GstOggPadData *) walk->data;
- buf = gst_collect_pads_peek (pads, data);
- if (buf) {
- alleos = FALSE;
- gst_buffer_unref (buf);
- goto beach;
- }
- walk = walk->next;
+ GST_DEBUG ("oggpad %p eos %d", oggpad, oggpad->eos);
+
+ if (oggpad->eos == FALSE)
+ return FALSE;
+
+ walk = g_slist_next (walk);
}
-beach:
- return alleos;
+
+ return TRUE;
}
/* This function is called when there is data on all pads.
@@ -1689,45 +1646,26 @@ gst_ogg_mux_collected (GstCollectPads * pads, GstOggMux * ogg_mux)
{
GstOggPadData *best;
GstFlowReturn ret;
- gint activebefore;
+ gboolean popped;
GST_LOG_OBJECT (ogg_mux, "collected");
- activebefore = ogg_mux->active_pads;
-
/* queue buffers on all pads; find a buffer with the lowest timestamp */
- best = gst_ogg_mux_queue_pads (ogg_mux);
- if (best && !best->buffer) {
- GST_DEBUG_OBJECT (ogg_mux, "No buffer available on best pad");
+ best = gst_ogg_mux_queue_pads (ogg_mux, &popped);
+
+ if (popped)
return GST_FLOW_OK;
- }
- if (!best) {
- return GST_FLOW_WRONG_STATE;
+ if (best == NULL || best->buffer == NULL) {
+ /* This is not supposed to happen */
+ return GST_FLOW_ERROR;
}
ret = gst_ogg_mux_process_best_pad (ogg_mux, best);
- if (ogg_mux->active_pads < activebefore) {
- /* If the active pad count went down, this mean at least one pad has gone
- * EOS. Since CollectPads only calls _collected() once when all pads are
- * EOS, and our code doesn't _pop() from all pads we need to check that by
- * peeking on all pads, else we won't be called again and the muxing will
- * not terminate (push out EOS). */
-
- /* if all the pads have been removed, flush all pending data */
- if ((ret == GST_FLOW_OK) && all_pads_eos (pads)) {
- GST_LOG_OBJECT (ogg_mux, "no pads remaining, flushing data");
-
- do {
- best = gst_ogg_mux_queue_pads (ogg_mux);
- if (best)
- ret = gst_ogg_mux_process_best_pad (ogg_mux, best);
- } while ((ret == GST_FLOW_OK) && (best != NULL));
-
- GST_DEBUG_OBJECT (ogg_mux, "Pushing EOS");
- gst_pad_push_event (ogg_mux->srcpad, gst_event_new_eos ());
- }
+ if (best->eos && all_pads_eos (pads)) {
+ gst_pad_push_event (ogg_mux->srcpad, gst_event_new_eos ());
+ return GST_FLOW_UNEXPECTED;
}
return ret;
@@ -1831,10 +1769,6 @@ gst_ogg_mux_clear_collectpads (GstCollectPads * collect)
gst_buffer_unref (oggpad->buffer);
oggpad->buffer = NULL;
}
- if (oggpad->next_buffer) {
- gst_buffer_unref (oggpad->next_buffer);
- oggpad->next_buffer = NULL;
- }
gst_segment_init (&oggpad->segment, GST_FORMAT_TIME);
}
diff --git a/ext/ogg/gstoggmux.h b/ext/ogg/gstoggmux.h
index b0ba57837..ec94224d8 100644
--- a/ext/ogg/gstoggmux.h
+++ b/ext/ogg/gstoggmux.h
@@ -55,10 +55,7 @@ typedef struct
GstSegment segment;
- /* These two buffers make a very simple queue - they enter as 'next_buffer'
- * and (usually) leave as 'buffer', except at EOS, when buffer will be NULL */
GstBuffer *buffer; /* the first waiting buffer for the pad */
- GstBuffer *next_buffer; /* the second waiting buffer for the pad */
gint64 packetno; /* number of next packet */
gint64 pageno; /* number of next page */
diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
index 7d42f0e0f..a10c9f698 100644
--- a/gst/audioresample/resample.c
+++ b/gst/audioresample/resample.c
@@ -97,10 +97,6 @@ speex_free (void *ptr)
#include <math.h>
-#ifndef M_PI
-#define M_PI 3.14159263
-#endif
-
#ifdef FIXED_POINT
#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
#else
@@ -323,7 +319,7 @@ sinc (float cutoff, float x, int N, struct FuncDef *window_func)
else if (fabs (x) > .5f * N)
return 0;
/*FIXME: Can it really be any slower than this? */
- return WORD2INT (32768. * cutoff * sin (M_PI * xx) / (M_PI * xx) *
+ return WORD2INT (32768. * cutoff * sin (G_PI * xx) / (G_PI * xx) *
compute_func (fabs (2. * x / N), window_func));
}
#else
@@ -346,7 +342,7 @@ sinc (float cutoff, float x, int N, struct FuncDef *window_func)
else if (fabs (x) > .5 * N)
return 0;
/*FIXME: Can it really be any slower than this? */
- return cutoff * sin (M_PI * xx) / (M_PI * xx) * compute_func (fabs (2. * x /
+ return cutoff * sin (G_PI * xx) / (G_PI * xx) * compute_func (fabs (2. * x /
N), window_func);
}
#endif
diff --git a/gst/audiotestsrc/gstaudiotestsrc.c b/gst/audiotestsrc/gstaudiotestsrc.c
index 1ad73729c..91fecc2db 100644
--- a/gst/audiotestsrc/gstaudiotestsrc.c
+++ b/gst/audiotestsrc/gstaudiotestsrc.c
@@ -48,15 +48,7 @@
#include "gstaudiotestsrc.h"
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#ifndef M_PI_2
-#define M_PI_2 1.57079632679489661923
-#endif
-
-#define M_PI_M2 ( M_PI + M_PI )
+#define M_PI_M2 ( G_PI + G_PI )
GST_DEBUG_CATEGORY_STATIC (audio_test_src_debug);
#define GST_CAT_DEFAULT audio_test_src_debug
@@ -478,7 +470,7 @@ gst_audio_test_src_create_square_##type (GstAudioTestSrc * src, g##type * sample
src->accumulator -= M_PI_M2; \
\
for (c = 0; c < src->channels; ++c) { \
- samples[i++] = (g##type) ((src->accumulator < M_PI) ? amp : -amp); \
+ samples[i++] = (g##type) ((src->accumulator < G_PI) ? amp : -amp); \
} \
} \
}
@@ -503,7 +495,7 @@ gst_audio_test_src_create_saw_##type (GstAudioTestSrc * src, g##type * samples)
gdouble step, amp; \
\
step = M_PI_M2 * src->freq / src->samplerate; \
- amp = (src->volume * scale) / M_PI; \
+ amp = (src->volume * scale) / G_PI; \
\
i = 0; \
while (i < (src->generate_samples_per_buffer * src->channels)) { \
@@ -511,7 +503,7 @@ gst_audio_test_src_create_saw_##type (GstAudioTestSrc * src, g##type * samples)
if (src->accumulator >= M_PI_M2) \
src->accumulator -= M_PI_M2; \
\
- if (src->accumulator < M_PI) { \
+ if (src->accumulator < G_PI) { \
for (c = 0; c < src->channels; ++c) \
samples[i++] = (g##type) (src->accumulator * amp); \
} else { \
@@ -541,7 +533,7 @@ gst_audio_test_src_create_triangle_##type (GstAudioTestSrc * src, g##type * samp
gdouble step, amp; \
\
step = M_PI_M2 * src->freq / src->samplerate; \
- amp = (src->volume * scale) / M_PI_2; \
+ amp = (src->volume * scale) / G_PI_2; \
\
i = 0; \
while (i < (src->generate_samples_per_buffer * src->channels)) { \
@@ -549,12 +541,12 @@ gst_audio_test_src_create_triangle_##type (GstAudioTestSrc * src, g##type * samp
if (src->accumulator >= M_PI_M2) \
src->accumulator -= M_PI_M2; \
\
- if (src->accumulator < (M_PI * 0.5)) { \
+ if (src->accumulator < (G_PI_2)) { \
for (c = 0; c < src->channels; ++c) \
samples[i++] = (g##type) (src->accumulator * amp); \
- } else if (src->accumulator < (M_PI * 1.5)) { \
+ } else if (src->accumulator < (G_PI * 1.5)) { \
for (c = 0; c < src->channels; ++c) \
- samples[i++] = (g##type) ((src->accumulator - M_PI) * -amp); \
+ samples[i++] = (g##type) ((src->accumulator - G_PI) * -amp); \
} else { \
for (c = 0; c < src->channels; ++c) \
samples[i++] = (g##type) ((M_PI_M2 - src->accumulator) * -amp); \
diff --git a/gst/videoscale/vs_4tap.c b/gst/videoscale/vs_4tap.c
index f983df27c..93024bceb 100644
--- a/gst/videoscale/vs_4tap.c
+++ b/gst/videoscale/vs_4tap.c
@@ -52,12 +52,12 @@ vs_4tap_func (double x)
#if 0
if (x == 0)
return 1;
- return sin (M_PI * x) / (M_PI * x) * (1 - 0.25 * x * x);
+ return sin (G_PI * x) / (G_PI * x) * (1 - 0.25 * x * x);
#endif
#if 1
if (x == 0)
return 1;
- return sin (M_PI * x) / (M_PI * x);
+ return sin (G_PI * x) / (G_PI * x);
#endif
}
diff --git a/gst/videotestsrc/generate_sine_table.c b/gst/videotestsrc/generate_sine_table.c
index 432e1a56f..11d17af0b 100644
--- a/gst/videotestsrc/generate_sine_table.c
+++ b/gst/videotestsrc/generate_sine_table.c
@@ -1,14 +1,14 @@
#include <stdio.h>
#include <math.h>
-
+#include <glib.h>
static int
get_value (int i)
{
int x;
- x = floor (256 * (0.5 + 0.5 * sin (i * 2 * M_PI / 256)));
+ x = floor (256 * (0.5 + 0.5 * sin (i * 2 * G_PI / 256)));
if (x > 255)
x = 255;
return x;
diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c
index 99735075d..ecc83f88b 100644
--- a/gst/videotestsrc/videotestsrc.c
+++ b/gst/videotestsrc/videotestsrc.c
@@ -1561,8 +1561,8 @@ gst_video_test_src_ball (GstVideoTestSrc * v, unsigned char *dest, int w, int h)
fourcc->paint_setup (p, dest);
- x = radius + (0.5 + 0.5 * sin (2 * M_PI * t / 200)) * (w - 2 * radius);
- y = radius + (0.5 + 0.5 * sin (2 * M_PI * sqrt (2) * t / 200)) * (h -
+ x = radius + (0.5 + 0.5 * sin (2 * G_PI * t / 200)) * (w - 2 * radius);
+ y = radius + (0.5 + 0.5 * sin (2 * G_PI * sqrt (2) * t / 200)) * (h -
2 * radius);
for (i = 0; i < h; i++) {
diff --git a/tests/icles/test-xoverlay.c b/tests/icles/test-xoverlay.c
index c129b41cb..b1b9d92bb 100644
--- a/tests/icles/test-xoverlay.c
+++ b/tests/icles/test-xoverlay.c
@@ -64,8 +64,8 @@ animate_render_rect (gpointer user_data)
gdouble c = cos (2.0 * anim_state.a);
anim_state.a += anim_state.p;
- if (anim_state.a > (M_PI + M_PI))
- anim_state.a -= (M_PI + M_PI);
+ if (anim_state.a > (G_PI + G_PI))
+ anim_state.a -= (G_PI + G_PI);
r->w = anim_state.w / 2;
r->x = (r->w - (r->w / 2)) + c * (r->w / 2);
@@ -223,7 +223,7 @@ main (gint argc, gchar ** argv)
anim_state.w = 320;
anim_state.h = 240;
anim_state.a = 0.0;
- anim_state.p = (M_PI + M_PI) / 200.0;
+ anim_state.p = (G_PI + G_PI) / 200.0;
handle_resize_cb (video_window, NULL, sink);
g_signal_connect (video_window, "configure-event",
View Lorry Controller Status