Skip to content
Snippets Groups Projects
Commit bc54de28 authored by Leo Pound Singer's avatar Leo Pound Singer
Browse files

Renamed lal_nds2_framesrc to ndssrc, and added play script

parent f4926565
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/play_nds_hoft.sh 0 → 100755
+ 21
− 0
View file @ bc54de28
# A gst-launch pipeline to encode h(t) from NDS2 into a OGG/Vorbis file
HOST="marble.ligo-wa.caltech.edu"
REQUESTED_CHANNEL_NAME="H1:DMT-STRAIN"
gst-launch \
ndssrc \
host="${HOST}" \
requested-channel-name="${REQUESTED_CHANNEL_NAME}" \
! audiochebband \
lower-frequency=45 \
upper-frequency=2500 \
poles=8 \
! audioamplify \
clipping-method=3 \
amplification=2e+17 \
! progressreport \
update-freq=2 \
! audiorate \
! audioconvert \
! autoaudiosink
src/plugins/Makefile.am
+ 1
− 1
View file @ bc54de28
......@@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgstlal.la
libgstlal_la_SOURCES = \
gstlal_plugins.h gstlal.c \
gstlal_framesrc.h gstlal_framesrc.c \
gstlal_nds2_framesrc.h gstlal_nds2_framesrc.c \
gstlal_ndssrc.h gstlal_ndssrc.c \
low_latency_inspiral_functions.h low_latency_inspiral_functions.c \
gstlal_matrixmixer.h gstlal_matrixmixer.c \
gstlal_simulation.h gstlal_simulation.c \
......
src/plugins/gstlal.c
+ 2
− 2
View file @ bc54de28
......@@ -76,7 +76,7 @@
#include <gstlal.h>
#include <gstlal_plugins.h>
#include <gstlal_framesrc.h>
#include <gstlal_nds2_framesrc.h>
#include <gstlal_ndssrc.h>
#include <gstlal_matrixmixer.h>
#include <gstlal_simulation.h>
#include <gstlal_whiten.h>
......@@ -121,7 +121,7 @@ static gboolean plugin_init(GstPlugin *plugin)
GType type;
} *element, elements[] = {
{"lal_framesrc", GSTLAL_FRAMESRC_TYPE},
{"lal_nds2_framesrc", GSTLAL_NDS2_FRAMESRC_TYPE},
{"ndssrc", GSTLAL_NDSSRC_TYPE},
{"lal_matrixmixer", GSTLAL_MATRIXMIXER_TYPE},
{"lal_simulation", GSTLAL_SIMULATION_TYPE},
{"lal_whiten", GSTLAL_WHITEN_TYPE},
......
src/plugins/gstlal_nds2_framesrc.c → src/plugins/gstlal_ndssrc.c
+ 23
− 23
View file @ bc54de28
/*
* NDS2-based frame src element
* NDS-based src element
*
* Copyright (C) 2008 Leo Singer
*
......@@ -53,7 +53,7 @@
#include <gstlal.h>
#include <gstlal_nds2_framesrc.h>
#include <gstlal_ndssrc.h>
#include <daqc_internal.h>
......@@ -89,7 +89,7 @@ static const char* DEFAULT_REQUESTED_CHANNEL_NAME = "H1:DMT-STRAIN";
// Disconnect from NDS2 server and free daq and daq_channel resources.
static void disconnect_and_free_daq(GSTLALNDS2FrameSrc* element)
static void disconnect_and_free_daq(GSTLALNDSSrc* element)
{
if (element->daq)
{
......@@ -111,7 +111,7 @@ static void disconnect_and_free_daq(GSTLALNDS2FrameSrc* element)
// Connect to NDS2 server.
static int connect_daq(GSTLALNDS2FrameSrc* element)
static int connect_daq(GSTLALNDSSrc* element)
{
if (!element->daq)
{
......@@ -141,7 +141,7 @@ static int connect_daq(GSTLALNDS2FrameSrc* element)
* Set channel by looking up channelname on NDS2 channel list.
*/
static int set_channel_for_channelname(GSTLALNDS2FrameSrc *element)
static int set_channel_for_channelname(GSTLALNDSSrc *element)
{
daq_channel_t* channels = calloc(MAX_CHANNELS, sizeof(daq_channel_t));
if (!channels)
......@@ -189,7 +189,7 @@ static int set_channel_for_channelname(GSTLALNDS2FrameSrc *element)
*/
static GstCaps *caps_for_channel(GSTLALNDS2FrameSrc* element)
static GstCaps *caps_for_channel(GSTLALNDSSrc* element)
{
GstCaps *caps = NULL;
......@@ -285,7 +285,7 @@ enum property {
static void set_property(GObject *object, enum property id, const GValue *value, GParamSpec *pspec)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
GST_OBJECT_LOCK(element);
......@@ -308,7 +308,7 @@ static void set_property(GObject *object, enum property id, const GValue *value,
static void get_property(GObject *object, enum property id, GValue *value, GParamSpec *pspec)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
GST_OBJECT_LOCK(element);
......@@ -342,7 +342,7 @@ static void get_property(GObject *object, enum property id, GValue *value, GPara
static gboolean start(GstBaseSrc *object)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
// Connect to NDS2 server.
if (!connect_daq(element))
......@@ -438,7 +438,7 @@ static gboolean start(GstBaseSrc *object)
static gboolean stop(GstBaseSrc *object)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
disconnect_and_free_daq(element);
......@@ -453,7 +453,7 @@ static gboolean stop(GstBaseSrc *object)
static GstFlowReturn create(GstBaseSrc *basesrc, guint64 offset, guint size, GstBuffer **buffer)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(basesrc);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(basesrc);
{
int retval = daq_recv_next(element->daq);
......@@ -510,7 +510,7 @@ static gboolean is_seekable(GstBaseSrc *object)
#if 0
static gboolean do_seek(GstBaseSrc *basesrc, GstSegment *segment)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(basesrc);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(basesrc);
LIGOTimeGPS epoch;
/*
......@@ -554,7 +554,7 @@ static gboolean do_seek(GstBaseSrc *basesrc, GstSegment *segment)
/*
static gboolean query(GstBaseSrc *basesrc, GstQuery *query)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(basesrc);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(basesrc);
switch(GST_QUERY_TYPE(query)) {
case GST_QUERY_FORMATS:
......@@ -656,7 +656,7 @@ static gboolean check_get_range(GstBaseSrc *basesrc)
static void finalize(GObject *object)
{
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
g_free(element->host);
element->host = NULL;
......@@ -678,9 +678,9 @@ static void finalize(GObject *object)
static void base_init(gpointer class)
{
static const GstElementDetails plugin_details = {
"NDS2 Frame Source",
"NDS Source",
"Source",
"NDS2-based frame src element",
"NDS-based src element",
"Leo Singer <leo.singer@ligo.org>"
};
GstElementClass *element_class = GST_ELEMENT_CLASS(class);
......@@ -734,9 +734,9 @@ static void class_init(gpointer class, gpointer class_data)
gobject_class,
ARG_SRC_HOST,
g_param_spec_string(
"nds2-host",
"host",
"Host",
"NDS2 remote host domain name or IP address",
"NDS1 or NDS2 remote host name or IP address",
DEFAULT_HOST,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS
)
......@@ -780,7 +780,7 @@ static void class_init(gpointer class, gpointer class_data)
static void instance_init(GTypeInstance *object, gpointer class)
{
GstBaseSrc *basesrc = GST_BASE_SRC(object);
GSTLALNDS2FrameSrc *element = GSTLAL_NDS2_FRAMESRC(object);
GSTLALNDSSrc *element = GSTLAL_NDSSRC(object);
gst_pad_use_fixed_caps(GST_BASE_SRC_PAD(basesrc));
......@@ -805,19 +805,19 @@ static void instance_init(GTypeInstance *object, gpointer class)
*/
GType gstlal_nds2_framesrc_get_type(void)
GType gstlal_ndssrc_get_type(void)
{
static GType type = 0;
if(!type) {
static const GTypeInfo info = {
.class_size = sizeof(GSTLALNDS2FrameSrcClass),
.class_size = sizeof(GSTLALNDSSrcClass),
.class_init = class_init,
.base_init = base_init,
.instance_size = sizeof(GSTLALNDS2FrameSrc),
.instance_size = sizeof(GSTLALNDSSrc),
.instance_init = instance_init,
};
type = g_type_register_static(GST_TYPE_BASE_SRC, "lal_nds2_framesrc", &info, 0);
type = g_type_register_static(GST_TYPE_BASE_SRC, "ndssrc", &info, 0);
}
return type;
......
src/plugins/gstlal_nds2_framesrc.h → src/plugins/gstlal_ndssrc.h
+ 17
− 21
View file @ bc54de28
/*
* NDS2-based frame src element
* NDS-based src element
*
* Copyright (C) 2008 Leo Singer
*
......@@ -19,38 +19,34 @@
*/
#ifndef __GSTLAL_NDS2_FRAMESRC_H__
#define __GSTLAL_NDS2_FRAMESRC_H__
#ifndef __GSTLAL_NDSSRC_H__
#define __GSTLAL_NDSSRC_H__
#include <gst/gst.h>
#include <gst/base/gstpushsrc.h>
#include <lal/FrameStream.h>
#include <lal/LALDatatypes.h>
#include <lal/Units.h>
#include <daqc.h>
G_BEGIN_DECLS
#define GSTLAL_NDS2_FRAMESRC_TYPE \
(gstlal_nds2_framesrc_get_type())
#define GSTLAL_NDS2_FRAMESRC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GSTLAL_NDS2_FRAMESRC_TYPE, GSTLALNDS2FrameSrc))
#define GSTLAL_NDS2_FRAMESRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GSTLAL_NDS2_FRAMESRC_TYPE, GSTLALNDS2FrameSrcClass))
#define GST_IS_GSTLAL_NDS2_FRAMESRC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GSTLAL_NDS2_FRAMESRC_TYPE))
#define GST_IS_GSTLAL_NDS2_FRAMESRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GSTLAL_NDS2_FRAMESRC_TYPE))
#define GSTLAL_NDSSRC_TYPE \
(gstlal_ndssrc_get_type())
#define GSTLAL_NDSSRC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), GSTLAL_NDSSRC_TYPE, GSTLALNDSSrc))
#define GSTLAL_NDSSRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass), GSTLAL_NDSSRC_TYPE, GSTLALNDSSrcClass))
#define GST_IS_GSTLAL_NDSSRC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GSTLAL_NDSSRC_TYPE))
#define GST_IS_GSTLAL_NDSSRC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GSTLAL_NDSSRC_TYPE))
typedef struct {
GstBaseSrcClass parent_class;
} GSTLALNDS2FrameSrcClass;
} GSTLALNDSSrcClass;
typedef struct {
......@@ -62,13 +58,13 @@ typedef struct {
daq_t* daq;
daq_channel_t* daq_channel;
} GSTLALNDS2FrameSrc;
} GSTLALNDSSrc;
GType gstlal_nds2_framesrc_get_type(void);
GType gstlal_ndssrc_get_type(void);
G_END_DECLS
#endif /* __GSTLAL_NDS2_FRAMESRC_H__ */
#endif /* __GSTLAL_NDSSRC_H__ */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment