Packman Build Service PMBS

opencore-amr.changes Changed

opencore-amr.spec Changed

@@ -1,25 +1,20 @@
-# norootforbuild
-
 %define major     0
 %define lib       libopencore-amr
 %define libname_amrnb   libopencore-amrnb%{major}
 %define libname_amrwb   libopencore-amrwb%{major}
 
 Name:           opencore-amr
+Version:        0.1.3
+Release:        0
+License:        Apache-2.0
 Summary:        Adaptive Multi-Rate (AMR) Speech Codec
 Summary(de):    Adaptiver Multi-Rate (AMR) Sprachcodec
-Version:        0.1.2
-Release:        1
-License:        Apache License, Version 2.0
-Group:          System/Libraries
 Url:            http://opencore-amr.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/%{version}/opencore-amr-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:       %{libname_amrnb} = %{version}-%{release}
-Requires:       %{libname_amrwb} = %{version}-%{release}
-BuildRequires:  glibc-devel
+Group:          System/Libraries
+Source0:        http://downloads.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-%{version}.tar.gz
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
 BuildRequires:  pkg-config
 
 %description
@@ -30,45 +25,40 @@
 Bibliothek der OpenCORE Framework Implementierung des Adaptiven
 Multi Rate Narrowband und Wideband Sprachcodecs.
 
-
 %package -n %{libname_amrnb}
-Group:          System/Libraries
 Summary:        Shared library part of opencore-amr
 Summary(de):    Bibliotheken zu opencore-amr
-Provides:       %{lib} = %{version}-%{release}
+Group:          System/Libraries
+Provides:       %{lib} = %{version}
 
 %description -n %{libname_amrnb}
 Library of OpenCORE Framework implementation of Adaptive Multi Rate
 Narrowband speech codec.
 
-
 %description -n %{libname_amrnb} -l de
 Bibliothek der OpenCORE Framework Implementierung des Adaptiven
 Multi Rate Narrowband Sprachcodecs.
 
-
 %package -n %{libname_amrwb}
-Group:          System/Libraries
 Summary:        Shared library part of opencore-amr
 Summary(de):    Bibliotheken zu opencore-amr
-Provides:       %{lib} = %{version}-%{release}
+Group:          System/Libraries
+Provides:       %{lib} = %{version}
 
 %description -n %{libname_amrwb}
 Library of OpenCORE Framework implementation of Adaptive Multi Rate
 Wideband speech codec.
 
-
 %description -n %{libname_amrwb} -l de
 Bibliothek der OpenCORE Framework Implementierung des Adaptiven
 Multi Rate Wideband Sprachcodecs.
 
-
 %package -n %{lib}-devel
 Summary:        Adaptive Multi-Rate (AMR) Speech Codec Developer Package
 Summary(de):    Adaptiver Multi-Rate (AMR) Sprachcodec Entwicklerpaket
 Group:          Development/Libraries/C and C++
-Requires:       %{libname_amrnb} = %{version}-%{release}
-Requires:       %{libname_amrwb} = %{version}-%{release}
+Requires:       %{libname_amrnb} = %{version}
+Requires:       %{libname_amrwb} = %{version}
 Requires:       glibc-devel
 Obsoletes:      opencore-amr-devel < %{version}
 Provides:       opencore-amr-devel = %{version}
@@ -87,15 +77,12 @@
 %setup -qn opencore-amr-%{version}
 
 %build
-%{configure}
-%{__make} %{?jobs:-j%{jobs}}
+%configure --disable-silent-rules --disable-static
+make %{?_smp_mflags}
 
 %install
-%{makeinstall}
-rm -f %{buildroot}/%{_libdir}/*.{a,la}
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+%make_install
+rm -f %{buildroot}/%{_libdir}/*.la
 
 %post -n %{libname_amrnb} -p /sbin/ldconfig
 %post -n %{libname_amrwb} -p /sbin/ldconfig
@@ -105,10 +92,12 @@
 
 %files -n %{libname_amrnb}
 %defattr(-,root,root)
+%doc COPYING
 %{_libdir}/libopencore-amrnb.so.%{major}*
 
 %files -n %{libname_amrwb}
 %defattr(-,root,root)
+%doc COPYING
 %{_libdir}/libopencore-amrwb.so.%{major}*
 
 %files -n %{lib}-devel

opencore-amr-0.1.2.tar.bz2/Makefile.alt Deleted

opencore-amr-0.1.2.tar.bz2/amrnb/Makefile.alt Deleted

@@ -1,119 +0,0 @@
-# Just set OC_BASE to the opencore root, or set AMR_BASE directly to
-# a detached gsm_amr directory
-OC_BASE = ../opencore
-AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
-LIBDIR=lib
-BINDIR=bin
-
-# To compile as C instead of C++, define BUILD_AS_C
-ifneq (, $(BUILD_AS_C))
-    CXX = $(CC)
-    CXXFLAGS += -x c -std=c99
-endif
-
-ifeq (, $(PREFIX))
-    PREFIX = /usr/local
-endif
-
-DEC_DIR = $(AMR_BASE)/amr_nb/dec
-ENC_DIR = $(AMR_BASE)/amr_nb/enc
-COMMON_DIR = $(AMR_BASE)/amr_nb/common
-DEC_SRC_DIR = $(DEC_DIR)/src
-ENC_SRC_DIR = $(ENC_DIR)/src
-COMMON_SRC_DIR = $(COMMON_DIR)/src
-OSCL = ../oscl
-
-CPPFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(COMMON_DIR)/include -I$(DEC_DIR)/include -I$(AMR_BASE)/common/dec/include -I$(ENC_SRC_DIR)
-
-# Find all the source files
-DEC_SRC := $(shell cd $(DEC_SRC_DIR) && echo *.cpp)
-ENC_SRC := $(shell cd $(ENC_SRC_DIR) && echo *.cpp)
-COMMON_SRC := $(shell cd $(COMMON_SRC_DIR) && echo *.cpp)
-
-# Exclude these files
-DEC_SRC := $(DEC_SRC:decoder_gsm_amr.cpp=)
-DEC_SRC := $(DEC_SRC:pvgsmamrdecoder.cpp=)
-ENC_SRC := $(ENC_SRC:gsmamr_encoder_wrapper.cpp=)
-COMMON_SRC := $(COMMON_SRC:bits2prm.cpp=)
-COMMON_SRC := $(COMMON_SRC:copy.cpp=)
-COMMON_SRC := $(COMMON_SRC:div_32.cpp=)
-COMMON_SRC := $(COMMON_SRC:l_abs.cpp=)
-COMMON_SRC := $(COMMON_SRC:vad1.cpp=)
-COMMON_SRC := $(COMMON_SRC:r_fft.cpp=)
-COMMON_SRC := $(COMMON_SRC:vad2.cpp=)
-
-DEC_OBJS := $(DEC_SRC:.cpp=.o)
-DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS))
-ENC_OBJS := $(ENC_SRC:.cpp=.o)
-ENC_OBJS := $(patsubst %,$(ENC_SRC_DIR)/%, $(ENC_OBJS))
-COMMON_OBJS := $(COMMON_SRC:.cpp=.o)
-COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS))
-
-OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS)
-SOBJS = $(OBJS:%.o=%.lo)
-
-#Versioning
-MAJOR = 0
-MINOR = 1
-REVISION = 1
-VERSION = $(MAJOR).$(MINOR).$(REVISION)
-
-ifeq ($(shell uname), Darwin)
-    SHLIB_EXT = dylib
-    SHLIB_FLAGS = -dynamiclib
-else
-    ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-        SHLIB_EXT = $(MAJOR).$(MINOR).$(REVISION).dll
-        SHLIB_FLAGS = -shared
-        SONAME = libopencore-amrnb-$(MAJOR).dll
-    else
-        SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
-        SHLIB_FLAGS = -shared
-        SONAME = libopencore-amrnb.so.$(MAJOR)
-    endif
-endif
-SHLIB = libopencore-amrnb.$(SHLIB_EXT)
-
-all: libopencore-amrnb.a $(SHLIB)
-
-$(SHLIB): $(SOBJS)
-ifeq ($(shell uname), Darwin)
-	$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS)
-else
-	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
-endif
-
-%.lo: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
-
-%.lo: %.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
-
-libopencore-amrnb.a: $(OBJS)
-	ar rcs $@ $+
-
-install: libopencore-amrnb.a $(SHLIB)
-	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
-ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-	install -d $(DESTDIR)$(PREFIX)/$(BINDIR)
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)
-else
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-endif
-ifneq ($(shell uname), Darwin)
-ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME)
-	ln -sf $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/libopencore-amrnb.dll
-else
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
-	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrnb.so
-endif
-endif
-	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrnb
-	install -m 644 interf_dec.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
-	install -m 644 interf_enc.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
-
-clean:
-	rm -f $(SHLIB) libopencore-amrnb.a *.o *.lo $(OBJS) $(SOBJS)
-

opencore-amr-0.1.2.tar.bz2/amrwb/Makefile.alt Deleted

@@ -1,98 +0,0 @@
-# Just set OC_BASE to the opencore root, or set AMR_BASE directly to
-# a detached gsm_amr directory
-OC_BASE = ../opencore
-AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
-LIBDIR=lib
-BINDIR=bin
-
-# To compile as C instead of C++, define BUILD_AS_C
-ifneq (, $(BUILD_AS_C))
-    CXX = $(CC)
-    CXXFLAGS += -x c -std=c99
-endif
-
-ifeq (, $(PREFIX))
-    PREFIX = /usr/local
-endif
-
-DEC_DIR = $(AMR_BASE)/amr_wb/dec
-DEC_SRC_DIR = $(DEC_DIR)/src
-OSCL = ../oscl
-
-CPPFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(DEC_DIR)/include -I$(AMR_BASE)/common/dec/include
-
-# Find all the source files
-# Exclude only decoder_amr_wb.cpp, not dtx_decoder_amr_wb.cpp
-DEC_SRC := $(shell cd $(DEC_SRC_DIR) && echo *.cpp | sed 's/ decoder_amr_wb.cpp//')
-
-DEC_OBJS := $(DEC_SRC:.cpp=.o)
-DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS))
-
-OBJS = wrapper.o $(DEC_OBJS)
-SOBJS = $(OBJS:%.o=%.lo)
-
-#Versioning
-MAJOR = 0
-MINOR = 1
-REVISION = 1
-VERSION = $(MAJOR).$(MINOR).$(REVISION)
-
-ifeq ($(shell uname), Darwin)
-    SHLIB_EXT = dylib
-    SHLIB_FLAGS = -dynamiclib
-else
-    ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-        SHLIB_EXT = $(MAJOR).$(MINOR).$(REVISION).dll
-        SHLIB_FLAGS = -shared
-        SONAME = libopencore-amrwb-$(MAJOR).dll
-    else
-        SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
-        SHLIB_FLAGS = -shared
-        SONAME = libopencore-amrwb.so.$(MAJOR)
-    endif
-endif
-SHLIB = libopencore-amrwb.$(SHLIB_EXT)
-
-all: libopencore-amrwb.a $(SHLIB)
-
-$(SHLIB): $(SOBJS)
-ifeq ($(shell uname), Darwin)
-	$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS)
-else
-	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
-endif
-
-%.lo: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@
-
-%.lo: %.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@
-
-libopencore-amrwb.a: $(OBJS)
-	ar rcs $@ $+
-
-install: libopencore-amrwb.a $(SHLIB)
-	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-	install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
-ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-	install -d $(DESTDIR)$(PREFIX)/$(BINDIR)
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)
-else
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-endif
-ifneq ($(shell uname), Darwin)
-ifeq ($(shell uname | sed -e 's/$MINGW32_NT$$.*$/\1/'), MINGW32_NT)
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME)
-	ln -sf $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/libopencore-amrwb.dll
-else
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
-	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrwb.so
-endif
-endif
-	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb
-	install -m 644 dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
-	install -m 644 if_rom.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
-
-clean:
-	rm -f $(SHLIB) libopencore-amrwb.a *.o *.lo $(OBJS) $(SOBJS)
-

opencore-amr-0.1.2.tar.bz2/build_osx.sh Deleted

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/bytesused.cpp Deleted

@@ -1,171 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-/****************************************************************************************
-Portions of this file are derived from the following 3GPP standard:
-
-    3GPP TS 26.073
-    ANSI-C code for the Adaptive Multi-Rate (AMR) speech codec
-    Available from http://www.3gpp.org
-
-(C) 2004, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC)
-Permission to distribute, modify and use this file under the standard license
-terms listed above has been obtained from the copyright holder.
-****************************************************************************************/
-/*
-
- Filename: bytesused.cpp
-
-------------------------------------------------------------------------------
- INPUT AND OUTPUT DEFINITIONS
-
- Inputs:
-    None
-
- Local Stores/Buffers/Pointers Needed:
-    None
-
- Global Stores/Buffers/Pointers Needed:
-    None
-
- Outputs:
-    None
-
- Pointers and Buffers Modified:
-    None
-
- Local Stores Modified:
-    None
-
- Global Stores Modified:
-    None
-
-------------------------------------------------------------------------------
- FUNCTION DESCRIPTION
-
- This function creates a table called BytesUsed that holds the value that
- describes the number of bytes required to hold one frame worth of data in
- the WMF (non-IF2) frame format. Each table entry is the sum of the frame
- type byte and the number of bytes used up by the core speech data for each
- 3GPP frame type.
-
-------------------------------------------------------------------------------
- REQUIREMENTS
-
- None
-
-------------------------------------------------------------------------------
- REFERENCES
-
- [1] "AMR Speech Codec Frame Structure", 3GPP TS 26.101 version 4.1.0
-     Release 4, June 2001, page 13.
-
-------------------------------------------------------------------------------
- PSEUDO-CODE
-
-
-------------------------------------------------------------------------------
-*/
-
-
-/*----------------------------------------------------------------------------
-; INCLUDES
-----------------------------------------------------------------------------*/
-#include "typedef.h"
-
-/*--------------------------------------------------------------------------*/
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    /*----------------------------------------------------------------------------
-    ; MACROS
-    ; Define module specific macros here
-    ----------------------------------------------------------------------------*/
-
-
-    /*----------------------------------------------------------------------------
-    ; DEFINES
-    ; Include all pre-processor statements here. Include conditional
-    ; compile variables also.
-    ----------------------------------------------------------------------------*/
-
-    /*----------------------------------------------------------------------------
-    ; LOCAL FUNCTION DEFINITIONS
-    ; Function Prototype declaration
-    ----------------------------------------------------------------------------*/
-
-
-    /*----------------------------------------------------------------------------
-    ; LOCAL STORE/BUFFER/POINTER DEFINITIONS
-    ; Variable declaration - defined here and used outside this module
-    ----------------------------------------------------------------------------*/
-    const short BytesUsed[16] =
-    {
-        13, /* 4.75 */
-        14, /* 5.15 */
-        16, /* 5.90 */
-        18, /* 6.70 */
-        20, /* 7.40 */
-        21, /* 7.95 */
-        27, /* 10.2 */
-        32, /* 12.2 */
-        6, /* GsmAmr comfort noise */
-        7, /* Gsm-Efr comfort noise */
-        6, /* IS-641 comfort noise */
-        6, /* Pdc-Efr comfort noise */
-        0, /* future use */
-        0, /* future use */
-        0, /* future use */
-        1 /* No transmission */
-    };
-    /*----------------------------------------------------------------------------
-    ; EXTERNAL FUNCTION REFERENCES
-    ; Declare functions defined elsewhere and referenced in this module
-    ----------------------------------------------------------------------------*/
-
-
-    /*----------------------------------------------------------------------------
-    ; EXTERNAL GLOBAL STORE/BUFFER/POINTER REFERENCES
-    ; Declare variables used in this module but defined elsewhere
-    ----------------------------------------------------------------------------*/
-
-
-    /*--------------------------------------------------------------------------*/
-#ifdef __cplusplus
-}
-#endif
-
-/*----------------------------------------------------------------------------
-; FUNCTION CODE
-----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------
-; Define all local variables
-----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
-; Function body here
-----------------------------------------------------------------------------*/
-
-
-/*----------------------------------------------------------------------------
-; Return nothing or data or data pointer
-----------------------------------------------------------------------------*/
-

