Commit 84698348 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Rename plugin from msisac to mswebrtc.

parent fafe6832
EXTRA_DIST=autogen.sh msisac.iss.in EXTRA_DIST=autogen.sh mswebrtc.iss.in
isac_VERSION = 1.0.0 isac_VERSION = 1.0.0
isac_DIR=$(top_builddir)/webrtc isac_DIR=$(top_builddir)/webrtc
...@@ -8,7 +8,7 @@ ISAC_COMMON_DIR = webrtc/common_audio/signal_processing ...@@ -8,7 +8,7 @@ ISAC_COMMON_DIR = webrtc/common_audio/signal_processing
pluginsdir = $(libdir)/mediastreamer/plugins pluginsdir = $(libdir)/mediastreamer/plugins
plugins_LTLIBRARIES=libmsisac.la plugins_LTLIBRARIES=libmswebrtc.la
# Build the list of isac source files # Build the list of isac source files
ISAC_BASE_SRCS = $(ISAC_SRC_DIR)/source/fft.c \ ISAC_BASE_SRCS = $(ISAC_SRC_DIR)/source/fft.c \
...@@ -104,40 +104,42 @@ ISAC_BASE_SRCS += $(ISAC_SRC_DIR)/source/decode_plc.c \ ...@@ -104,40 +104,42 @@ ISAC_BASE_SRCS += $(ISAC_SRC_DIR)/source/decode_plc.c \
endif endif
libmsisac_la_SOURCES= $(ISAC_BASE_SRCS) isac_dec.c isac_enc.c libmswebrtc_la_SOURCES= \
mswebrtc.c \
$(ISAC_BASE_SRCS) isac_dec.c isac_enc.c
webrtc_repo = git://git.linphone.org/webrtc webrtc_repo = git://git.linphone.org/webrtc
BUILT_SOURCES = $(isac_DIR) BUILT_SOURCES = $(webrtc_DIR)
GIT=$(shell which git) GIT=$(shell which git)
$(isac_DIR): $(webrtc_DIR):
$(GIT) clone $(webrtc_repo) $(GIT) clone $(webrtc_repo)
extract-sources: $(isac_DIR) extract-sources: $(webrtc_DIR)
libmsisac_la_LIBADD=\ libmswebrtc_la_LIBADD= \
$(ORTP_LIBS) \ $(ORTP_LIBS) \
$(MEDIASTREAMER_LIBS) $(MEDIASTREAMER_LIBS)
libmsisac_la_LDFLAGS=-module -no-undefined libmswebrtc_la_LDFLAGS=-module -no-undefined
isac_CFLAGS = -I$(isac_DIR) \ webrtc_CFLAGS = -I$(webrtc_DIR) \
-I$(ISAC_SRC_DIR)/source -I$(ISAC_SRC_DIR)/util -I$(ISAC_SRC_DIR)/interface \ -I$(ISAC_SRC_DIR)/source -I$(ISAC_SRC_DIR)/util -I$(ISAC_SRC_DIR)/interface \
-I$(ISAC_COMMON_DIR)/include -I$(ISAC_COMMON_DIR)/include
AM_CFLAGS= \
AM_CFLAGS= $(isac_CFLAGS) \ $(webrtc_CFLAGS) \
$(MEDIASTREAMER_CFLAGS) \ $(MEDIASTREAMER_CFLAGS) \
$(STRICT_CFLAGS) $(STRICT_CFLAGS)
INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install INSTALLDIR=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-install
INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix) INSTALLDIR_WITH_PREFIX=$(INSTALLDIR)/$(prefix)
ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip ZIPFILE=$(shell cd $(top_builddir) && pwd)/$(PACKAGE)-win32-$(VERSION).zip
ZIP_EXCLUDED=include ZIP_EXCLUDED=include
ISS_SCRIPT=msisac.iss ISS_SCRIPT=mswebrtc.iss
ISS_SCRIPT_PATH=$(shell cd $(top_srcdir) && pwd)/$(ISS_SCRIPT) ISS_SCRIPT_PATH=$(shell cd $(top_srcdir) && pwd)/$(ISS_SCRIPT)
#path to Inno Setup 5 compiler #path to Inno Setup 5 compiler
ISCC=ISCC.exe ISCC=ISCC.exe
......
msisac - mediastreamer2 (linphone) plugin for iSAC codec. mswebrtc - mediastreamer2 (linphone) plugin to include features from WebRTC (iSAC codec, AECM...).
This package downloads and builds the iSAC codec from the WebRTC repository. This package downloads code from the WebRTC repository and builds the iSAC codec and/or the AECM.
By default, the upstream package installs into /usr/local. Please use By default, the upstream package installs into /usr/local. Please use
'./configure --prefix' to change it './configure --prefix' to change it
......
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT([msisac],[1.0.0]) AC_INIT([mswebrtc],[1.0.0])
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
...@@ -87,11 +87,7 @@ fi ...@@ -87,11 +87,7 @@ fi
# Create the following files from their .in counterparts # Create the following files from their .in counterparts
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
msisac.iss mswebrtc.iss
]) ])
# src/Makefile
# pkgconfig/Makefile
# pkgconfig/silk.pc
# man/Makefile
AC_OUTPUT AC_OUTPUT
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef CONSTANTS_H #ifndef ISAC_CONSTANTS_H
#define CONSTANTS_H #define ISAC_CONSTANTS_H
/* Define codec specific settings */ /* Define codec specific settings */
...@@ -48,4 +48,4 @@ typedef enum { ...@@ -48,4 +48,4 @@ typedef enum {
#define ISAC_BITRATE_MAX 32000 #define ISAC_BITRATE_MAX 32000
#define ISAC_BITRATE_MIN 10000 #define ISAC_BITRATE_MIN 10000
#endif // CONSTANTS_H #endif // ISAC_CONSTANTS_H
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <stdint.h> #include <stdint.h>
#include "constants.h" #include "isac_constants.h"
/*filter common method*/ /*filter common method*/
struct _isac_decoder_struct_t { struct _isac_decoder_struct_t {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "isacfix.h" #include "isacfix.h"
#include "signal_processing_library.h" #include "signal_processing_library.h"
#include "constants.h" #include "isac_constants.h"
#include "mediastreamer2/msfilter.h" #include "mediastreamer2/msfilter.h"
#include "mediastreamer2/mscodecutils.h" #include "mediastreamer2/mscodecutils.h"
...@@ -266,30 +266,3 @@ MSFilterDesc ms_isac_enc_desc = { ...@@ -266,30 +266,3 @@ MSFilterDesc ms_isac_enc_desc = {
#endif #endif
MS_FILTER_DESC_EXPORT ( ms_isac_enc_desc ) MS_FILTER_DESC_EXPORT ( ms_isac_enc_desc )
extern MSFilterDesc ms_isac_dec_desc;
#ifndef VERSION
#define VERSION "debug"
#endif
#ifdef _MSC_VER
#define MS_PLUGIN_DECLARE(type) __declspec(dllexport) type
#else
#define MS_PLUGIN_DECLARE(type) type
#endif
MS_PLUGIN_DECLARE ( void ) libmsisac_init() {
char isac_version[64];
isac_version[0] = 0;
WebRtcSpl_Init();
WebRtcIsacfix_version(isac_version);
ms_filter_register ( &ms_isac_enc_desc );
ms_filter_register ( &ms_isac_dec_desc );
ms_message ( " libmsisac " VERSION " plugin loaded, iSAC codec version %s", isac_version );
}
source/arith_routines.c
source/arith_routines_hist.c
source/arith_routines_logist.c
source/bandwidth_estimator.c
source/decode.c
source/decode_bwe.c
source/encode.c
source/entropy_coding.c
source/fft.c
source/filterbank_tables.c
source/filterbanks.c
source/intialize.c
source/isac.c
source/lattice.c
source/lpc_analysis.c
source/lpc_gain_swb_tables.c
source/lpc_shape_swb12_tables.c
source/lpc_shape_swb16_tables.c
source/lpc_tables.c
source/pitch_estimator.c
source/pitch_filter.c
source/pitch_gain_tables.c
source/pitch_lag_tables.c
source/spectrum_ar_model_tables.c
source/transform.c
test/simpleKenny.c
util/utility.c
source/crc.c
source/encode_lpc_swb.c
source/filter_functions.c
\ No newline at end of file
/*
mswebrtc.c
Copyright (C) 2013 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "isacfix.h"
#include "signal_processing_library.h"
#include "isac_constants.h"
#include "mediastreamer2/msfilter.h"
#include "mediastreamer2/mscodecutils.h"
extern MSFilterDesc ms_isac_dec_desc;
extern MSFilterDesc ms_isac_enc_desc;
#ifndef VERSION
#define VERSION "debug"
#endif
#ifdef _MSC_VER
#define MS_PLUGIN_DECLARE(type) __declspec(dllexport) type
#else
#define MS_PLUGIN_DECLARE(type) type
#endif
MS_PLUGIN_DECLARE ( void ) libmswebrtc_init() {
char isac_version[64];
isac_version[0] = 0;
WebRtcSpl_Init();
WebRtcIsacfix_version(isac_version);
ms_filter_register ( &ms_isac_enc_desc );
ms_filter_register ( &ms_isac_dec_desc );
ms_message ( " libmswebrtc " VERSION " plugin loaded, iSAC codec version %s", isac_version );
}
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup] [Setup]
AppName=msisac AppName=mswebrtc
AppVerName=msisac version @VERSION@ , plugin for linphone. AppVerName=mswebrtc version @VERSION@ , plugin for linphone.
AppPublisher=linphone.org AppPublisher=linphone.org
AppPublisherURL=http://www.linphone.org AppPublisherURL=http://www.linphone.org
AppSupportURL=http://www.linphone.org AppSupportURL=http://www.linphone.org
...@@ -23,4 +23,4 @@ Name: "english"; MessagesFile: "compiler:Default.isl" ...@@ -23,4 +23,4 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked ;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
#include "msisac-win32.filelist" #include "mswebrtc-win32.filelist"
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