mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix monoscope: caps already asked for mono input: make it actually expect such input.

Browse source 
Original commit message from CVS:
Fix monoscope: caps already asked for mono input: make it actually expect
such input.
This commit is contained in:
Richard Boulton 2002-03-03 17:29:59 +00:00
parent 7fb7fcbe86
commit b62e08de6e
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/monoscope/monoscope.c
View file

@ -25,7 +25,6 @@
#define scope_width 256 #define scope_width 256
#define scope_height 128 #define scope_height 128
static gint16 newEq[CONVOLVE_BIG]; // latest block of 512 samples.
static gint16 copyEq[CONVOLVE_BIG]; static gint16 copyEq[CONVOLVE_BIG];
static int avgEq[CONVOLVE_SMALL]; // a running average of the last few. static int avgEq[CONVOLVE_SMALL]; // a running average of the last few.
static int avgMax; // running average of max sample. static int avgMax; // running average of max sample.
@ -50,7 +49,7 @@ void monoscope_init (guint32 resx, guint32 resy)
colors_init(colors); colors_init(colors);
} }
guint32 * monoscope_update (gint16 data [2][512]) guint32 * monoscope_update (gint16 data [512])
{ {
/* Note that CONVOLVE_BIG must == data size here, ie 512. */ /* Note that CONVOLVE_BIG must == data size here, ie 512. */
/* Really, we want samples evenly spread over the available data. /* Really, we want samples evenly spread over the available data.
@ -59,19 +58,14 @@ guint32 * monoscope_update (gint16 data [2][512])
int foo; int foo;
int bar; int bar;
int h; int h;
guchar bits[ 257 * 129];
guint32 *loc; guint32 *loc;
int factor; int factor;
int val; int val;
int max = 1; int max = 1;
short * thisEq; short * thisEq;
for (i = 0; i < CONVOLVE_BIG; i++) {
/* Average the two channels. */
newEq[i] = (((int) data[0][i]) + (int) data[1][i]) >> 1;
}
memcpy (copyEq, newEq, sizeof (short) * CONVOLVE_BIG); memcpy (copyEq, data, sizeof (short) * CONVOLVE_BIG);
thisEq = copyEq; thisEq = copyEq;
#if 1 #if 1
val = convolve_match (avgEq, copyEq, state); val = convolve_match (avgEq, copyEq, state);

2
gst/monoscope/monoscope.h
View file

@ -4,7 +4,7 @@
#include <glib.h> #include <glib.h>
void monoscope_init (guint32 resx, guint32 resy); void monoscope_init (guint32 resx, guint32 resy);
guint32 * monoscope_update (gint16 data [2][512]); guint32 * monoscope_update (gint16 data [512]);
void monoscope_close (); void monoscope_close ();
#endif #endif