opencore-amr-0.1.2.tar.bz2/test/Makefile.alt Deleted

opencore-amr-0.1.2.tar.bz2/test/amrnb-dec.cpp Deleted

@@ -1,83 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include "wav.h"
-extern "C" {
-#include <interf_dec.h>
-}
-
-/* From WmfDecBytesPerFrame in dec_input_format_tab.cpp */
-const int sizes[] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 6, 5, 5, 0, 0, 0, 0 };
-
-
-int main(int argc, char *argv[]) {
-	if (argc < 2) {
-		fprintf(stderr, "%s in.amr\n", argv[0]);
-		return 1;
-	}
-
-	FILE* in = fopen(argv[1], "rb");
-	if (!in) {
-		perror(argv[1]);
-		return 1;
-	}
-	char header[6];
-	int n = fread(header, 1, 6, in);
-	if (n != 6 || memcmp(header, "#!AMR\n", 6)) {
-		fprintf(stderr, "Bad header\n");
-		return 1;
-	}
-
-	WavWriter wav("out.wav", 8000, 16, 1);
-
-	void* amr = Decoder_Interface_init();
-	while (true) {
-		uint8_t buffer[500];
-		/* Read the mode byte */
-		n = fread(buffer, 1, 1, in);
-		if (n <= 0)
-			break;
-		/* Find the packet size */
-		int size = sizes[(buffer[0] >> 3) & 0x0f];
-		if (size <= 0)
-			break;
-		n = fread(buffer + 1, 1, size, in);
-		if (n != size)
-			break;
-
-		/* Decode the packet */
-		int16_t outbuffer[160];
-		Decoder_Interface_Decode(amr, buffer, outbuffer, 0);
-
-		/* Convert to little endian and write to wav */
-		uint8_t littleendian[320];
-		uint8_t* ptr = littleendian;
-		for (int i = 0; i < 160; i++) {
-			*ptr++ = (outbuffer[i] >> 0) & 0xff;
-			*ptr++ = (outbuffer[i] >> 8) & 0xff;
-		}
-		wav.writeData(littleendian, 320);
-	}
-	fclose(in);
-	Decoder_Interface_exit(amr);
-	return 0;
-}
-

opencore-amr-0.1.2.tar.bz2/test/amrwb-dec.cpp Deleted

@@ -1,81 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include "wav.h"
-extern "C" {
-#include <dec_if.h>
-}
-
-/* From pvamrwbdecoder_api.h, by dividing by 8 and rounding up */
-const int sizes[] = { 17, 23, 32, 36, 40, 46, 50, 58, 60, 5, -1, -1, -1, -1, -1, -1 };
-
-int main(int argc, char *argv[]) {
-	if (argc < 2) {
-		fprintf(stderr, "%s in.amr\n", argv[0]);
-		return 1;
-	}
-
-	FILE* in = fopen(argv[1], "rb");
-	if (!in) {
-		perror(argv[1]);
-		return 1;
-	}
-	char header[9];
-	int n = fread(header, 1, 9, in);
-	if (n != 9 || memcmp(header, "#!AMR-WB\n", 9)) {
-		fprintf(stderr, "Bad header\n");
-		return 1;
-	}
-
-	WavWriter wav("out.wav", 16000, 16, 1);
-	void* amr = D_IF_init();
-	while (true) {
-		uint8_t buffer[500];
-		/* Read the mode byte */
-		n = fread(buffer, 1, 1, in);
-		if (n <= 0)
-			break;
-		/* Find the packet size */
-		int size = sizes[(buffer[0] >> 3) & 0x0f];
-		if (size <= 0)
-			break;
-		n = fread(buffer + 1, 1, size, in);
-		if (n != size)
-			break;
-
-		/* Decode the packet */
-		int16_t outbuffer[320];
-		D_IF_decode(amr, buffer, outbuffer, 0);
-
-		/* Convert to little endian and write to wav */
-		uint8_t littleendian[640];
-		uint8_t* ptr = littleendian;
-		for (int i = 0; i < 320; i++) {
-			*ptr++ = (outbuffer[i] >> 0) & 0xff;
-			*ptr++ = (outbuffer[i] >> 8) & 0xff;
-		}
-		wav.writeData(littleendian, 640);
-	}
-	fclose(in);
-	D_IF_exit(amr);
-	return 0;
-}
-

opencore-amr-0.1.2.tar.bz2/test/wav.cpp Deleted

@@ -1,87 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#include "wav.h"
-
-void WavWriter::writeString(const char *str) {
-	fputc(str[0], wav);
-	fputc(str[1], wav);
-	fputc(str[2], wav);
-	fputc(str[3], wav);
-}
-
-void WavWriter::writeInt32(int value) {
-	fputc((value >>  0) & 0xff, wav);
-	fputc((value >>  8) & 0xff, wav);
-	fputc((value >> 16) & 0xff, wav);
-	fputc((value >> 24) & 0xff, wav);
-}
-
-void WavWriter::writeInt16(int value) {
-	fputc((value >> 0) & 0xff, wav);
-	fputc((value >> 8) & 0xff, wav);
-}
-
-void WavWriter::writeHeader(int length) {
-	writeString("RIFF");
-	writeInt32(4 + 8 + 16 + 8 + length);
-	writeString("WAVE");
-
-	writeString("fmt ");
-	writeInt32(16);
-
-	int bytesPerFrame = bitsPerSample/8*channels;
-	int bytesPerSec = bytesPerFrame*sampleRate;
-	writeInt16(1);             // Format
-	writeInt16(channels);      // Channels
-	writeInt32(sampleRate);    // Samplerate
-	writeInt32(bytesPerSec);   // Bytes per sec
-	writeInt16(bytesPerFrame); // Bytes per frame
-	writeInt16(bitsPerSample); // Bits per sample
-
-	writeString("data");
-	writeInt32(length);
-}
-
-WavWriter::WavWriter(const char *filename, int sampleRate, int bitsPerSample, int channels) {
-	wav = fopen(filename, "wb");
-	if (wav == NULL)
-		return;
-	dataLength = 0;
-	this->sampleRate = sampleRate;
-	this->bitsPerSample = bitsPerSample;
-	this->channels = channels;
-
-	writeHeader(dataLength);
-}
-
-WavWriter::~WavWriter() {
-	if (wav == NULL)
-		return;
-	fseek(wav, 0, SEEK_SET);
-	writeHeader(dataLength);
-	fclose(wav);
-}
-
-void WavWriter::writeData(const unsigned char* data, int length) {
-	if (wav == NULL)
-		return;
-	fwrite(data, length, 1, wav);
-	dataLength += length;
-}
-

opencore-amr-0.1.2.tar.bz2/test/wav.h Deleted

@@ -1,47 +0,0 @@
-/* ------------------------------------------------------------------
- * Copyright (C) 2009 Martin Storsjo
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- * -------------------------------------------------------------------
- */
-
-#ifndef WAV_H
-#define WAV_H
-
-#include <stdio.h>
-
-class WavWriter {
-public:
-	WavWriter(const char *filename, int sampleRate, int bitsPerSample, int channels);
-	~WavWriter();
-
-	void writeData(const unsigned char* data, int length);
-
-private:
-	void writeString(const char *str);
-	void writeInt32(int value);
-	void writeInt16(int value);
-
-	void writeHeader(int length);
-
-	FILE *wav;
-	int dataLength;
-
-	int sampleRate;
-	int bitsPerSample;
-	int channels;
-};
-
-#endif
-

opencore-amr-0.1.2.tar.bz2/ChangeLog -> opencore-amr-0.1.3.tar.gz/ChangeLog Changed

opencore-amr-0.1.2.tar.bz2/INSTALL -> opencore-amr-0.1.3.tar.gz/INSTALL Changed

@@ -1,11 +1,13 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -163,6 +226,11 @@
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -288,7 +356,7 @@
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.

opencore-amr-0.1.2.tar.bz2/Makefile.am -> opencore-amr-0.1.3.tar.gz/Makefile.am Changed

@@ -1,32 +1,36 @@
-SUBDIRS = amrnb amrwb test
+SUBDIRS = amrnb amrwb
+if EXAMPLES
+    SUBDIRS += test
+endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-noinst_HEADERS = oscl/oscl_base.h oscl/oscl_mem.h
+noinst_HEADERS = oscl/oscl_base.h oscl/oscl_mem.h oscl/oscl_base_macros.h
 
-EXTRA_DIST = LICENSE Makefile.alt build_osx.sh \
-             opencore/README opencore/NOTICE opencore/ChangeLog \
-             opencore/codecs_v2/audio/gsm_amr/patent_disclaimer.txt \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.h \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.h \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.h
+EXTRA_DIST = $(top_srcdir)/LICENSE \
+    $(top_srcdir)/opencore/README \
+    $(top_srcdir)/opencore/NOTICE opencore/ChangeLog \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/patent_disclaimer.txt \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.h \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.h \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.h

opencore-amr-0.1.2.tar.bz2/Makefile.in -> opencore-amr-0.1.3.tar.gz/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,6 +34,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@EXAMPLES_TRUE@am__append_1 = test
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -53,6 +54,12 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -70,14 +77,16 @@
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = amrnb amrwb test
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$[^/]*$/.*$$,\1,'; \
@@ -106,9 +115,12 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -126,6 +138,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -151,6 +164,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -178,6 +192,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -211,7 +226,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -227,40 +241,41 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = amrnb amrwb test
+SUBDIRS = amrnb amrwb $(am__append_1)
 ACLOCAL_AMFLAGS = -I m4
