Commit c5ec9b7e authored by Tristan Matthews's avatar Tristan Matthews

* #9750: moved sfl_data_format.h -> sfl_types.h

parent c970cedf
......@@ -50,7 +50,8 @@ noinst_HEADERS = \
fileutils.h \
noncopyable.h \
cc_thread.h \
cc_config.h
cc_config.h \
sfl_types.h
libsflphone_la_LIBADD = \
$(top_builddir)/libs/iax2/libiax2.la \
......
......@@ -33,7 +33,7 @@
#ifndef __AUDIOLOOP_H__
#define __AUDIOLOOP_H__
#include "sfl_data_format.h"
#include "sfl_types.h"
#include <cstring>
#include "noncopyable.h"
......
......@@ -35,7 +35,7 @@
#include <cstdlib>
#include <memory>
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "noncopyable.h"
class AudioRecord {
......
......@@ -29,7 +29,7 @@
* as that of the covered work.
*/
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "audiocodec.h"
#include <cassert>
......
......@@ -31,7 +31,7 @@
*/
#include "audiocodec.h"
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "g722.h"
#include "noncopyable.h"
......
......@@ -30,7 +30,7 @@
*/
#include "audiocodec.h"
#include "sfl_data_format.h"
#include "sfl_types.h"
#include <cassert>
class Ulaw : public sfl::AudioCodec {
......
......@@ -31,7 +31,7 @@
#ifndef DCBLOCKER_H
#define DCBLOCKER_H
#include "sfl_data_format.h"
#include "sfl_types.h"
class DcBlocker {
public:
......
......@@ -32,7 +32,7 @@
#ifndef DELAYDETECTION_H
#define DELAYDETECTION_H
#include "sfl_data_format.h"
#include "sfl_types.h"
#include <vector>
// Template size in samples for correlation
......
......@@ -9,6 +9,7 @@
#include <stdexcept>
#include "logger.h"
#include "echosuppress.h"
#include "pjmedia/echo.h"
#include "pj/pool.h"
#include "pj/os.h"
......
......@@ -8,10 +8,12 @@
#ifndef ECHOSUPPRESS_H_
#define ECHOSUPPRESS_H_
#include "pjmedia/echo.h"
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "noncopyable.h"
class pjmedia_echo_state;
class pj_pool_t;
class EchoSuppress {
public:
EchoSuppress(pj_pool_t *pool);
......
......@@ -2,7 +2,7 @@
#include <climits>
#include <fstream>
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "logger.h"
#include "gaincontrol.h"
......
......@@ -32,7 +32,7 @@
#define NOISESUPPRESS_H
#include <speex/speex_preprocess.h>
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "noncopyable.h"
class NoiseSuppress {
......
......@@ -35,7 +35,7 @@
#include <cmath>
#include <cstring>
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "noncopyable.h"
class SamplerateConverter {
......
......@@ -36,7 +36,7 @@
*/
#include "tone.h"
#include "logger.h"
#include "sfl_data_format.h"
#include "sfl_types.h"
#include <cmath>
#include <cassert>
#include <cstdlib>
......
......@@ -35,7 +35,7 @@
#include "voiplink.h"
#include <iax-client.h>
#include "audio/codecs/audiocodec.h" // for DEC_BUFFER_SIZE
#include "sfl_data_format.h"
#include "sfl_types.h"
#include "noncopyable.h"
#include "audio/samplerateconverter.h"
......
......@@ -28,14 +28,15 @@
* as that of the covered work.
*/
#ifndef SFL_DATA_FORMAT_H_
#define SFL_DATA_FORMAT_H_
#ifndef SFL_TYPES_H_
#define SFL_TYPES_H_
#include <cstring> // for size_t
typedef short SFLDataFormat;
typedef signed short SINT16;
typedef signed int SINT32;
#define SIZEBUF 400000 /** About 12 sec of buffering at 8000 Hz*/
static const size_t SIZEBUF = 400000; /** About 12 sec of buffering at 8000 Hz*/
#endif // SFL_DATA_FORMAT_H_
#endif // SFL_TYPES_H_
......@@ -42,7 +42,7 @@
#include <cppunit/TestCase.h>
#include <cppunit/TestSuite.h>
#include "sfl_data_format.h"
#include "sfl_types.h"
class GainControlTest: public CppUnit::TestFixture {
......
Markdown is supported
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