mirror of
https://github.com/mozilla/cubeb
synced 2024-11-21 14:29:11 -07:00
07c352c65a
Following https://github.com/mozilla/cubeb/issues/658#issuecomment-955998734, the speex library is now handled like a normal dependency: cubeb will link against the system version if available, and fall back to the bundled one if not. I've also added a BUNDLE_SPEEX option, so that you can force the use of the bundled library if needed (e.g. creating a standalone libcubeb on a system where libspeex is available). I also had to move the bundled library to a separate folder. As `src` is always added as an include path, the headers in `src/speex` would conflict with system headers. And it also clears the relationship between cubeb and speex. I choose the "subprojects" name to follow the Meson convention, since CMake does not have one. A bit OT, but if you're curious you can see their rationale here: https://mesonbuild.com/Subprojects.html#why-must-all-subprojects-be-inside-a-single-directory Lastly, I added cubeb_log.cpp to the list of sources of test_resampler, as I was getting linking errors when building with BUILD_SHARED_LIBS=true Fixes #658
115 lines
3.3 KiB
C
115 lines
3.3 KiB
C
/* Copyright (C) 2002 Jean-Marc Valin */
|
|
/**
|
|
@file stack_alloc.h
|
|
@brief Temporary memory allocation on stack
|
|
*/
|
|
/*
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
|
|
- Redistributions of source code must retain the above copyright
|
|
notice, this list of conditions and the following disclaimer.
|
|
|
|
- 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.
|
|
|
|
- Neither the name of the Xiph.org Foundation nor the names of its
|
|
contributors may be used to endorse or promote products derived from
|
|
this software without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
``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 FOUNDATION OR
|
|
CONTRIBUTORS 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 STACK_ALLOC_H
|
|
#define STACK_ALLOC_H
|
|
|
|
#ifdef USE_ALLOCA
|
|
# ifdef WIN32
|
|
# include <malloc.h>
|
|
# else
|
|
# ifdef HAVE_ALLOCA_H
|
|
# include <alloca.h>
|
|
# else
|
|
# include <stdlib.h>
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
/**
|
|
* @def ALIGN(stack, size)
|
|
*
|
|
* Aligns the stack to a 'size' boundary
|
|
*
|
|
* @param stack Stack
|
|
* @param size New size boundary
|
|
*/
|
|
|
|
/**
|
|
* @def PUSH(stack, size, type)
|
|
*
|
|
* Allocates 'size' elements of type 'type' on the stack
|
|
*
|
|
* @param stack Stack
|
|
* @param size Number of elements
|
|
* @param type Type of element
|
|
*/
|
|
|
|
/**
|
|
* @def VARDECL(var)
|
|
*
|
|
* Declare variable on stack
|
|
*
|
|
* @param var Variable to declare
|
|
*/
|
|
|
|
/**
|
|
* @def ALLOC(var, size, type)
|
|
*
|
|
* Allocate 'size' elements of 'type' on stack
|
|
*
|
|
* @param var Name of variable to allocate
|
|
* @param size Number of elements
|
|
* @param type Type of element
|
|
*/
|
|
|
|
#ifdef ENABLE_VALGRIND
|
|
|
|
#include <valgrind/memcheck.h>
|
|
|
|
#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
|
|
|
|
#define PUSH(stack, size, type) (VALGRIND_MAKE_NOACCESS(stack, 1000),ALIGN((stack),sizeof(type)),VALGRIND_MAKE_WRITABLE(stack, ((size)*sizeof(type))),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
|
|
|
|
#else
|
|
|
|
#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1))
|
|
|
|
#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type))))
|
|
|
|
#endif
|
|
|
|
#if defined(VAR_ARRAYS)
|
|
#define VARDECL(var)
|
|
#define ALLOC(var, size, type) type var[size]
|
|
#elif defined(USE_ALLOCA)
|
|
#define VARDECL(var) var
|
|
#define ALLOC(var, size, type) var = alloca(sizeof(type)*(size))
|
|
#else
|
|
#define VARDECL(var) var
|
|
#define ALLOC(var, size, type) var = PUSH(stack, size, type)
|
|
#endif
|
|
|
|
|
|
#endif
|