-noinst_HEADERS = oscl/oscl_base.h oscl/oscl_mem.h
-EXTRA_DIST = LICENSE Makefile.alt build_osx.sh \
-             opencore/README opencore/NOTICE opencore/ChangeLog \
-             opencore/codecs_v2/audio/gsm_amr/patent_disclaimer.txt \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.h \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.h \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/build \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.cpp \
-             opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.h
+noinst_HEADERS = oscl/oscl_base.h oscl/oscl_mem.h oscl/oscl_base_macros.h
+EXTRA_DIST = $(top_srcdir)/LICENSE \
+    $(top_srcdir)/opencore/README \
+    $(top_srcdir)/opencore/NOTICE opencore/ChangeLog \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/patent_disclaimer.txt \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/*.h \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/src/*.h \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/build \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/include \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.cpp \
+    $(top_srcdir)/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/*.h
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -296,10 +311,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -328,7 +341,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -353,7 +366,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \

opencore-amr-0.1.2.tar.bz2/aclocal.m4 -> opencore-amr-0.1.3.tar.gz/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,18 +14,21 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,19 +54,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -144,14 +150,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -191,6 +197,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -255,7 +262,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -320,10 +327,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -545,12 +555,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -590,8 +603,8 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -611,7 +624,7 @@
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
 [  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -722,12 +735,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -750,13 +766,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -764,13 +781,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)

opencore-amr-0.1.2.tar.bz2/amrnb/Makefile.am -> opencore-amr-0.1.3.tar.gz/amrnb/Makefile.am Changed

@@ -14,21 +14,31 @@
 AM_CFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(COMMON_DIR)/include \
     -I$(DEC_DIR)/include -I$(AMR_BASE)/common/dec/include -I$(ENC_SRC_DIR)
 
+if GCC_ARMV5
+    AM_CFLAGS += -DPV_CPU_ARCH_VERSION=5 -DPV_COMPILER=1
+endif
+
 if COMPILE_AS_C
     AM_CFLAGS += -x c -std=c99
+    libopencore_amrnb_la_LINK = $(LINK) $(libopencore_amrnb_la_LDFLAGS)
+    # Mention a dummy pure C file to trigger generation of the $(LINK) variable
+    nodist_EXTRA_libopencore_amrnb_la_SOURCES = dummy.c
+else
+    libopencore_amrnb_la_LINK = $(CXXLINK) $(libopencore_amrnb_la_LDFLAGS)
 endif
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
 amrnbincludedir = $(includedir)/opencore-amrnb
-amrnbinclude_HEADERS = interf_dec.h interf_enc.h
+amrnbinclude_HEADERS =
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = opencore-amrnb.pc
 
 lib_LTLIBRARIES = libopencore-amrnb.la
 
-libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@
+libopencore_amrnb_la_LDFLAGS = -version-info @OPENCORE_AMRNB_VERSION@ -no-undefined -export-symbols $(top_srcdir)/amrnb/opencore-amrnb.sym
+EXTRA_DIST = $(top_srcdir)/amrnb/opencore-amrnb.sym
 
 # Our sources to include. There are certain sources we exclude and they are
 # $(DEC_SRC_DIR)/decoder_gsm_amr.cpp
@@ -42,7 +52,10 @@
 # $(COMMON_SRC_DIR)/vad1.cpp
 # $(COMMON_SRC_DIR)/vad2.cpp
 libopencore_amrnb_la_SOURCES = \
-    wrapper.cpp \
+    wrapper.cpp
+
+if AMRNB_DECODER
+    libopencore_amrnb_la_SOURCES += \
     $(DEC_SRC_DIR)/agc.cpp \
         $(DEC_SRC_DIR)/amrdecode.cpp \
         $(DEC_SRC_DIR)/a_refl.cpp \
@@ -77,7 +90,14 @@
         $(DEC_SRC_DIR)/pstfilt.cpp \
         $(DEC_SRC_DIR)/qgain475_tab.cpp \
         $(DEC_SRC_DIR)/sp_dec.cpp \
-        $(DEC_SRC_DIR)/wmf_to_ets.cpp \
+        $(DEC_SRC_DIR)/wmf_to_ets.cpp
+    amrnbinclude_HEADERS += interf_dec.h
+else
+    AM_CFLAGS += -DDISABLE_AMRNB_DECODER
+endif
+
+if AMRNB_ENCODER
+    libopencore_amrnb_la_SOURCES += \
     $(ENC_SRC_DIR)/amrencode.cpp \
         $(ENC_SRC_DIR)/autocorr.cpp \
         $(ENC_SRC_DIR)/c1035pf.cpp \
@@ -138,12 +158,17 @@
         $(ENC_SRC_DIR)/spreproc.cpp \
         $(ENC_SRC_DIR)/spstproc.cpp \
         $(ENC_SRC_DIR)/ton_stab.cpp \
-        $(ENC_SRC_DIR)/vad1.cpp \
+        $(ENC_SRC_DIR)/vad1.cpp
+    amrnbinclude_HEADERS += interf_enc.h
+else
+    AM_CFLAGS += -DDISABLE_AMRNB_ENCODER
+endif
+
+libopencore_amrnb_la_SOURCES += \
     $(COMMON_SRC_DIR)/add.cpp \
         $(COMMON_SRC_DIR)/az_lsp.cpp \
         $(COMMON_SRC_DIR)/bitno_tab.cpp \
         $(COMMON_SRC_DIR)/bitreorder_tab.cpp \
-        $(COMMON_SRC_DIR)/bytesused.cpp \
         $(COMMON_SRC_DIR)/c2_9pf_tab.cpp \
         $(COMMON_SRC_DIR)/div_s.cpp \
         $(COMMON_SRC_DIR)/extract_h.cpp \
@@ -197,4 +222,3 @@
         $(COMMON_SRC_DIR)/weight_a.cpp \
         $(COMMON_SRC_DIR)/window_tab.cpp
 
-EXTRA_DIST = Makefile.alt

opencore-amr-0.1.2.tar.bz2/amrnb/Makefile.in -> opencore-amr-0.1.3.tar.gz/amrnb/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,9 +36,114 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@COMPILE_AS_C_TRUE@am__append_1 = -x c -std=c99
+@GCC_ARMV5_TRUE@am__append_1 = -DPV_CPU_ARCH_VERSION=5 -DPV_COMPILER=1
+@COMPILE_AS_C_TRUE@am__append_2 = -x c -std=c99
+@AMRNB_DECODER_TRUE@am__append_3 = \
+@AMRNB_DECODER_TRUE@    $(DEC_SRC_DIR)/agc.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/amrdecode.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/a_refl.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/b_cn_cod.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/bgnscd.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/c_g_aver.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d1035pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d2_11pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d2_9pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d3_14pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d4_17pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d8_31pf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dec_amr.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dec_gain.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dec_input_format_tab.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dec_lag3.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dec_lag6.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d_gain_c.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d_gain_p.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d_plsf_3.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d_plsf_5.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/d_plsf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/dtx_dec.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/ec_gains.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/ex_ctrl.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/if2_to_ets.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/int_lsf.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/lsp_avg.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/ph_disp.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/post_pro.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/preemph.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/pstfilt.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/qgain475_tab.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/sp_dec.cpp \
+@AMRNB_DECODER_TRUE@        $(DEC_SRC_DIR)/wmf_to_ets.cpp
+
+@AMRNB_DECODER_TRUE@am__append_4 = interf_dec.h
+@AMRNB_DECODER_FALSE@am__append_5 = -DDISABLE_AMRNB_DECODER
+@AMRNB_ENCODER_TRUE@am__append_6 = \
+@AMRNB_ENCODER_TRUE@    $(ENC_SRC_DIR)/amrencode.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/autocorr.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c1035pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c2_11pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c2_9pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c3_14pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c4_17pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/c8_31pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/calc_cor.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/calc_en.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cbsearch.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cl_ltp.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cod_amr.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/convolve.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cor_h.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cor_h_x2.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/cor_h_x.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/corrwght_tab.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/div_32.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/dtx_enc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/enc_lag3.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/enc_lag6.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/enc_output_format_tab.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/ets_to_if2.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/ets_to_wmf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/g_adapt.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/gain_q.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/g_code.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/g_pitch.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/hp_max.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/inter_36.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/inter_36_tab.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/l_abs.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/lag_wind.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/lag_wind_tab.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/l_comp.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/levinson.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/l_extract.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/lflg_upd.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/l_negate.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/lpc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/ol_ltp.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/pitch_fr.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/pitch_ol.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/p_ol_wgh.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/pre_big.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/pre_proc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/prm2bits.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/qgain475.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/qgain795.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/q_gain_c.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/q_gain_p.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/qua_gain.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/s10_8pf.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/set_sign.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/sid_sync.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/sp_enc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/spreproc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/spstproc.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/ton_stab.cpp \
+@AMRNB_ENCODER_TRUE@        $(ENC_SRC_DIR)/vad1.cpp
+
+@AMRNB_ENCODER_TRUE@am__append_7 = interf_enc.h
+@AMRNB_ENCODER_FALSE@am__append_8 = -DDISABLE_AMRNB_ENCODER
 subdir = amrnb
-DIST_COMMON = $(amrnbinclude_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(am__amrnbinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/opencore-amrnb.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -72,69 +177,207 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(amrnbincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libopencore_amrnb_la_LIBADD =
-am_libopencore_amrnb_la_OBJECTS = wrapper.lo agc.lo amrdecode.lo \
-	a_refl.lo b_cn_cod.lo bgnscd.lo c_g_aver.lo d1035pf.lo \
-	d2_11pf.lo d2_9pf.lo d3_14pf.lo d4_17pf.lo d8_31pf.lo \
-	dec_amr.lo dec_gain.lo dec_input_format_tab.lo dec_lag3.lo \
-	dec_lag6.lo d_gain_c.lo d_gain_p.lo d_plsf_3.lo d_plsf_5.lo \
-	d_plsf.lo dtx_dec.lo ec_gains.lo ex_ctrl.lo if2_to_ets.lo \
-	int_lsf.lo lsp_avg.lo ph_disp.lo post_pro.lo preemph.lo \
-	pstfilt.lo qgain475_tab.lo sp_dec.lo wmf_to_ets.lo \
-	amrencode.lo autocorr.lo c1035pf.lo c2_11pf.lo c2_9pf.lo \
-	c3_14pf.lo c4_17pf.lo c8_31pf.lo calc_cor.lo calc_en.lo \
-	cbsearch.lo cl_ltp.lo cod_amr.lo convolve.lo cor_h.lo \
-	cor_h_x2.lo cor_h_x.lo corrwght_tab.lo div_32.lo dtx_enc.lo \
-	enc_lag3.lo enc_lag6.lo enc_output_format_tab.lo ets_to_if2.lo \
-	ets_to_wmf.lo g_adapt.lo gain_q.lo g_code.lo g_pitch.lo \
-	hp_max.lo inter_36.lo inter_36_tab.lo l_abs.lo lag_wind.lo \
-	lag_wind_tab.lo l_comp.lo levinson.lo l_extract.lo lflg_upd.lo \
-	l_negate.lo lpc.lo ol_ltp.lo pitch_fr.lo pitch_ol.lo \
-	p_ol_wgh.lo pre_big.lo pre_proc.lo prm2bits.lo qgain475.lo \
-	qgain795.lo q_gain_c.lo q_gain_p.lo qua_gain.lo s10_8pf.lo \
-	set_sign.lo sid_sync.lo sp_enc.lo spreproc.lo spstproc.lo \
-	ton_stab.lo vad1.lo add.lo az_lsp.lo bitno_tab.lo \
-	bitreorder_tab.lo bytesused.lo c2_9pf_tab.lo div_s.lo \
-	extract_h.lo extract_l.lo gains_tbl.lo gc_pred.lo \
-	get_const_tbls.lo gmed_n.lo gray_tbl.lo grid_tbl.lo int_lpc.lo \
-	inv_sqrt.lo inv_sqrt_tbl.lo l_deposit_h.lo l_deposit_l.lo \
-	log2.lo log2_norm.lo log2_tbl.lo lsfwt.lo l_shr_r.lo lsp_az.lo \
-	lsp.lo lsp_lsf.lo lsp_lsf_tbl.lo lsp_tab.lo mult_r.lo \
-	negate.lo norm_l.lo norm_s.lo overflow_tbl.lo ph_disp_tab.lo \
-	pow2.lo pow2_tbl.lo pred_lt.lo q_plsf_3.lo q_plsf_3_tbl.lo \
-	q_plsf_5.lo q_plsf_5_tbl.lo q_plsf.lo qua_gain_tbl.lo \
-	reorder.lo residu.lo round.lo set_zero.lo shr.lo shr_r.lo \
-	sqrt_l.lo sqrt_l_tbl.lo sub.lo syn_filt.lo weight_a.lo \
-	window_tab.lo
+am__libopencore_amrnb_la_SOURCES_DIST = wrapper.cpp \
+	$(DEC_SRC_DIR)/agc.cpp $(DEC_SRC_DIR)/amrdecode.cpp \
+	$(DEC_SRC_DIR)/a_refl.cpp $(DEC_SRC_DIR)/b_cn_cod.cpp \
+	$(DEC_SRC_DIR)/bgnscd.cpp $(DEC_SRC_DIR)/c_g_aver.cpp \
+	$(DEC_SRC_DIR)/d1035pf.cpp $(DEC_SRC_DIR)/d2_11pf.cpp \
+	$(DEC_SRC_DIR)/d2_9pf.cpp $(DEC_SRC_DIR)/d3_14pf.cpp \
+	$(DEC_SRC_DIR)/d4_17pf.cpp $(DEC_SRC_DIR)/d8_31pf.cpp \
+	$(DEC_SRC_DIR)/dec_amr.cpp $(DEC_SRC_DIR)/dec_gain.cpp \
+	$(DEC_SRC_DIR)/dec_input_format_tab.cpp \
+	$(DEC_SRC_DIR)/dec_lag3.cpp $(DEC_SRC_DIR)/dec_lag6.cpp \
+	$(DEC_SRC_DIR)/d_gain_c.cpp $(DEC_SRC_DIR)/d_gain_p.cpp \
+	$(DEC_SRC_DIR)/d_plsf_3.cpp $(DEC_SRC_DIR)/d_plsf_5.cpp \
+	$(DEC_SRC_DIR)/d_plsf.cpp $(DEC_SRC_DIR)/dtx_dec.cpp \
+	$(DEC_SRC_DIR)/ec_gains.cpp $(DEC_SRC_DIR)/ex_ctrl.cpp \
+	$(DEC_SRC_DIR)/if2_to_ets.cpp $(DEC_SRC_DIR)/int_lsf.cpp \
+	$(DEC_SRC_DIR)/lsp_avg.cpp $(DEC_SRC_DIR)/ph_disp.cpp \
+	$(DEC_SRC_DIR)/post_pro.cpp $(DEC_SRC_DIR)/preemph.cpp \
+	$(DEC_SRC_DIR)/pstfilt.cpp $(DEC_SRC_DIR)/qgain475_tab.cpp \
+	$(DEC_SRC_DIR)/sp_dec.cpp $(DEC_SRC_DIR)/wmf_to_ets.cpp \
+	$(ENC_SRC_DIR)/amrencode.cpp $(ENC_SRC_DIR)/autocorr.cpp \
+	$(ENC_SRC_DIR)/c1035pf.cpp $(ENC_SRC_DIR)/c2_11pf.cpp \
+	$(ENC_SRC_DIR)/c2_9pf.cpp $(ENC_SRC_DIR)/c3_14pf.cpp \
+	$(ENC_SRC_DIR)/c4_17pf.cpp $(ENC_SRC_DIR)/c8_31pf.cpp \

opencore-amr-0.1.2.tar.bz2/amrnb/opencore-amrnb.pc.in -> opencore-amr-0.1.3.tar.gz/amrnb/opencore-amrnb.pc.in Changed

opencore-amr-0.1.3.tar.gz/amrnb/opencore-amrnb.sym Added

opencore-amr-0.1.2.tar.bz2/amrnb/wrapper.cpp -> opencore-amr-0.1.3.tar.gz/amrnb/wrapper.cpp Changed

opencore-amr-0.1.2.tar.bz2/amrwb/Makefile.am -> opencore-amr-0.1.3.tar.gz/amrwb/Makefile.am Changed

@@ -10,8 +10,17 @@
 AM_CFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(DEC_DIR)/include \
     -I$(AMR_BASE)/common/dec/include
 
+if GCC_ARMV5
+    AM_CFLAGS += -DPV_CPU_ARCH_VERSION=5 -DPV_COMPILER=1
+endif
+
 if COMPILE_AS_C
     AM_CFLAGS += -x c -std=c99
+    libopencore_amrwb_la_LINK = $(LINK) $(libopencore_amrwb_la_LDFLAGS)
+    # Mention a dummy pure C file to trigger generation of the $(LINK) variable
+    nodist_EXTRA_libopencore_amrwb_la_SOURCES = dummy.c
+else
+    libopencore_amrwb_la_LINK = $(CXXLINK) $(libopencore_amrwb_la_LDFLAGS)
 endif
 
 AM_CXXFLAGS = $(AM_CFLAGS)
@@ -24,7 +33,8 @@
 
 lib_LTLIBRARIES = libopencore-amrwb.la
 
-libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@
+libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@ -no-undefined -export-symbols $(top_srcdir)/amrwb/opencore-amrwb.sym
+EXTRA_DIST = $(top_srcdir)/amrwb/opencore-amrwb.sym
 
 # Our sources to include. There are certain sources we exclude and they are
 # $(DEC_SRC_DIR)/decoder_amr_wb.cpp
@@ -70,4 +80,3 @@
         $(DEC_SRC_DIR)/wb_syn_filt.cpp \
         $(DEC_SRC_DIR)/weight_amrwb_lpc.cpp
 
-EXTRA_DIST = Makefile.alt

opencore-amr-0.1.2.tar.bz2/amrwb/Makefile.in -> opencore-amr-0.1.3.tar.gz/amrwb/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,7 +36,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@COMPILE_AS_C_TRUE@am__append_1 = -x c -std=c99
+@GCC_ARMV5_TRUE@am__append_1 = -DPV_CPU_ARCH_VERSION=5 -DPV_COMPILER=1
+@COMPILE_AS_C_TRUE@am__append_2 = -x c -std=c99
 subdir = amrwb
 DIST_COMMON = $(amrwbinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/opencore-amrwb.pc.in
@@ -72,6 +73,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(amrwbincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -91,23 +98,53 @@
 	synthesis_amr_wb.lo voice_factor.lo wb_syn_filt.lo \
 	weight_amrwb_lpc.lo
 libopencore_amrwb_la_OBJECTS = $(am_libopencore_amrwb_la_OBJECTS)
-libopencore_amrwb_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(libopencore_amrwb_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libopencore_amrwb_la_SOURCES)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(libopencore_amrwb_la_SOURCES) \
+	$(nodist_EXTRA_libopencore_amrwb_la_SOURCES)
 DIST_SOURCES = $(libopencore_amrwb_la_SOURCES)
 DATA = $(pkgconfig_DATA)
 HEADERS = $(amrwbinclude_HEADERS)
@@ -116,6 +153,7 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -133,6 +171,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -158,6 +197,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -185,6 +225,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -218,7 +259,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -243,14 +283,19 @@
 DEC_SRC_DIR = $(DEC_DIR)/src
 OSCL = $(top_srcdir)/oscl
 AM_CFLAGS = -I$(OSCL) -I$(DEC_SRC_DIR) -I$(DEC_DIR)/include \
-	-I$(AMR_BASE)/common/dec/include $(am__append_1)
+	-I$(AMR_BASE)/common/dec/include $(am__append_1) \
+	$(am__append_2)
+@COMPILE_AS_C_FALSE@libopencore_amrwb_la_LINK = $(CXXLINK) $(libopencore_amrwb_la_LDFLAGS)
+@COMPILE_AS_C_TRUE@libopencore_amrwb_la_LINK = $(LINK) $(libopencore_amrwb_la_LDFLAGS)
+@COMPILE_AS_C_TRUE@nodist_EXTRA_libopencore_amrwb_la_SOURCES = dummy.c
 AM_CXXFLAGS = $(AM_CFLAGS)
 amrwbincludedir = $(includedir)/opencore-amrwb
 amrwbinclude_HEADERS = dec_if.h if_rom.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = opencore-amrwb.pc
 lib_LTLIBRARIES = libopencore-amrwb.la
-libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@
+libopencore_amrwb_la_LDFLAGS = -version-info @OPENCORE_AMRWB_VERSION@ -no-undefined -export-symbols $(top_srcdir)/amrwb/opencore-amrwb.sym
+EXTRA_DIST = $(top_srcdir)/amrwb/opencore-amrwb.sym
 
 # Our sources to include. There are certain sources we exclude and they are
 # $(DEC_SRC_DIR)/decoder_amr_wb.cpp
@@ -296,11 +341,10 @@
         $(DEC_SRC_DIR)/wb_syn_filt.cpp \
         $(DEC_SRC_DIR)/weight_amrwb_lpc.cpp
 
-EXTRA_DIST = Makefile.alt
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -364,8 +408,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libopencore-amrwb.la: $(libopencore_amrwb_la_OBJECTS) $(libopencore_amrwb_la_DEPENDENCIES) 
-	$(libopencore_amrwb_la_LINK) -rpath $(libdir) $(libopencore_amrwb_la_OBJECTS) $(libopencore_amrwb_la_LIBADD) $(LIBS)
+libopencore-amrwb.la: $(libopencore_amrwb_la_OBJECTS) $(libopencore_amrwb_la_DEPENDENCIES) $(EXTRA_libopencore_amrwb_la_DEPENDENCIES) 
+	$(AM_V_GEN)$(libopencore_amrwb_la_LINK) -rpath $(libdir) $(libopencore_amrwb_la_OBJECTS) $(libopencore_amrwb_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -381,6 +425,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dec_gain2_amr_wb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deemphasis_32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dtx_decoder_amr_wb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_amr_wb_bits.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highpass_400hz_at_12k8.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highpass_50hz_at_12k8.Plo@am__quote@
@@ -414,299 +459,320 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weight_amrwb_lpc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Plo@am__quote@
 
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

opencore-amr-0.1.2.tar.bz2/amrwb/opencore-amrwb.pc.in -> opencore-amr-0.1.3.tar.gz/amrwb/opencore-amrwb.pc.in Changed

opencore-amr-0.1.3.tar.gz/amrwb/opencore-amrwb.sym Added

opencore-amr-0.1.2.tar.bz2/config.guess -> opencore-amr-0.1.3.tar.gz/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-06-10'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -27,16 +25,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +54,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +179,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +222,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -333,6 +335,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -391,23 +396,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -477,8 +482,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -491,7 +496,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -548,7 +553,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -591,52 +596,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20

opencore-amr-0.1.2.tar.bz2/config.sub -> opencore-amr-0.1.3.tar.gz/config.sub Changed

opencore-amr-0.1.2.tar.bz2/configure -> opencore-amr-0.1.3.tar.gz/configure Changed

@@ -1,13 +1,15 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for opencore-amr 0.1.2.
+# Generated by GNU Autoconf 2.68 for opencore-amr 0.1.3.
+#
+# Report bugs to <http://sourceforge.net/projects/opencore-amr/>.
 #
-# Report bugs to <https://sourceforge.net/apps/trac/opencore-amr/>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
 # Foundation, Inc.
 #
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -89,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -171,6 +174,14 @@
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
@@ -214,11 +225,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -229,7 +247,7 @@
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://sourceforge.net/apps/trac/opencore-amr/ about
+$0: http://sourceforge.net/projects/opencore-amr/ about
 $0: your system, including any error possibly output before
 $0: this message. Then install a modern shell, or manually
 $0: run the script under such a shell if you do have one."
@@ -317,7 +335,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -357,19 +375,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -526,160 +544,14 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

opencore-amr-0.1.2.tar.bz2/configure.ac -> opencore-amr-0.1.3.tar.gz/configure.ac Changed

@@ -1,10 +1,11 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([opencore-amr], [0.1.2], [https://sourceforge.net/apps/trac/opencore-amr/])
+AC_INIT([opencore-amr], [0.1.3], [http://sourceforge.net/projects/opencore-amr/])
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([tar-ustar])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -18,9 +19,29 @@
                [enable compiling as C program (default is yes)])],
             [compile_as_c=$enableval],
             [compile_as_c=yes])
+AC_ARG_ENABLE([gcc-armv5],
+            [AS_HELP_STRING([--enable-gcc-armv5],
+               [enable GCC specific ARMv5 assembler (default is no)])],
+            [gcc_armv5=$enableval], [gcc_armv5=no])
+AC_ARG_ENABLE([amrnb-encoder],
+            [AS_HELP_STRING([--enable-amrnb-encoder],
+               [enable AMR-NB encoder (default is yes)])],
+            [amrnb_encoder=$enableval], [amrnb_encoder=yes])
+AC_ARG_ENABLE([amrnb-decoder],
+            [AS_HELP_STRING([--enable-amrnb-decoder],
+               [enable AMR-NB decoder (default is yes)])],
+            [amrnb_decoder=$enableval], [amrnb_decoder=yes])
+AC_ARG_ENABLE([examples],
+            [AS_HELP_STRING([--enable-examples],
+               [enable example encoding/decoding programs (default is no)])],
+            [examples=$enableval], [examples=no])
 
 # Automake conditionals to set
 AM_CONDITIONAL(COMPILE_AS_C, test x$compile_as_c = xyes)
+AM_CONDITIONAL(GCC_ARMV5, test x$gcc_armv5 = xyes)
+AM_CONDITIONAL(AMRNB_ENCODER, test x$amrnb_encoder = xyes)
+AM_CONDITIONAL(AMRNB_DECODER, test x$amrnb_decoder = xyes)
+AM_CONDITIONAL(EXAMPLES, test x$examples = xyes)
 
 # Checks for programs.
 AC_PROG_CXX
@@ -58,8 +79,8 @@
 # OpenCORE AMR soname version to use
 # goes by ‘current[:revision[:age]]’ with the soname ending up as
 # current.age.revision.
-OPENCORE_AMRNB_VERSION=0:2:0
-OPENCORE_AMRWB_VERSION=0:2:0
+OPENCORE_AMRNB_VERSION=0:3:0
+OPENCORE_AMRWB_VERSION=0:3:0
 AC_SUBST(OPENCORE_AMRNB_VERSION)
 AC_SUBST(OPENCORE_AMRWB_VERSION)

opencore-amr-0.1.2.tar.bz2/depcomp -> opencore-amr-0.1.3.tar.gz/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # 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
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/	\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation

opencore-amr-0.1.2.tar.bz2/install-sh -> opencore-amr-0.1.3.tar.gz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

opencore-amr-0.1.2.tar.bz2/ltmain.sh -> opencore-amr-0.1.3.tar.gz/ltmain.sh Changed

@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,57 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.4.2 Debian-2.4.2-1"
 TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +98,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +119,28 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -144,6 +160,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +195,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else

opencore-amr-0.1.2.tar.bz2/m4/libtool.m4 -> opencore-amr-0.1.3.tar.gz/m4/libtool.m4 Changed

@@ -1,7 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -10,7 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -37,7 +39,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -66,6 +68,7 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -82,6 +85,8 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -118,7 +123,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -138,6 +143,11 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -160,10 +170,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -179,7 +192,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -193,23 +205,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/$[["`\\]]$/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -250,6 +245,28 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/$[["`\\]]$/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -408,7 +425,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -418,7 +435,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -517,12 +534,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -533,9 +558,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -543,16 +568,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.

opencore-amr-0.1.2.tar.bz2/m4/ltoptions.m4 -> opencore-amr-0.1.3.tar.gz/m4/ltoptions.m4 Changed

@@ -1,13 +1,14 @@
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -125,7 +126,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -133,13 +134,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -325,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])

opencore-amr-0.1.2.tar.bz2/m4/ltversion.m4 -> opencore-amr-0.1.3.tar.gz/m4/ltversion.m4 Changed

opencore-amr-0.1.2.tar.bz2/m4/lt~obsolete.m4 -> opencore-amr-0.1.3.tar.gz/m4/lt~obsolete.m4 Changed

@@ -1,13 +1,13 @@
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -77,7 +77,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -90,3 +89,10 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])

opencore-amr-0.1.2.tar.bz2/missing -> opencore-amr-0.1.3.tar.gz/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

opencore-amr-0.1.2.tar.bz2/opencore/ChangeLog -> opencore-amr-0.1.3.tar.gz/opencore/ChangeLog Changed

@@ -1,17 +1,771 @@
 ===============================================================================
+2010-06-25  OpenCORE 2.50
+
+New Features
+- Mediascanner-albumart support
+- Add new player engine test case for HTTP streaming transfer mode
+- Adding BGR support for CC16 in codecs
+- Provide a runtime setting to prioritize SW codecs over HW codecs in the case 
+of thumbnail retrieval.
+- Addition of DLNA specific 'byte-seek' support for Pause/Resume and Seek cases.
+- Player engine test configuration modifications
+- Add profiling capability to OMX AVC/MPEG4/AAC encoder components.
+- Add support for the PSSH Atom to the mp4 composer, as specified in the 
+Protected Interoperable File Format (PIFF) Specification
+- Timestamp smoothing for incoming audio timestamps
+- Add support for the boxes 'enca', 'encv', 'enct', 'sinf' and 'frma' to the 
+mp4 composer
+- Add SetParameter as an extension command to Android MediaPlayer
+- Adding support of forward playback with rendering only I-frames
+- Modify the mp4 composer to verify the existence of entries in the mfra box 
+before rendering it.
+- Updates to DRM interfaces and test cases
+- Initialize iSkipToIDR to false for OMX AVC decoder.
+- Gapless and playlist support for MP4, MP3, and WMA
+- Framework support for MPEG-2 FF Parser
+- Changes at the PE Node and mp4 parser node to support PDL random position of 
+fragmented clips with out-of-band mfra information
+- Allowing scrubbing inside playerengine
+- MP4 Parser/composer mods to improve metadata support
+- Graceful degradation phase 1 (Key-frame-only mode in case of many late frames)
+- Makefile feature to build static aggregate
+- Add support for building against Android eclair
+- Add integration support for 3rd party audio library
+- AAC lib - Add new message that signals back change of Mode (new PCE)
+- Allow reconfig of MIOs for playlist scenarios
+- Android makefile segment separation / refactoring
+- Addition of new event PVMFInfoSourceFormatUpdated
+- Support for AAC multichannel contents to be partially decoded (output 
+only 2 channels).
+- Implement PVMFOMXEncNode::GetProfileAndLevel() to query for the final 
+profile/level after intialize.
+- Add support for changing bit rate/frame rate/intra refresh rate to OMXEncNode.
+- Allow local.mk file for applications to define steps for running target
+- Support for m4b file format
+- New ARM macros in build make system.
+- Add a target in module level unit test to display the list of available 
+targets
+- Support M4V bitstream with short header mode.
+- Support the PIFF Enhancements in the mp4 parser library
+- Metadata updates for mp3 parser
+- Added an utility function to set RTSP proxy server information 
+(https://review.source.android.com/#change,14369)
+- Build changes to support a restricted Main Profile AVC decoder optimized for 
+ARMv6
+- Adding scaling support for YUV422toYUV420.
+- When initialization error occurs to one of the selected tracks, allow the 
+playback of remaining tracks without a complete shut down.
+- Add progressive playback support in MP4 movie fragment playback
+- Add stdout from engine unit test output to junit xml logs
+- Large File Support in MP4 PDL and PPB
+- Added the test cases in PVME and FMU for protected test content
+- New Common Parser Node for AMR and WAV
+
+Improvements
+- H264 raw support for PVMI MIO file input / output
+- Retrieve "duration" metadata in mediascanner through metadataretriever
+- Fix for compiler warnings in mediaoutputnode and player engine test app.
+- Base node should add itself to Scheduler only in a valid Created state.
+- Codesize reduction for FMU
+- Implemented additional APIs in CPM plugin.
+- AAC lib - Enable redundant PCE syntax element on a raw bitstream
+- Add metadata support for aac, amr, awb and wav files.
+- Change logger levels to appropriate values in android video mio and jb node 
+for certain log statements
+- H264 raw support for PVMI MIO file input / output
+- Add Extended Atom types to the mp4 composer
+- Add test for receiving data in 2way engine unit tests.
+- Remove unused KVPs from engine and codecs
+- Changes made to API of a CPM plugin.
+- OMXConfigParser is modified to differentiate VC1 component from WMV component 
+so that WMV7 and WMV8 get rejected by VC1 component.
+- OMX Encoder node needs to save SPS/PPS for its possible query in the case of 
+H264_RAW format
+- If the encoder node marks the frame as keyframe, there is no need to sniff 
+the bitstream
+- Update source duration for video playlists
+- Build OMX wrappers in thumb mode in Android
+- Add a new 2way engine unit test.
+- Port File Output node to new base node interface design.
+- Removal of 2way VideoParser Node
+- Copyright date in OpenCORE source code should reflect the last time the file 
+was modified
+- Deprecate support for platforms without native 64-bit functionality.
+- Modify media layer node to use the base node framework
+- Add full metadata support for OMX MPEG4/H263 decoders - 
+profile/level/post-processing
+- Replace numeric values in code with enum
+- Add command line configurable timeout for pvplayer_engine_test
+- Some CML2 rules related to so_name can create errors with "n" symbol used as 
+module name
+- Watchdog timer to monitor start of data reception
+- Update the priority of some log messages
+- Use parseID3Tag for aac files
+- Node commands should succeed if the node is already in the resultant state in 
+the base node.
+- Miscellaneous DRM-related modifications
+- Modify jitter buffer node to use the base node framework
+- Refactor Media Output node
+- Remove linker warnings w.r.t. libopencore_player and libopencore_net_support
+- PVMFMediaClock takes care of device latency. Remove the device latency 
+processing in AMIO.
+- Port PVMP4FFComposerNode with the new Node Interface
+- Port Protocol Engine node to new node design
+- Refactor Media Output node to use new node interface
+- Changes to a DRM utility
+- Deprecate (and defunct) support for non-OMX nodes and builds
+- Introduce authoring clock for recording AV sync
+- Allow a single MIO to act as both compressed and uncompressed for the author 
+engine
+- Separating registration of ClockStateObserver and the latency in 
+PVMFMediaClock
+- Add API in PVMp4H263EncExtensionInterface to set H.263 GOB header interval
+- New constructor and parse method overloads for node interface implementation
+- OMX call error handling
+- Handle end of track event in player engine testcase for I-frame mode playback
+- Add RTSP return error code to the PVMF status return code
+- Remove PVMFDummyFileOutputNode
+- Clear the playback intent in PVME to avoid incorrect consumption of rights
+- Based on most recent Khronos clarifications - partially consumed buffers are 
+not allowed in OMX
+- Modify socket node to use the base node framework
+- Adding support for RTSPT tests for new server
+- Addition of Large File Support in MP4 Parser Library
+- Dynamically calculate omx encoder output buffer sizes instead of hard-coding 
+the size
+- Cleanup of 2way engine code.
+- Add warning logger message in the NegotiateComponentParameters functions for 
+2-way
+- Update OMX test app to test creation/destruction of the same component 
+multiple times in a row (especially useful for dynamic loading)
+- Remove dependency of fileoutputnode on pvPlayer SDK
+- cleanup of old Keys from MIOs
+- Remove API QueryUUID from all interfaces
+- Remove usage of USE_CML2_CONFIG since all the builds have been converted to 
+CML2
+- Change MPEG4 encoder OMX component to generate VOL header before getting 
+any input frames.
+- Fix gcc 4.4.1 compiler warnings
+- Remove unnecessary makefile templates from OpenCORE
+- Support for raw compressed headers in track meta data
+- Add a 2way engine unit test for when buffers are provided by MIO.
+- Remove dependency on oscl string from oscl_uuid.
+- Cleanup of 2way engine code.
+- NDEBUG and OSCL_RELEASE_BUILD macro consolidation
+- Use GetEventExtensionInterface to pass indication details from pv2way
+- Bypass pasp atom box in mp4 parser 
+(https://review.source.android.com/#change,12330)
+- CPM cleanup
+- Add mp3 track support in mp4 parser 
+(https://review.source.android.com/#change,12329)
+- Separate variable XCFLAGS to hold C-compiler flags
+- Use openssl crypto library within pvcrypto
+- Process the config data in the omx decoder components even if there are no 
+output buffers available
+- Add support for multichannel aac clips with no channel distribution 
+information
+- Add test duration to junit-like XML log output from test framework
+- Makefile update for new module
+- Change component library name in makefile
+- Move amr and avc common libraries from opencore_common into omx_sharedlibrary
+- Move libpvmioaviwavfileinput.a libavifileparser.a out of libopencore_common.so
+- Deprecate GetMetadataKeys, GetNodeMetadataKeys, GetNumMetadataKeys, and 
+ReleaseNodeMetadataKeys APIs.
+- Improvement in an internal build and the export of some additional methods
+- Move amr_common and avc_common lib to libomx_sharedlibrary.so
+- Print out time taken to complete each OMX test case.
+- Check for INTRA frames in the MPPTYPE box when the H263 frames are using the 
+extended PTYPE header
+- Introduce new KVP string
+- Improve the check for GLOBAL_CPU_ARCH_VERSION in codecs lib makefile to make 
+it scalable to higher version of ARM architecture.
+- Move ResetData() function in android surface output inside Reset()
+- Improve buffer negotiation with 3rd party omx components, as it will  let 
+them have the final say in the number of buffers.
+- Set release level logging to 1 for all platforms
+- Sending position status update before SetPlaybackRange command completion.
+- Improving the current logic in player engine for video scrubbing
+- Improve color conversion unit test
+- Remove unnecessary check in PEUT PS and SS testcases for the number of 
+buffering complete events.
+- Improved error reporting in DRM plugin.
+- Added player test cases for DRM
+- Changes to deal with use-cases when sdcard/phone memory gets full while 
+recording
+- Reset PaddingFrameInfo in MP3 parser after retrieving frame data
+- Cleaned up DRM plugin interface
+- PEUT for shoutcast shall check playback session to verify if it is valid 
+shoutcast session.
+- Modify AVCConfigParser to handle multiple SPSs/PPSs, AUD and SEI NALs.

opencore-amr-0.1.2.tar.bz2/opencore/README -> opencore-amr-0.1.3.tar.gz/opencore/README Changed

@@ -1,14 +1,13 @@
-    Welcome to OpenCORE
+                            Welcome to OpenCORE
 
-OpenCORE is the multimedia framework of Android 
-originally contributed by PacketVideo.  It provides 
-an extensible framework for multimedia rendering and 
+                          http://www.opencore.net/
+
+OpenCORE is the multimedia framework of Android originally contributed by
+PacketVideo.  It provides an extensible framework for multimedia rendering and
 authoring and video telephony (3G-324M).
 
-The following is a brief overview of the directory 
-structure to make it easier to understand the organization.
-Below is a list of the top-level directories along with a brief
-note about the contents.
+The following an overview of the directory structure which includes a list of
+the top-level directories along with a brief note describing the contents.
 
 __
   |-- android  [Contains the components the interface OpenCORE with 
@@ -22,21 +21,21 @@
   |-- doc       [Contains the documentation required to interface with
   |              OpenCORE]
   |-- engines   [Contains the implementation of the player and author 
-  |              engines as well as a utility for metadata.]
+  |              engines as well as a utility for metadata]
   |-- extern_libs_v2 [Contains 3rd-party libraries used by OpenCORE. 
   |                   Currently this directory contains header files 
   |                   defining the Khronos OpenMax IL interface]
   |-- extern_tools_v2 [Contains 3rd-party tools used to build OpenCORE
   |                    indpendently of the Android build system]
   |-- fileformats  [Contains the libraries for parsing a variety of
-  |                 fileformats including mp4/3gp,mp3,wav,aac.]
+  |                 fileformats including mp4/3gp,mp3,wav,aac]
   |-- modules [Contains build files for aggregating low-level libraries]
   |-- nodes     [Contains the OpenCORE framework "nodes", which is 
   |              the abstraction used to implement independent multimedia 
   |              processing units that can be connected in a flow graph]
   |-- oscl      [This is the Operating System Compatibility Layer which 
   |              provides the mapping OS APIs as well as some basic 
-  |              data structures and utilities.]
+  |              data structures and utilities]
   |-- protocols [Contains parsers and composers for a variety of network
   |              protocols such as HTTP, RTP/RTCP, RTSP, and SDP]
   |-- pvmi     [Contains fundamental definitions that make up OpenCORE.
@@ -44,8 +43,8 @@
   |             Multimedia Infrastructure]
   |-- tools_v2  [Contains tools used to build the libraries outside of Android]
 
-Within each library the following directory structure, with a few exceptions,
-to organize the files:
+Within each library, the following directory structure, with a few exceptions,
+is implemented to organize the files:
 
 __
   |-- build
@@ -53,7 +52,7 @@
   |-- doc       <- directory for any documentation specific to this lib
   |-- include   <- header files that are part of the external interface go here
   |-- src       <- source and internal header files of the library
-  |-- test      <- test code (follows a similar structure.
+  |-- test      <- test code (follows a similar structure)
     |-- build
       |-- make
     |-- include

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/Android.mk Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op.h Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_arm_gcc_v5.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_arm_gcc_v5.h Changed

@@ -112,7 +112,7 @@
         L_sum = 32-bit sum of L_var1 and L_var2 (Word32)
     */
 
