dtmf: Move duplicate #defines into a common include

Centralize duplicated constants so they have the same value.
Also standardise minimum tone duration to 250ms and minimum inter-tone
interval to 100ms.

diff --git a/gst/dtmf/Makefile.am b/gst/dtmf/Makefile.am
index 761575d..d574323 100644 (file)
--- a/gst/dtmf/Makefile.am
+++ b/gst/dtmf/Makefile.am
@@ -11,7 +11,7 @@ noinst_HEADERS = gstdtmfsrc.h \
                  gstdtmfdetect.h \
                  gstrtpdtmfsrc.h \
                  gstrtpdtmfdepay.h \
-                 gstrtpdtmfcommon.h \
+                 gstdtmfcommon.h \
                  tone_detect.h
 
 libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \

diff --git a/gst/dtmf/gstrtpdtmfcommon.h b/gst/dtmf/gstdtmfcommon.h
similarity index 65%
rename from gst/dtmf/gstrtpdtmfcommon.h
rename to gst/dtmf/gstdtmfcommon.h
index c1ab82e..aff881b 100644 (file)
--- a/gst/dtmf/gstrtpdtmfcommon.h
+++ b/gst/dtmf/gstdtmfcommon.h
@@ -2,6 +2,20 @@
 #ifndef __GST_RTP_DTMF_COMMON_H__
 #define __GST_RTP_DTMF_COMMON_H__
 
+#define MIN_INTER_DIGIT_INTERVAL 100     /* ms */
+#define MIN_PULSE_DURATION       250     /* ms */
+
+#define MIN_VOLUME               0
+#define MAX_VOLUME               36
+
+#define MIN_EVENT                0
+#define MAX_EVENT                16
+#define MIN_EVENT_STRING         "0"
+#define MAX_EVENT_STRING         "16"
+
+#ifndef M_PI
+#define M_PI           3.14159265358979323846  /* pi */
+#endif
 
 typedef struct
 {

diff --git a/gst/dtmf/gstdtmfsrc.c b/gst/dtmf/gstdtmfsrc.c
index f929bae..79525b5 100644 (file)
--- a/gst/dtmf/gstdtmfsrc.c
+++ b/gst/dtmf/gstdtmfsrc.c
@@ -122,10 +122,7 @@
 
 #include <glib.h>
 
-#ifndef M_PI
-#define M_PI           3.14159265358979323846   /* pi */
-#endif
-
+#include "gstdtmfcommon.h"
 
 #include "gstdtmfsrc.h"
 
@@ -136,12 +133,6 @@
 #define DEFAULT_SAMPLE_RATE      8000
 #define SAMPLE_SIZE              16
 #define CHANNELS                 1
-#define MIN_EVENT                0
-#define MAX_EVENT                16
-#define MIN_VOLUME               0
-#define MAX_VOLUME               36
-#define MIN_INTER_DIGIT_INTERVAL 100
-#define MIN_PULSE_DURATION       250
 #define MIN_DUTY_CYCLE           (MIN_INTER_DIGIT_INTERVAL + MIN_PULSE_DURATION)
 
 

diff --git a/gst/dtmf/gstrtpdtmfdepay.c b/gst/dtmf/gstrtpdtmfdepay.c
index ccf2b02..603416d 100644 (file)
--- a/gst/dtmf/gstrtpdtmfdepay.c
+++ b/gst/dtmf/gstrtpdtmfdepay.c
@@ -81,7 +81,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
 #endif
 
 #include <string.h>
@@ -90,23 +90,12 @@
 #include <gst/rtp/gstrtpbuffer.h>
 #include "gstrtpdtmfdepay.h"
 
-#ifndef M_PI
-# define M_PI           3.14159265358979323846  /* pi */
-#endif
-
-
 #define DEFAULT_PACKET_INTERVAL  50     /* ms */
 #define MIN_PACKET_INTERVAL      10     /* ms */
 #define MAX_PACKET_INTERVAL      50     /* ms */
 #define SAMPLE_RATE              8000
 #define SAMPLE_SIZE              16
 #define CHANNELS                 1
-#define MIN_EVENT                0
-#define MAX_EVENT                16
-#define MIN_VOLUME               0
-#define MAX_VOLUME               36
-#define MIN_INTER_DIGIT_INTERVAL 100
-#define MIN_PULSE_DURATION       250
 #define MIN_DUTY_CYCLE           (MIN_INTER_DIGIT_INTERVAL + MIN_PULSE_DURATION)
 
 #define MIN_UNIT_TIME            0

diff --git a/gst/dtmf/gstrtpdtmfdepay.h b/gst/dtmf/gstrtpdtmfdepay.h
index 172cb84..65d9454 100644 (file)
--- a/gst/dtmf/gstrtpdtmfdepay.h
+++ b/gst/dtmf/gstrtpdtmfdepay.h
@@ -27,7 +27,7 @@
 #include <gst/base/gstadapter.h>
 #include <gst/rtp/gstbasertpdepayload.h>
 
-#include "gstrtpdtmfcommon.h"
+#include "gstdtmfcommon.h"
 
 G_BEGIN_DECLS
 #define GST_TYPE_RTP_DTMF_DEPAY \

diff --git a/gst/dtmf/gstrtpdtmfsrc.c b/gst/dtmf/gstrtpdtmfsrc.c
index ec2c6c6..c7e1c1f 100644 (file)
--- a/gst/dtmf/gstrtpdtmfsrc.c
+++ b/gst/dtmf/gstrtpdtmfsrc.c
@@ -130,15 +130,6 @@
 #define DEFAULT_TIMESTAMP_OFFSET -1
 #define DEFAULT_SEQNUM_OFFSET    -1
 #define DEFAULT_CLOCK_RATE       8000
-#define MIN_EVENT                0
-#define MAX_EVENT                16
-#define MIN_EVENT_STRING         "0"
-#define MAX_EVENT_STRING         "16"
-#define MIN_VOLUME               0
-#define MAX_VOLUME               36
-
-#define MIN_INTER_DIGIT_INTERVAL 50     /* ms */
-#define MIN_PULSE_DURATION       70     /* ms */
 
 #define DEFAULT_PACKET_REDUNDANCY 1
 #define MIN_PACKET_REDUNDANCY 1

diff --git a/gst/dtmf/gstrtpdtmfsrc.h b/gst/dtmf/gstrtpdtmfsrc.h
index b1a483a..d04c6ec 100644 (file)
--- a/gst/dtmf/gstrtpdtmfsrc.h
+++ b/gst/dtmf/gstrtpdtmfsrc.h
@@ -29,7 +29,7 @@
 #include <gst/base/gstbasesrc.h>
 #include <gst/rtp/gstrtpbuffer.h>
 
-#include "gstrtpdtmfcommon.h"
+#include "gstdtmfcommon.h"
 
 G_BEGIN_DECLS
 #define GST_TYPE_RTP_DTMF_SRC          (gst_rtp_dtmf_src_get_type())