ref: 62534c9b2303facfc227a9a1ffc80d35ed6c12f6
parent: a46bb5c9733fef40e6cdcdcd2ac80106b5e18d7a
author: Mark Harris <mark.hsj@gmail.com>
date: Wed Feb 7 16:12:06 EST 2018
Remove unused Speex header file os_support.h
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
src/encoder.h \
src/opus_header.h \
src/opusinfo.h \
- src/os_support.h \
src/picture.h \
src/resample_sse.h \
src/speex_resampler.h \
--- a/src/os_support.h
+++ /dev/null
@@ -1,167 +1,0 @@
-/* Copyright (C) 2007 Jean-Marc Valin
-
- File: os_support.h
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef OS_SUPPORT_H
-#define OS_SUPPORT_H
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#ifdef OS_SUPPORT_CUSTOM
-#include "os_support_custom.h"
-#endif
-
-/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_free
- NOTE: speex_alloc needs to CLEAR THE MEMORY */
-#ifndef OVERRIDE_SPEEX_ALLOC
-static inline void *speex_alloc (int size)
-{- /* WARNING: this is not equivalent to malloc(). If you want to use malloc()
- or your own allocator, YOU NEED TO CLEAR THE MEMORY ALLOCATED. Otherwise
- you will experience strange bugs */
- return calloc(size,1);
-}
-#endif
-
-/** Same as speex_alloc, except that the area is only needed inside a Speex call (might cause problem with wideband though) */
-#ifndef OVERRIDE_SPEEX_ALLOC_SCRATCH
-static inline void *speex_alloc_scratch (int size)
-{- /* Scratch space doesn't need to be cleared */
- return calloc(size,1);
-}
-#endif
-
-/** Speex wrapper for realloc. To do your own dynamic allocation, all you need to do is replace this function, speex_alloc and speex_free */
-#ifndef OVERRIDE_SPEEX_REALLOC
-static inline void *speex_realloc (void *ptr, int size)
-{- return realloc(ptr, size);
-}
-#endif
-
-/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_alloc */
-#ifndef OVERRIDE_SPEEX_FREE
-static inline void speex_free (void *ptr)
-{- free(ptr);
-}
-#endif
-
-/** Same as speex_free, except that the area is only needed inside a Speex call (might cause problem with wideband though) */
-#ifndef OVERRIDE_SPEEX_FREE_SCRATCH
-static inline void speex_free_scratch (void *ptr)
-{- free(ptr);
-}
-#endif
-
-/** Copy n elements from src to dst. The 0* term provides compile-time type checking */
-#ifndef OVERRIDE_SPEEX_COPY
-#define SPEEX_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
-#endif
-
-/** Copy n elements from src to dst, allowing overlapping regions. The 0* term
- provides compile-time type checking */
-#ifndef OVERRIDE_SPEEX_MOVE
-#define SPEEX_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
-#endif
-
-/** For n elements worth of memory, set every byte to the value of c, starting at address dst */
-#ifndef OVERRIDE_SPEEX_MEMSET
-#define SPEEX_MEMSET(dst, c, n) (memset((dst), (c), (n)*sizeof(*(dst))))
-#endif
-
-
-#ifndef OVERRIDE_SPEEX_FATAL
-static inline void _speex_fatal(const char *str, const char *file, int line)
-{- fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
- exit(1);
-}
-#endif
-
-#ifndef OVERRIDE_SPEEX_WARNING
-static inline void speex_warning(const char *str)
-{-#ifndef DISABLE_WARNINGS
- fprintf (stderr, "warning: %s\n", str);
-#endif
-}
-#endif
-
-#ifndef OVERRIDE_SPEEX_WARNING_INT
-static inline void speex_warning_int(const char *str, int val)
-{-#ifndef DISABLE_WARNINGS
- fprintf (stderr, "warning: %s %d\n", str, val);
-#endif
-}
-#endif
-
-#ifndef OVERRIDE_SPEEX_NOTIFY
-static inline void speex_notify(const char *str)
-{-#ifndef DISABLE_NOTIFICATIONS
- fprintf (stderr, "notification: %s\n", str);
-#endif
-}
-#endif
-
-#ifndef OVERRIDE_SPEEX_PUTC
-/** Speex wrapper for putc */
-static inline void _speex_putc(int ch, void *file)
-{- FILE *f = (FILE *)file;
- fprintf(f, "%c", ch);
-}
-#endif
-
-#define speex_fatal(str) _speex_fatal(str, __FILE__, __LINE__);
-#define speex_assert(cond) {if (!(cond)) {speex_fatal("assertion failed: " #cond);}}-
-#ifndef RELEASE
-static inline void print_vec(float *vec, int len, char *name)
-{- int i;
- printf ("%s ", name);- for (i=0;i<len;i++)
- printf (" %f", vec[i]);- printf ("\n");-}
-#endif
-
-#endif
-
--- a/win32/VS2015/opusdec.vcxproj
+++ b/win32/VS2015/opusdec.vcxproj
@@ -35,7 +35,6 @@
<ClInclude Include="..\..\src\cpusupport.h" />
<ClInclude Include="..\..\src\diag_range.h" />
<ClInclude Include="..\..\src\opus_header.h" />
- <ClInclude Include="..\..\src\os_support.h" />
<ClInclude Include="..\..\src\resample_sse.h" />
<ClInclude Include="..\..\src\speex_resampler.h" />
<ClInclude Include="..\..\src\stack_alloc.h" />
@@ -100,4 +99,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/win32/VS2015/opusdec.vcxproj.filters
+++ b/win32/VS2015/opusdec.vcxproj.filters
@@ -49,9 +49,6 @@
<ClInclude Include="..\..\src\opus_header.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\os_support.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\resample_sse.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -80,4 +77,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/win32/VS2015/opusenc.vcxproj
+++ b/win32/VS2015/opusenc.vcxproj
@@ -37,7 +37,6 @@
<ClInclude Include="..\..\src\encoder.h" />
<ClInclude Include="..\..\src\flac.h" />
<ClInclude Include="..\..\src\opus_header.h" />
- <ClInclude Include="..\..\src\os_support.h" />
<ClInclude Include="..\..\src\picture.h" />
<ClInclude Include="..\..\src\stack_alloc.h" />
<ClInclude Include="..\..\src\wav_io.h" />
@@ -98,4 +97,4 @@
<ItemDefinitionGroup />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+</Project>
--- a/win32/VS2015/opusenc.vcxproj.filters
+++ b/win32/VS2015/opusenc.vcxproj.filters
@@ -55,9 +55,6 @@
<ClInclude Include="..\..\src\opus_header.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\os_support.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\picture.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -80,4 +77,4 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>