-    __inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)
+    static inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)
     {
         register Word32 ra = L_var1;
         register Word32 rb = L_var2;
@@ -120,7 +120,7 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("qadd %0, %1, %2"
+        __asm__ volatile("qadd %0, %1, %2"
              : "=r"(result)
                              : "r"(ra), "r"(rb)
                             );
@@ -149,7 +149,7 @@
      Returns:
         L_diff = 32-bit difference of L_var1 and L_var2 (Word32)
     */
-    __inline Word32 L_sub(Word32 L_var1, Word32 L_var2, Flag *pOverflow)
+    static inline Word32 L_sub(Word32 L_var1, Word32 L_var2, Flag *pOverflow)
 {
         register Word32 ra = L_var1;
         register Word32 rb = L_var2;
@@ -157,7 +157,7 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("qsub %0, %1, %2"
+        __asm__ volatile("qsub %0, %1, %2"
              : "=r"(result)
                              : "r"(ra), "r"(rb)
                             );
@@ -197,12 +197,12 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(result)
                              : "r"(rb), "r"(rc)
                             );
 
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(rc)
                              : "r"(ra), "r"(result)
                             );
@@ -232,7 +232,7 @@
         L_product = 32-bit product of L_var1 and L_var2 (Word32)
     */
 
-    __inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow)
+    static inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow)
 {
         register Word32 ra = var1;
         register Word32 rb = var2;
@@ -241,12 +241,12 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(product)
                              : "r"(ra), "r"(rb)
                             );
 
