mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-09 16:02:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

spectrum: simplify the have_interval calculation

Browse source 
Move some of the conditions to the places where the dependent variables change.
This commit is contained in:
Stefan Kost 2011-03-22 16:29:53 +02:00
parent 1979b04f46
commit 3b552ae6f8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/spectrum/gstspectrum.c
View file

@ -953,6 +953,7 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
* interval is in ns */ * interval is in ns */
spectrum->frames_per_interval = spectrum->frames_per_interval =
gst_util_uint64_scale (spectrum->interval, rate, GST_SECOND); gst_util_uint64_scale (spectrum->interval, rate, GST_SECOND);
spectrum->frames_todo = spectrum->frames_per_interval;
/* rounding error in ns, aggregated it in accumulated_error */ /* rounding error in ns, aggregated it in accumulated_error */
spectrum->error_per_interval = (spectrum->interval * rate) % GST_SECOND; spectrum->error_per_interval = (spectrum->interval * rate) % GST_SECOND;
if (spectrum->frames_per_interval == 0) if (spectrum->frames_per_interval == 0)
@ -988,12 +989,7 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
input_pos = (input_pos + 1) % nfft; input_pos = (input_pos + 1) % nfft;
spectrum->num_frames++; spectrum->num_frames++;
have_full_interval = ( have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
(spectrum->accumulated_error < GST_SECOND
&& spectrum->num_frames == spectrum->frames_per_interval) ||
(spectrum->accumulated_error >= GST_SECOND
&& spectrum->num_frames - 1 == spectrum->frames_per_interval)
);
/* If we have enough frames for an FFT or we have all frames required for /* If we have enough frames for an FFT or we have all frames required for
* the interval and we haven't run a FFT, then run an FFT */ * the interval and we haven't run a FFT, then run an FFT */
@ -1015,6 +1011,10 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
else else
spectrum->accumulated_error += spectrum->error_per_interval; spectrum->accumulated_error += spectrum->error_per_interval;
spectrum->frames_todo = spectrum->frames_per_interval;
if (spectrum->accumulated_error >= spectrum->frame_time)
spectrum->frames_todo++;
if (spectrum->post_messages) { if (spectrum->post_messages) {
GstMessage *m; GstMessage *m;
@ -1051,12 +1051,7 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
input_pos = (input_pos + 1) % nfft; input_pos = (input_pos + 1) % nfft;
spectrum->num_frames++; spectrum->num_frames++;
have_full_interval = ( have_full_interval = (spectrum->num_frames == spectrum->frames_todo);
(spectrum->accumulated_error < GST_SECOND
&& spectrum->num_frames == spectrum->frames_per_interval) ||
(spectrum->accumulated_error >= GST_SECOND
&& spectrum->num_frames - 1 == spectrum->frames_per_interval)
);
/* If we have enough frames for an FFT or we have all frames required for /* If we have enough frames for an FFT or we have all frames required for
* the interval and we haven't run a FFT, then run an FFT */ * the interval and we haven't run a FFT, then run an FFT */
@ -1082,6 +1077,10 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * buffer)
else else
spectrum->accumulated_error += spectrum->error_per_interval; spectrum->accumulated_error += spectrum->error_per_interval;
spectrum->frames_todo = spectrum->frames_per_interval;
if (spectrum->accumulated_error >= spectrum->frame_time)
spectrum->frames_todo++;
if (spectrum->post_messages) { if (spectrum->post_messages) {
GstMessage *m; GstMessage *m;

1
gst/spectrum/gstspectrum.h
View file

@ -61,6 +61,7 @@ struct _GstSpectrum
gboolean message_phase; gboolean message_phase;
guint64 interval; /* how many nanoseconds between emits */ guint64 interval; /* how many nanoseconds between emits */
guint64 frames_per_interval; /* how many frames per interval */ guint64 frames_per_interval; /* how many frames per interval */
guint64 frames_todo;
guint bands; /* number of spectrum bands */ guint bands; /* number of spectrum bands */
gint threshold; /* energy level treshold */ gint threshold; /* energy level treshold */
gboolean multi_channel; /* send separate channel results */ gboolean multi_channel; /* send separate channel results */