-        asm volatile("qadd %0, %1, %2"
+        __asm__ volatile("qadd %0, %1, %2"
              : "=r"(result)
                              : "r"(product), "r"(product)
                             );
@@ -277,7 +277,7 @@
      Returns:
         result = 32-bit result of L_var3 - (var1 * var2)
     */
-    __inline Word32 L_msu(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
+    static inline Word32 L_msu(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
 {
         register Word32 ra = L_var3;
         register Word32 rb = var1;
@@ -287,12 +287,12 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(product)
                              : "r"(rb), "r"(rc)
                             );
 
-        asm volatile("qdsub %0, %1, %2"
+        __asm__ volatile("qdsub %0, %1, %2"
              : "=r"(result)
                              : "r"(ra), "r"(product)
                             );
@@ -338,44 +338,44 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(L_product)
                              : "r"(ra), "r"(rc)
                             );
-        asm volatile("mov %0, #0"
+        __asm__ volatile("mov %0, #0"
              : "=r"(result)
                     );
 
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(L_sum)
                              : "r"(result), "r"(L_product)
                             );
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(product32)
                              : "r"(ra), "r"(rd)
                             );
 
-        asm volatile("mov %0, %1, ASR #15"
+        __asm__ volatile("mov %0, %1, ASR #15"
              : "=r"(ra)
                              : "r"(product32)
                             );
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(L_product)
                              : "r"(L_sum), "r"(ra)
                             );
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(product32)
                              : "r"(rb), "r"(rc)
                             );
 
-        asm volatile("mov %0, %1, ASR #15"
+        __asm__ volatile("mov %0, %1, ASR #15"
              : "=r"(rb)
                              : "r"(product32)
                             );
 
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(L_sum)
                              : "r"(L_product), "r"(rb)
                             );
@@ -417,29 +417,29 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(L_product)
                              : "r"(ra), "r"(rc)
                             );
-        asm volatile("mov %0, #0"
+        __asm__ volatile("mov %0, #0"
              : "=r"(result)
                     );
 
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(L_product)
                              : "r"(result), "r"(L_product)
                             );
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(result)
                              : "r"(rb), "r"(rc)
                             );
 
-        asm volatile("mov %0, %1, ASR #15"
+        __asm__ volatile("mov %0, %1, ASR #15"
              : "=r"(ra)
                              : "r"(result)
                             );
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(result)
                              : "r"(L_product), "r"(ra)
                             );
@@ -468,7 +468,7 @@
      Returns:
         product = 16-bit limited product of var1 and var2 (Word16)
     */
-    __inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow)
+    static inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow)
 {
         register Word32 ra = var1;
         register Word32 rb = var2;
@@ -477,12 +477,12 @@

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/basic_op_c_equivalent.h Changed

@@ -117,9 +117,9 @@
 
         if ((L_var1 ^ L_var2) >= 0)
         {
-            if ((L_sum ^ L_var1) < 0)
+            if ((L_sum ^ L_var1) >> 31)
             {
-                L_sum = (L_var1 < 0) ? MIN_32 : MAX_32;
+                L_sum = (L_var1 >> 31) ? MIN_32 : MAX_32;
                 *pOverflow = 1;
             }
         }
@@ -155,11 +155,11 @@
 
         L_diff = L_var1 - L_var2;
 
-        if ((L_var1 ^ L_var2) < 0)
+        if ((L_var1 ^ L_var2) >> 31)
         {
             if ((L_diff ^ L_var1) & MIN_32)
             {
-                L_diff = (L_var1 < 0L) ? MIN_32 : MAX_32;
+                L_diff = (L_var1 >> 31) ? MIN_32 : MAX_32;
                 *pOverflow = 1;
             }
         }
@@ -202,9 +202,9 @@
             /* Check if L_sum and L_var_3 share the same sign */
             if ((L_var3 ^ result) > 0)
             {
-                if ((L_sum ^ L_var3) < 0)
+                if ((L_sum ^ L_var3) >> 31)
                 {
-                    L_sum = (L_var3 < 0) ? MIN_32 : MAX_32;
+                    L_sum = (L_var3 >> 31) ? MIN_32 : MAX_32;
                     *pOverflow = 1;
                 }
             }
@@ -342,9 +342,9 @@
 
         if ((L_product ^ product32) > 0)
         {
-            if ((L_sum ^ L_product) < 0)
+            if ((L_sum ^ L_product) >> 31)
             {
-                L_sum = (L_product < 0) ? MIN_32 : MAX_32;
+                L_sum = (L_product >> 31) ? MIN_32 : MAX_32;
             }
         }
 
@@ -358,9 +358,9 @@
 
         if ((L_product ^ product32) > 0)
         {
-            if ((L_sum ^ L_product) < 0)
+            if ((L_sum ^ L_product) >> 31)
             {
-                L_sum = (L_product < 0) ? MIN_32 : MAX_32;
+                L_sum = (L_product >> 31) ? MIN_32 : MAX_32;
             }
         }
         return (L_sum);
@@ -413,9 +413,9 @@
 
         if ((L_product ^ result) > 0)
         {
-            if ((L_sum ^ L_product) < 0)
+            if ((L_sum ^ L_product) >> 31)
             {
-                L_sum = (L_product < 0) ? MIN_32 : MAX_32;
+                L_sum = (L_product >> 31) ? MIN_32 : MAX_32;
                 *pOverflow = 1;
             }
         }

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_add.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_add.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,22 +87,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
-
-    __inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)
-    {
-        Word32 result;
-
-        OSCL_UNUSED_ARG(pOverflow);
-        __asm
-        {
-            QADD result, L_var1, L_var2
-        }
-        return(result);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
-
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
     __inline Word32 L_add(register Word32 L_var1, register Word32 L_var2, Flag *pOverflow)
     {
         register Word32 ra = L_var1;

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mac.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,21 +86,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
-
-    __inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
-    {
-        Word32 result;
-        Word32 L_sum;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm {SMULBB result, var1, var2}
-        __asm {QDADD L_sum, L_var3, result}
-        return (L_sum);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
 
     static inline Word32 L_mac(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
     {

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_msu.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_msu.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,25 +88,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
-
-    __inline Word32 L_msu(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
-    {
-        Word32 product;
-        Word32 result;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm
-        {
-            SMULBB product, var1, var2
-            QDSUB  result, L_var3, product
-        }
-
-        return (result);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
 
     __inline Word32 L_msu(Word32 L_var3, Word16 var1, Word16 var2, Flag *pOverflow)
     {

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_mult.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,26 +87,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
-
-    __inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow)
-    {
-        Word32 result;
-        Word32 product;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm
-        {
-            SMULBB product, var1, var2
-            QADD   result, product, product
-        }
-
-        return (result);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
 
     __inline Word32 L_mult(Word16 var1, Word16 var2, Flag *pOverflow)
     {

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_sub.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/l_sub.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,7 @@
 ----------------------------------------------------------------------------*/
 #include    "basicop_malloc.h"
 
+
 /*--------------------------------------------------------------------------*/
 #ifdef __cplusplus
 extern "C"
@@ -88,24 +89,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
-
-    __inline Word32 L_sub(Word32 L_var1, Word32 L_var2, Flag *pOverflow)
-    {
-        Word32 result;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm
-        {
-            QSUB result, L_var1, L_var2
-        }
-
-        return(result);
-
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC)) /* Instructions for ARM-linux cross-compiler*/
 
     __inline Word32 L_sub(Word32 L_var1, Word32 L_var2, Flag *pOverflow)
     {

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mpy_32.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mpy_32.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,47 +88,13 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
 
-    __inline Word32 Mpy_32(Word16 L_var1_hi,
+    static inline Word32 Mpy_32(Word16 L_var1_hi,
     Word16 L_var1_lo,
     Word16 L_var2_hi,
     Word16 L_var2_lo,
     Flag   *pOverflow)
-
-    {
-        /*----------------------------------------------------------------------------
-        ; Define all local variables
-        ----------------------------------------------------------------------------*/
-        Word32 L_product;
-        Word32 L_sum;
-        Word32 product32;
-
-        OSCL_UNUSED_ARG(pOverflow);
-        /*----------------------------------------------------------------------------
-        ; Function body here
-        ----------------------------------------------------------------------------*/
-        /* L_product = L_mult (L_var1_hi, L_var2_hi, pOverflow);*/
-
-        __asm {SMULBB L_product, L_var1_hi, L_var2_hi}
-        __asm {QDADD L_product, 0, L_product}
-        __asm {SMULBB product32, L_var1_hi, L_var2_lo}
-        product32 >>= 15;
-        __asm {QDADD L_sum, L_product, product32}
-        L_product = L_sum;
-        __asm {SMULBB product32, L_var1_lo, L_var2_hi}
-        product32 >>= 15;
-        __asm {QDADD L_sum, L_product, product32}
-        return (L_sum);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
-
-    static inline Word32 Mpy_32(Word16 L_var1_hi,
-                                Word16 L_var1_lo,
-                                Word16 L_var2_hi,
-                                Word16 L_var2_lo,
-                                Flag   *pOverflow)
     {
         register Word32 product32;
         register Word32 L_sum;

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mpy_32_16.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mpy_32_16.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,36 +88,14 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5) /* Instructions for ARM Assembly on ADS*/
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))/* Instructions for ARM-linux cross-compiler*/
 
-    __inline Word32 Mpy_32_16(Word16 L_var1_hi,
+    static inline Word32 Mpy_32_16(Word16 L_var1_hi,
     Word16 L_var1_lo,
     Word16 var2,
     Flag *pOverflow)
     {
 
-        Word32 L_product;
-        Word32 L_sum;
-        Word32 result;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm {SMULBB L_product, L_var1_hi, var2}
-        __asm {QDADD L_product, 0, L_product}
-        __asm {SMULBB result, L_var1_lo, var2}
-        result >>= 15;
-        __asm {QDADD L_sum, L_product, result}
-        return (L_sum);
-    }
-
-#elif defined(PV_ARM_GCC_V5) /* Instructions for ARM-linux cross-compiler*/
-
-    static inline Word32 Mpy_32_16(Word16 L_var1_hi,
-                                   Word16 L_var1_lo,
-                                   Word16 var2,
-                                   Flag *pOverflow)
-    {
-
         register Word32 ra = L_var1_hi;
         register Word32 rb = L_var1_lo;
         register Word32 rc = var2;
@@ -125,29 +103,29 @@
 
         OSCL_UNUSED_ARG(pOverflow);
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(L_product)
                              : "r"(ra), "r"(rc)
                             );
-        asm volatile("mov %0, #0"
+        __asm__ volatile("mov %0, #0"
              : "=r"(result)
                     );
 
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(L_product)
                              : "r"(result), "r"(L_product)
                             );
 
-        asm volatile("smulbb %0, %1, %2"
+        __asm__ volatile("smulbb %0, %1, %2"
              : "=r"(result)
                              : "r"(rb), "r"(rc)
                             );
 
-        asm volatile("mov %0, %1, ASR #15"
+        __asm__ volatile("mov %0, %1, ASR #15"
              : "=r"(ra)
                              : "r"(result)
                             );
-        asm volatile("qdadd %0, %1, %2"
+        __asm__ volatile("qdadd %0, %1, %2"
              : "=r"(result)
                              : "r"(L_product), "r"(ra)
                             );

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mult.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/mult.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,26 +85,7 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if defined(PV_ARM_V5)
-
-    __inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow)
-    {
-        Word32 product;
-
-        OSCL_UNUSED_ARG(pOverflow);
-
-        __asm
-        {
-            SMULBB product, var1, var2
-            MOV    product, product, ASR #15
-            CMP    product, 0x7FFF
-            MOVGE  product, 0x7FFF
-        }
-
-        return ((Word16) product);
-    }
-
-#elif defined(PV_ARM_GCC_V5)
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
 
     __inline Word16 mult(Word16 var1, Word16 var2, Flag *pOverflow)
     {

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_l.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,29 +86,9 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if !( defined(PV_ARM_V5) || defined(PV_ARM_GCC_V5) )
 
-    /* C EQUIVALENT */
-    OSCL_IMPORT_REF Word16 norm_l(Word32 L_var1);
-
-#elif defined(PV_ARM_V5)
-
-    __inline Word16 norm_l(Word32 L_var1)
-    {
-        register Word32 var_out = 0;
-
-        __asm
-        {
-            CMP    L_var1, #0
-            EORNE  L_var1, L_var1, L_var1, LSL #1
-            CLZNE  var_out, L_var1
-        }
-
-        return ((Word16)var_out);
-    }
-
-#elif defined(PV_ARM_GCC_V5)
 
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
     static inline Word16 norm_l(Word32 L_var1)
     {
         register Word32 var_out = 0;
@@ -116,7 +96,7 @@
         if (L_var1)
         {
             ra ^= (ra << 1);
-            asm volatile(
+            __asm__ volatile(
                 "clz %0, %1"
     : "=r"(var_out)
                         : "r"(ra)
@@ -124,6 +104,9 @@
         }
         return (var_out);
     }
+#else
+    /* C EQUIVALENT */
+    OSCL_IMPORT_REF Word16 norm_l(Word32 L_var1);
 
 #endif
     /*----------------------------------------------------------------------------
@@ -134,5 +117,3 @@
 #endif
 
 #endif
-
-

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_s.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/norm_s.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,31 +86,9 @@
     ; GLOBAL FUNCTION DEFINITIONS
     ; Function Prototype declaration
     ----------------------------------------------------------------------------*/
-#if !( defined(PV_ARM_V5) || defined(PV_ARM_GCC_V5) )
 
-    /* C EQUIVALENT */
-
-    OSCL_IMPORT_REF Word16 norm_s(Word16 var1);
-
-#elif defined(PV_ARM_V5)
-
-    __inline Word16  norm_s(Word16 var)
-    {
-        register Word32 var_out = 0;
-        Word32 var1 = var << 16;
-
-        __asm
-        {
-            CMP    var1, #0
-            EORNE  var1, var1, var1, LSL #1
-            CLZNE  var_out, var1
-        }
-
-        return ((Word16)var_out);
-    }
-
-#elif defined(PV_ARM_GCC_V5)
 
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
     static inline Word16 norm_s(Word16 var1)
     {
         register Word32 var_out = 0;
@@ -118,7 +96,7 @@
         if (ra)
         {
             ra ^= (ra << 1);
-            asm volatile(
+            __asm__ volatile(
                 "clz %0, %1"
     : "=r"(var_out)
                         : "r"(ra)
@@ -126,7 +104,9 @@
         }
         return (var_out);
     }
-
+#else
+    /*C EQUIVALENT */
+    OSCL_IMPORT_REF Word16 norm_s(Word16 var1);
 #endif
     /*----------------------------------------------------------------------------
     ; END
@@ -136,5 +116,3 @@
 #endif
 
 #endif
-
-

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/typedef.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/include/typedef.h Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/add.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/add.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/az_lsp.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/gc_pred.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/gc_pred.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/mult_r.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/mult_r.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/norm_l.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/norm_l.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/norm_s.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/norm_s.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/qua_gain_tbl.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/qua_gain_tbl.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/sub.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/sub.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/syn_filt.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/common/src/syn_filt.cpp Changed

@@ -225,7 +225,7 @@
         }
 
         /* check for overflow on s1 */
-        if ((UWord32)(s1 - 0xf8000000L) < 0x0fffffffL)
+        if ((UWord32)(s1 + 134217728) < 0x0fffffffL)
         {
             temp = (Word16)(s1 >> 12);
         }
@@ -246,7 +246,7 @@
         p_yy1 = yy;
 
         /* check for overflow on s2 */
-        if ((UWord32)(s2 - 0xf8000000L) < 0x0fffffffL)
+        if ((UWord32)(s2 + 134217728) < 0x0fffffffL)
         {
             temp = (Word16)(s2 >> 12);
         }
@@ -283,7 +283,7 @@
             s1 = amrnb_fxp_msu_16_by_16bb((Word32) * (p_a++), (Word32) * (p_yy1), s1);
         }
 
-        if ((UWord32)(s1 - 0xf8000000L) < 0x0fffffffL)
+        if ((UWord32)(s1 + 134217728) < 0x0fffffffL)
         {
             temp = (Word16)(s1 >> 12);
         }
@@ -301,7 +301,7 @@
         *(p_y++) = temp;
         p_yy1 = p_y;
 
-        if ((UWord32)(s2 - 0xf8000000L) < 0x0fffffffL)
+        if ((UWord32)(s2 + 134217728) < 0x0fffffffL)
         {
             *(p_y++) = (Word16)(s2 >> 12);
         }

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/Android.mk Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_nb/enc/Android.mk Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/Android.mk Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_az.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/isp_az.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.cpp -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.cpp Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/normalize_amr_wb.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,6 @@
 ----------------------------------------------------------------------------*/
 
 #include "pv_amr_wb_type_defs.h"
-
 /*----------------------------------------------------------------------------
 ; MACROS
 ; Define module specific macros here
@@ -62,21 +61,7 @@
 ; DEFINES AND SIMPLE TYPEDEF'S
 ----------------------------------------------------------------------------*/
 
-#if defined(PV_ARM_V5)
-
-__inline int16 normalize_amr_wb(int32 x)
-{
-    int32 y;
-    __asm
-    {
-        clz y, x;
-        sub y, y, #1
-    }
-    return (y);
-}
-
-
-#elif defined(PV_ARM_GCC_V5)
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
 
 
 __inline int16 normalize_amr_wb(int32 x)

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op.h Changed

@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,7 +75,7 @@
                range : 0x8000 <= var_out <= 0x7fff.
  ----------------------------------------------------------------------------*/
 
-static inline int16 negate_int16(int16 var1)
+static inline  int16 negate_int16(int16 var1)
 {
     return (((var1 == MIN_16) ? MAX_16 : -var1));
 }
@@ -105,7 +105,7 @@
                range : 0x8000 <= var_out <= 0x7fff.
  ----------------------------------------------------------------------------*/
 
-static inline int16 shl_int16(int16 var1, int16 var2)
+static inline  int16 shl_int16(int16 var1, int16 var2)
 {
     int16 var_out;
 
@@ -149,7 +149,7 @@
 
  ----------------------------------------------------------------------------*/
 
-static inline int32 shl_int32(int32 L_var1, int16 var2)
+static inline  int32 shl_int32(int32 L_var1, int16 var2)
 {
     int32 L_var_out;
 
@@ -193,7 +193,7 @@
 
  ----------------------------------------------------------------------------*/
 
-static inline int32 shr_int32(int32 L_var1, int16 var2)
+static inline  int32 shr_int32(int32 L_var1, int16 var2)
 {
     int32 L_var_out;
 
@@ -220,11 +220,7 @@
 
 
 
-#if defined(PV_ARM_V5)
-
-#include "pvamrwbdecoder_basic_op_armv5.h"
-
-#elif defined(PV_ARM_GCC_V5)
+#if   ((PV_CPU_ARCH_VERSION >=5) && (PV_COMPILER == EPV_ARM_GNUC))
 
 #include "pvamrwbdecoder_basic_op_gcc_armv5.h"

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_cequivalent.h Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/amr_wb/dec/src/pvamrwbdecoder_basic_op_gcc_armv5.h Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/common/dec/Android.mk Changed

opencore-amr-0.1.2.tar.bz2/opencore/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h -> opencore-amr-0.1.3.tar.gz/opencore/codecs_v2/audio/gsm_amr/common/dec/include/pvgsmamrdecoderinterface.h Changed

opencore-amr-0.1.3.tar.gz/oscl/oscl_base_macros.h Added

opencore-amr-0.1.2.tar.bz2/test/Makefile.am -> opencore-amr-0.1.3.tar.gz/test/Makefile.am Changed

@@ -1,23 +1,35 @@
 
-noinst_PROGRAMS = amrnb-dec$(EXEEXT) amrnb-enc$(EXEEXT) amrwb-dec$(EXEEXT) linkboth$(EXEEXT)
-
-EXTRA_DIST = Makefile.alt
+bin_PROGRAMS = amrwb-dec$(EXEEXT)
+noinst_PROGRAMS = linkboth$(EXEEXT)
+AM_CFLAGS =
+
+if AMRNB_DECODER
+    bin_PROGRAMS += amrnb-dec$(EXEEXT)
+else
+    AM_CFLAGS += -DDISABLE_AMRNB_DECODER
+endif
+if AMRNB_ENCODER
+    bin_PROGRAMS += amrnb-enc$(EXEEXT)
+    noinst_PROGRAMS += amrnb-enc-sine$(EXEEXT)
+else
+    AM_CFLAGS += -DDISABLE_AMRNB_ENCODER
+endif
 
 INCLUDES = -I$(top_srcdir)/amrnb -I$(top_srcdir)/amrwb
 
-CLEANFILES = out.amr out.wav
-
 amrnb_dec_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
 amrnb_enc_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
-amrnb_enc_LDFLAGS = -lm
+amrnb_enc_sine_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
+amrnb_enc_sine_LDFLAGS = -lm
 amrwb_dec_LDADD = $(top_builddir)/amrwb/libopencore-amrwb.la
 linkboth_LDFLAGS = -static
 linkboth_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la $(top_builddir)/amrwb/libopencore-amrwb.la
 
-amrnb_dec_SOURCES = amrnb-dec.cpp wav.cpp
-amrnb_enc_SOURCES = amrnb-enc.c
-amrwb_dec_SOURCES = amrwb-dec.cpp wav.cpp
+amrnb_dec_SOURCES = amrnb-dec.c wavwriter.c
+amrnb_enc_SOURCES = amrnb-enc.c wavreader.c
+amrnb_enc_sine_SOURCES = amrnb-enc-sine.c
+amrwb_dec_SOURCES = amrwb-dec.c wavwriter.c
 linkboth_SOURCES = linkboth.c
 
-noinst_HEADERS = wav.h
+noinst_HEADERS = wavwriter.h wavreader.h

opencore-amr-0.1.2.tar.bz2/test/Makefile.in -> opencore-amr-0.1.3.tar.gz/test/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -35,6 +35,11 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@AMRNB_DECODER_TRUE@am__append_1 = amrnb-dec$(EXEEXT)
+@AMRNB_DECODER_FALSE@am__append_2 = -DDISABLE_AMRNB_DECODER
+@AMRNB_ENCODER_TRUE@am__append_3 = amrnb-enc$(EXEEXT)
+@AMRNB_ENCODER_TRUE@am__append_4 = amrnb-enc-sine$(EXEEXT)
+@AMRNB_ENCODER_FALSE@am__append_5 = -DDISABLE_AMRNB_ENCODER
 subdir = test
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -49,58 +54,74 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_amrnb_dec_OBJECTS = amrnb-dec.$(OBJEXT) wav.$(OBJEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_amrnb_dec_OBJECTS = amrnb-dec.$(OBJEXT) wavwriter.$(OBJEXT)
 amrnb_dec_OBJECTS = $(am_amrnb_dec_OBJECTS)
 amrnb_dec_DEPENDENCIES = $(top_builddir)/amrnb/libopencore-amrnb.la
-am_amrnb_enc_OBJECTS = amrnb-enc.$(OBJEXT)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am_amrnb_enc_OBJECTS = amrnb-enc.$(OBJEXT) wavreader.$(OBJEXT)
 amrnb_enc_OBJECTS = $(am_amrnb_enc_OBJECTS)
 amrnb_enc_DEPENDENCIES = $(top_builddir)/amrnb/libopencore-amrnb.la
-amrnb_enc_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(amrnb_enc_LDFLAGS) $(LDFLAGS) -o $@
-am_amrwb_dec_OBJECTS = amrwb-dec.$(OBJEXT) wav.$(OBJEXT)
+am_amrnb_enc_sine_OBJECTS = amrnb-enc-sine.$(OBJEXT)
+amrnb_enc_sine_OBJECTS = $(am_amrnb_enc_sine_OBJECTS)
+amrnb_enc_sine_DEPENDENCIES =  \
+	$(top_builddir)/amrnb/libopencore-amrnb.la
+amrnb_enc_sine_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(amrnb_enc_sine_LDFLAGS) $(LDFLAGS) -o \
+	$@
+am_amrwb_dec_OBJECTS = amrwb-dec.$(OBJEXT) wavwriter.$(OBJEXT)
 amrwb_dec_OBJECTS = $(am_amrwb_dec_OBJECTS)
 amrwb_dec_DEPENDENCIES = $(top_builddir)/amrwb/libopencore-amrwb.la
 am_linkboth_OBJECTS = linkboth.$(OBJEXT)
 linkboth_OBJECTS = $(am_linkboth_OBJECTS)
 linkboth_DEPENDENCIES = $(top_builddir)/amrnb/libopencore-amrnb.la \
 	$(top_builddir)/amrwb/libopencore-amrwb.la
-linkboth_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(linkboth_LDFLAGS) \
-	$(LDFLAGS) -o $@
+linkboth_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(linkboth_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(amrnb_dec_SOURCES) $(amrnb_enc_SOURCES) \
-	$(amrwb_dec_SOURCES) $(linkboth_SOURCES)
+	$(amrnb_enc_sine_SOURCES) $(amrwb_dec_SOURCES) \
+	$(linkboth_SOURCES)
 DIST_SOURCES = $(amrnb_dec_SOURCES) $(amrnb_enc_SOURCES) \
-	$(amrwb_dec_SOURCES) $(linkboth_SOURCES)
+	$(amrnb_enc_sine_SOURCES) $(amrwb_dec_SOURCES) \
+	$(linkboth_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -118,6 +139,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -143,6 +165,7 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -170,6 +193,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -203,7 +227,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -219,25 +242,27 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_PROGRAMS = amrnb-dec$(EXEEXT) amrnb-enc$(EXEEXT) amrwb-dec$(EXEEXT) linkboth$(EXEEXT)
-EXTRA_DIST = Makefile.alt
+bin_PROGRAMS = amrwb-dec$(EXEEXT) $(am__append_1) $(am__append_3)
+noinst_PROGRAMS = linkboth$(EXEEXT) $(am__append_4)
+AM_CFLAGS = $(am__append_2) $(am__append_5)
 INCLUDES = -I$(top_srcdir)/amrnb -I$(top_srcdir)/amrwb
-CLEANFILES = out.amr out.wav
 amrnb_dec_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
 amrnb_enc_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
-amrnb_enc_LDFLAGS = -lm
+amrnb_enc_sine_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la
+amrnb_enc_sine_LDFLAGS = -lm
 amrwb_dec_LDADD = $(top_builddir)/amrwb/libopencore-amrwb.la
 linkboth_LDFLAGS = -static
 linkboth_LDADD = $(top_builddir)/amrnb/libopencore-amrnb.la $(top_builddir)/amrwb/libopencore-amrwb.la
-amrnb_dec_SOURCES = amrnb-dec.cpp wav.cpp
-amrnb_enc_SOURCES = amrnb-enc.c
-amrwb_dec_SOURCES = amrwb-dec.cpp wav.cpp
+amrnb_dec_SOURCES = amrnb-dec.c wavwriter.c
+amrnb_enc_SOURCES = amrnb-enc.c wavreader.c
+amrnb_enc_sine_SOURCES = amrnb-enc-sine.c
+amrwb_dec_SOURCES = amrwb-dec.c wavwriter.c
 linkboth_SOURCES = linkboth.c
-noinst_HEADERS = wav.h
+noinst_HEADERS = wavwriter.h wavreader.h
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -268,6 +293,49 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):

opencore-amr-0.1.3.tar.gz/test/amrnb-dec.c Added

@@ -0,0 +1,87 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include "wavwriter.h"
+#include <interf_dec.h>
+
+/* From WmfDecBytesPerFrame in dec_input_format_tab.cpp */
+const int sizes[] = { 12, 13, 15, 17, 19, 20, 26, 31, 5, 6, 5, 5, 0, 0, 0, 0 };
+
+
+int main(int argc, char *argv[]) {
+	FILE* in;
+	char header[6];
+	int n;
+	void *wav, *amr;
+	if (argc < 3) {
+		fprintf(stderr, "%s in.amr out.wav\n", argv[0]);
+		return 1;
+	}
+
+	in = fopen(argv[1], "rb");
+	if (!in) {
+		perror(argv[1]);
+		return 1;
+	}
+	n = fread(header, 1, 6, in);
+	if (n != 6 || memcmp(header, "#!AMR\n", 6)) {
+		fprintf(stderr, "Bad header\n");
+		return 1;
+	}
+
+	wav = wav_write_open(argv[2], 8000, 16, 1);
+	if (!wav) {
+		fprintf(stderr, "Unable to open %s\n", argv[2]);
+		return 1;
+	}
+
+	amr = Decoder_Interface_init();
+	while (1) {
+		uint8_t buffer[500], littleendian[320], *ptr;
+		int size, i;
+		int16_t outbuffer[160];
+		/* Read the mode byte */
+		n = fread(buffer, 1, 1, in);
+		if (n <= 0)
+			break;
+		/* Find the packet size */
+		size = sizes[(buffer[0] >> 3) & 0x0f];
+		n = fread(buffer + 1, 1, size, in);
+		if (n != size)
+			break;
+
+		/* Decode the packet */
+		Decoder_Interface_Decode(amr, buffer, outbuffer, 0);
+
+		/* Convert to little endian and write to wav */
+		ptr = littleendian;
+		for (i = 0; i < 160; i++) {
+			*ptr++ = (outbuffer[i] >> 0) & 0xff;
+			*ptr++ = (outbuffer[i] >> 8) & 0xff;
+		}
+		wav_write_data(wav, littleendian, 320);
+	}
+	fclose(in);
+	Decoder_Interface_exit(amr);
+	wav_write_close(wav);
+	return 0;
+}
+

opencore-amr-0.1.3.tar.gz/test/amrnb-enc-sine.c Added

@@ -0,0 +1,59 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <math.h>
+#include <interf_enc.h>
+
+int main(int argc, char *argv[]) {
+	int i, j;
+	void* amr;
+	FILE* out;
+	int sample_pos = 0;
+
+	if (argc < 2) {
+		fprintf(stderr, "%s out.amr\n", argv[0]);
+		return 1;
+	}
+
+	amr = Encoder_Interface_init(0);
+	out = fopen(argv[1], "wb");
+	if (!out) {
+		perror(argv[1]);
+		return 1;
+	}
+
+	fwrite("#!AMR\n", 1, 6, out);
+	for (i = 0; i < 1000; i++) {
+		short buf[160];
+		uint8_t outbuf[500];
+		int n;
+		for (j = 0; j < 160; j++) {
+			buf[j] = 32767*sin(440*2*3.141592654*sample_pos/8000);
+			sample_pos++;
+		}
+		n = Encoder_Interface_Encode(amr, MR475, buf, outbuf, 0);
+		fwrite(outbuf, 1, n, out);
+	}
+	fclose(out);
+	Encoder_Interface_exit(amr);
+
+	return 0;
+}
+

opencore-amr-0.1.2.tar.bz2/test/amrnb-enc.c -> opencore-amr-0.1.3.tar.gz/test/amrnb-enc.c Changed

@@ -18,32 +18,127 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <math.h>
 #include <interf_enc.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "wavreader.h"
+
+void usage(const char* name) {
+	fprintf(stderr, "%s [-r bitrate] [-d] in.wav out.amr\n", name);
+}
+
+enum Mode findMode(const char* str) {
+	struct {
+		enum Mode mode;
+		int rate;
+	} modes[] = {
+		{ MR475,  4750 },
+		{ MR515,  5150 },
+		{ MR59,   5900 },
+		{ MR67,   6700 },
+		{ MR74,   7400 },
+		{ MR795,  7950 },
+		{ MR102, 10200 },
+		{ MR122, 12200 }
+	};
+	int rate = atoi(str);
+	int closest = -1;
+	int closestdiff = 0;
+	unsigned int i;
+	for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
+		if (modes[i].rate == rate)
+			return modes[i].mode;
+		if (closest < 0 || closestdiff > abs(modes[i].rate - rate)) {
+			closest = i;
+			closestdiff = abs(modes[i].rate - rate);
+		}
+	}
+	fprintf(stderr, "Using bitrate %d\n", modes[closest].rate);
+	return modes[closest].mode;
+}
 
 int main(int argc, char *argv[]) {
-	int i, j;
-	void* amr;
-	FILE* out;
-	int sample_pos = 0;
+	enum Mode mode = MR122;
+	int ch, dtx = 0;
+	const char *infile, *outfile;
+	FILE *out;
+	void *wav, *amr;
+	int format, sampleRate, channels, bitsPerSample;
+	int inputSize;
+	uint8_t* inputBuf;
+	while ((ch = getopt(argc, argv, "r:d")) != -1) {
+		switch (ch) {
+		case 'r':
+			mode = findMode(optarg);
+			break;
+		case 'd':
+			dtx = 1;
+			break;
+		case '?':
+		default:
+			usage(argv[0]);
+			return 1;
+		}
+	}
+	if (argc - optind < 2) {
+		usage(argv[0]);
+		return 1;
+	}
+	infile = argv[optind];
+	outfile = argv[optind + 1];
 
-	amr = Encoder_Interface_init(0);
-	out = fopen("out.amr", "wb");
+	wav = wav_read_open(infile);
+	if (!wav) {
+		fprintf(stderr, "Unable to open wav file %s\n", infile);
+		return 1;
+	}
+	if (!wav_get_header(wav, &format, &channels, &sampleRate, &bitsPerSample, NULL)) {
+		fprintf(stderr, "Bad wav file %s\n", infile);
+		return 1;
+	}
+	if (format != 1) {
+		fprintf(stderr, "Unsupported WAV format %d\n", format);
+		return 1;
+	}
+	if (bitsPerSample != 16) {
+		fprintf(stderr, "Unsupported WAV sample depth %d\n", bitsPerSample);
+		return 1;
+	}
+	if (channels != 1)
+		fprintf(stderr, "Warning, only compressing one audio channel\n");
+	if (sampleRate != 8000)
+		fprintf(stderr, "Warning, AMR-NB uses 8000 Hz sample rate (WAV file has %d Hz)\n", sampleRate);
+	inputSize = channels*2*160;
+	inputBuf = (uint8_t*) malloc(inputSize);
+
+	amr = Encoder_Interface_init(dtx);
+	out = fopen(outfile, "wb");
+	if (!out) {
+		perror(outfile);
+		return 1;
+	}
 
 	fwrite("#!AMR\n", 1, 6, out);
-	for (i = 0; i < 1000; i++) {
+	while (1) {
 		short buf[160];
 		uint8_t outbuf[500];
-		int n;
-		for (j = 0; j < 160; j++) {
-			buf[j] = 32767*sin(440*2*3.141592654*sample_pos/8000);
-			sample_pos++;
+		int read, i, n;
+		read = wav_read_data(wav, inputBuf, inputSize);
+		read /= channels;
+		read /= 2;
+		if (read < 160)
+			break;
+		for (i = 0; i < 160; i++) {
+			const uint8_t* in = &inputBuf[2*channels*i];
+			buf[i] = in[0] | (in[1] << 8);
 		}
-		n = Encoder_Interface_Encode(amr, MR475, buf, outbuf, 0);
+		n = Encoder_Interface_Encode(amr, mode, buf, outbuf, 0);
 		fwrite(outbuf, 1, n, out);
 	}
+	free(inputBuf);
 	fclose(out);
 	Encoder_Interface_exit(amr);
+	wav_read_close(wav);
 
 	return 0;
 }

opencore-amr-0.1.3.tar.gz/test/amrwb-dec.c Added

@@ -0,0 +1,87 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include "wavwriter.h"
+#include <dec_if.h>
+
+/* From pvamrwbdecoder_api.h, by dividing by 8 and rounding up */
+const int sizes[] = { 17, 23, 32, 36, 40, 46, 50, 58, 60, 5, -1, -1, -1, -1, -1, 0 };
+
+int main(int argc, char *argv[]) {
+	FILE* in;
+	char header[9];
+	int n;
+	void *wav, *amr;
+	if (argc < 3) {
+		fprintf(stderr, "%s in.amr out.wav\n", argv[0]);
+		return 1;
+	}
+
+	in = fopen(argv[1], "rb");
+	if (!in) {
+		perror(argv[1]);
+		return 1;
+	}
+	n = fread(header, 1, 9, in);
+	if (n != 9 || memcmp(header, "#!AMR-WB\n", 9)) {
+		fprintf(stderr, "Bad header\n");
+		return 1;
+	}
+
+	wav = wav_write_open(argv[2], 16000, 16, 1);
+	if (!wav) {
+		fprintf(stderr, "Unable to open %s\n", argv[2]);
+		return 1;
+	}
+	amr = D_IF_init();
+	while (1) {
+		uint8_t buffer[500], littleendian[640], *ptr;
+		int size, i;
+		int16_t outbuffer[320];
+		/* Read the mode byte */
+		n = fread(buffer, 1, 1, in);
+		if (n <= 0)
+			break;
+		/* Find the packet size */
+		size = sizes[(buffer[0] >> 3) & 0x0f];
+		if (size < 0)
+			break;
+		n = fread(buffer + 1, 1, size, in);
+		if (n != size)
+			break;
+
+		/* Decode the packet */
+		D_IF_decode(amr, buffer, outbuffer, 0);
+
+		/* Convert to little endian and write to wav */
+		ptr = littleendian;
+		for (i = 0; i < 320; i++) {
+			*ptr++ = (outbuffer[i] >> 0) & 0xff;
+			*ptr++ = (outbuffer[i] >> 8) & 0xff;
+		}
+		wav_write_data(wav, littleendian, 640);
+	}
+	fclose(in);
+	D_IF_exit(amr);
+	wav_write_close(wav);
+	return 0;
+}
+

opencore-amr-0.1.2.tar.bz2/test/linkboth.c -> opencore-amr-0.1.3.tar.gz/test/linkboth.c Changed

opencore-amr-0.1.3.tar.gz/test/wavreader.c Added

@@ -0,0 +1,162 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include "wavreader.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#define TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
+
+struct wav_reader {
+	FILE *wav;
+	uint32_t data_length;
+
+	int format;
+	int sample_rate;
+	int bits_per_sample;
+	int channels;
+	int byte_rate;
+	int block_align;
+};
+
+static uint32_t read_tag(struct wav_reader* wr) {
+	uint32_t tag = 0;
+	tag = (tag << 8) | fgetc(wr->wav);
+	tag = (tag << 8) | fgetc(wr->wav);
+	tag = (tag << 8) | fgetc(wr->wav);
+	tag = (tag << 8) | fgetc(wr->wav);
+	return tag;
+}
+
+static uint32_t read_int32(struct wav_reader* wr) {
+	uint32_t value = 0;
+	value |= fgetc(wr->wav) <<  0;
+	value |= fgetc(wr->wav) <<  8;
+	value |= fgetc(wr->wav) << 16;
+	value |= fgetc(wr->wav) << 24;
+	return value;
+}
+
+static uint16_t read_int16(struct wav_reader* wr) {
+	uint16_t value = 0;
+	value |= fgetc(wr->wav) << 0;
+	value |= fgetc(wr->wav) << 8;
+	return value;
+}
+
+void* wav_read_open(const char *filename) {
+	struct wav_reader* wr = (struct wav_reader*) malloc(sizeof(*wr));
+	long data_pos = 0;
+	memset(wr, 0, sizeof(*wr));
+
+	wr->wav = fopen(filename, "rb");
+	if (wr->wav == NULL) {
+		free(wr);
+		return NULL;
+	}
+
+	while (1) {
+		uint32_t tag, tag2, length;
+		tag = read_tag(wr);
+		if (feof(wr->wav))
+			break;
+		length = read_int32(wr);
+		if (tag != TAG('R', 'I', 'F', 'F') || length < 4) {
+			fseek(wr->wav, length, SEEK_CUR);
+			continue;
+		}
+		tag2 = read_tag(wr);
+		length -= 4;
+		if (tag2 != TAG('W', 'A', 'V', 'E')) {
+			fseek(wr->wav, length, SEEK_CUR);
+			continue;
+		}
+		// RIFF chunk found, iterate through it
+		while (length >= 8) {
+			uint32_t subtag, sublength;
+			subtag = read_tag(wr);
+			if (feof(wr->wav))
+				break;
+			sublength = read_int32(wr);
+			length -= 8;
+			if (length < sublength)
+				break;
+			if (subtag == TAG('f', 'm', 't', ' ')) {
+				if (sublength < 16) {
+					// Insufficient data for 'fmt '
+					break;
+				}
+				wr->format          = read_int16(wr);
+				wr->channels        = read_int16(wr);
+				wr->sample_rate     = read_int32(wr);
+				wr->byte_rate       = read_int32(wr);
+				wr->block_align     = read_int16(wr);
+				wr->bits_per_sample = read_int16(wr);
+			} else if (subtag == TAG('d', 'a', 't', 'a')) {
+				data_pos = ftell(wr->wav);
+				wr->data_length = sublength;
+				fseek(wr->wav, sublength, SEEK_CUR);
+			} else {
+				fseek(wr->wav, sublength, SEEK_CUR);
+			}
+			length -= sublength;
+		}
+		if (length > 0) {
+			// Bad chunk?
+			fseek(wr->wav, length, SEEK_CUR);
+		}
+	}
+	fseek(wr->wav, data_pos, SEEK_SET);
+	return wr;
+}
+
+void wav_read_close(void* obj) {
+	struct wav_reader* wr = (struct wav_reader*) obj;
+	fclose(wr->wav);
+	free(wr);
+}
+
+int wav_get_header(void* obj, int* format, int* channels, int* sample_rate, int* bits_per_sample, unsigned int* data_length) {
+	struct wav_reader* wr = (struct wav_reader*) obj;
+	if (format)
+		*format = wr->format;
+	if (channels)
+		*channels = wr->channels;
+	if (sample_rate)
+		*sample_rate = wr->sample_rate;
+	if (bits_per_sample)
+		*bits_per_sample = wr->bits_per_sample;
+	if (data_length)
+		*data_length = wr->data_length;
+	return wr->format && wr->sample_rate;
+}
+
+int wav_read_data(void* obj, unsigned char* data, unsigned int length) {
+	struct wav_reader* wr = (struct wav_reader*) obj;
+	int n;
+	if (wr->wav == NULL)
+		return -1;
+	if (length > wr->data_length)
+		length = wr->data_length;
+	n = fread(data, 1, length, wr->wav);
+	wr->data_length -= length;
+	return n;
+}
+

opencore-amr-0.1.3.tar.gz/test/wavreader.h Added

@@ -0,0 +1,37 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#ifndef WAVREADER_H
+#define WAVREADER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void* wav_read_open(const char *filename);
+void wav_read_close(void* obj);
+
+int wav_get_header(void* obj, int* format, int* channels, int* sample_rate, int* bits_per_sample, unsigned int* data_length);
+int wav_read_data(void* obj, unsigned char* data, unsigned int length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

opencore-amr-0.1.3.tar.gz/test/wavwriter.c Added

@@ -0,0 +1,111 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#include "wavwriter.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+struct wav_writer {
+	FILE *wav;
+	int data_length;
+
+	int sample_rate;
+	int bits_per_sample;
+	int channels;
+};
+
+static void write_string(struct wav_writer* ww, const char *str) {
+	fputc(str[0], ww->wav);
+	fputc(str[1], ww->wav);
+	fputc(str[2], ww->wav);
+	fputc(str[3], ww->wav);
+}
+
+static void write_int32(struct wav_writer* ww, int value) {
+	fputc((value >>  0) & 0xff, ww->wav);
+	fputc((value >>  8) & 0xff, ww->wav);
+	fputc((value >> 16) & 0xff, ww->wav);
+	fputc((value >> 24) & 0xff, ww->wav);
+}
+
+static void write_int16(struct wav_writer* ww, int value) {
+	fputc((value >> 0) & 0xff, ww->wav);
+	fputc((value >> 8) & 0xff, ww->wav);
+}
+
+static void write_header(struct wav_writer* ww, int length) {
+	int bytes_per_frame, bytes_per_sec;
+	write_string(ww, "RIFF");
+	write_int32(ww, 4 + 8 + 16 + 8 + length);
+	write_string(ww, "WAVE");
+
+	write_string(ww, "fmt ");
+	write_int32(ww, 16);
+
+	bytes_per_frame = ww->bits_per_sample/8*ww->channels;
+	bytes_per_sec   = bytes_per_frame*ww->sample_rate;
+	write_int16(ww, 1);                   // Format
+	write_int16(ww, ww->channels);        // Channels
+	write_int32(ww, ww->sample_rate);     // Samplerate
+	write_int32(ww, bytes_per_sec);       // Bytes per sec
+	write_int16(ww, bytes_per_frame);     // Bytes per frame
+	write_int16(ww, ww->bits_per_sample); // Bits per sample
+
+	write_string(ww, "data");
+	write_int32(ww, length);
+}
+
+void* wav_write_open(const char *filename, int sample_rate, int bits_per_sample, int channels) {
+	struct wav_writer* ww = (struct wav_writer*) malloc(sizeof(*ww));
+	memset(ww, 0, sizeof(*ww));
+	ww->wav = fopen(filename, "wb");
+	if (ww->wav == NULL) {
+		free(ww);
+		return NULL;
+	}
+	ww->data_length = 0;
+	ww->sample_rate = sample_rate;
+	ww->bits_per_sample = bits_per_sample;
+	ww->channels = channels;
+
+	write_header(ww, ww->data_length);
+	return ww;
+}
+
+void wav_write_close(void* obj) {
+	struct wav_writer* ww = (struct wav_writer*) obj;
+	if (ww->wav == NULL) {
+		free(ww);
+		return;
+	}
+	fseek(ww->wav, 0, SEEK_SET);
+	write_header(ww, ww->data_length);
+	fclose(ww->wav);
+	free(ww);
+}
+
+void wav_write_data(void* obj, const unsigned char* data, int length) {
+	struct wav_writer* ww = (struct wav_writer*) obj;
+	if (ww->wav == NULL)
+		return;
+	fwrite(data, length, 1, ww->wav);
+	ww->data_length += length;
+}
+

opencore-amr-0.1.3.tar.gz/test/wavwriter.h Added

@@ -0,0 +1,36 @@
+/* ------------------------------------------------------------------
+ * Copyright (C) 2009 Martin Storsjo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ * -------------------------------------------------------------------
+ */
+
+#ifndef WAVWRITER_H
+#define WAVWRITER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void* wav_write_open(const char *filename, int sample_rate, int bits_per_sample, int channels);
+void wav_write_close(void* obj);
+
+void wav_write_data(void* obj, const unsigned char* data, int length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

Changes of Revision 2