AnotherFoxGuy/webrtc-audio-processing
1
0
Fork 0
Code Pull Requests Activity

build: Make build succeed without test and non-audio deps

Browse Source
This commit is contained in:
Arun Raghavan 2015-10-13 17:27:17 +05:30
parent 753eada3aa
commit 407bfbf651
6 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -24,8 +24,9 @@ AS_CASE(["x${with_ns_mode}"],
[NS_FIXED=0]) [NS_FIXED=0])
AM_CONDITIONAL(NS_FIXED, [test "x${NS_FIXED}" = "x1"]) AM_CONDITIONAL(NS_FIXED, [test "x${NS_FIXED}" = "x1"])
COMMON_CFLAGS="-DWEBRTC_POSIX -DWEBRTC_LINUX -DNDEBUG -I\$(top_srcdir)" # FIXME: POSIX and LINUX should not be hard-coded
COMMON_CXXFLAGS="-std=c++11 -DWEBRTC_POSIX -DWEBRTC_LINUX -DNDEBUG -I\$(top_srcdir)" COMMON_CFLAGS="-DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DNDEBUG -I\$(top_srcdir)"
COMMON_CXXFLAGS="-std=c++11 -DWEBRTC_AUDIO_PROCESSING_ONLY_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DNDEBUG -I\$(top_srcdir)"
AC_SUBST([COMMON_CFLAGS]) AC_SUBST([COMMON_CFLAGS])
AC_SUBST([COMMON_CXXFLAGS]) AC_SUBST([COMMON_CXXFLAGS])

2
webrtc/common_audio/channel_buffer.h
View File

@ -16,7 +16,9 @@
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_audio/include/audio_util.h" #include "webrtc/common_audio/include/audio_util.h"
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
#include "webrtc/test/testsupport/gtest_prod_util.h" #include "webrtc/test/testsupport/gtest_prod_util.h"
#endif
namespace webrtc { namespace webrtc {

4
webrtc/common_audio/resampler/sinc_resampler.h
View File

@ -17,7 +17,9 @@
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/aligned_malloc.h" #include "webrtc/system_wrappers/interface/aligned_malloc.h"
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
#include "webrtc/test/testsupport/gtest_prod_util.h" #include "webrtc/test/testsupport/gtest_prod_util.h"
#endif
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -85,8 +87,10 @@ class SincResampler {
float* get_kernel_for_testing() { return kernel_storage_.get(); } float* get_kernel_for_testing() { return kernel_storage_.get(); }
private: private:
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, Convolve); FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, Convolve);
FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, ConvolveBenchmark); FRIEND_TEST_ALL_PREFIXES(SincResamplerTest, ConvolveBenchmark);
#endif
void InitializeKernel(); void InitializeKernel();
void UpdateRegions(bool second_load); void UpdateRegions(bool second_load);

2
webrtc/modules/audio_processing/intelligibility/intelligibility_enhancer.h
View File

@ -95,8 +95,10 @@ class IntelligibilityEnhancer {
AudioSource source_; AudioSource source_;
}; };
friend class TransformCallback; friend class TransformCallback;
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
FRIEND_TEST_ALL_PREFIXES(IntelligibilityEnhancerTest, TestErbCreation); FRIEND_TEST_ALL_PREFIXES(IntelligibilityEnhancerTest, TestErbCreation);
FRIEND_TEST_ALL_PREFIXES(IntelligibilityEnhancerTest, TestSolveForGains); FRIEND_TEST_ALL_PREFIXES(IntelligibilityEnhancerTest, TestSolveForGains);
#endif
// Sends streams to ProcessClearBlock or ProcessNoiseBlock based on source. // Sends streams to ProcessClearBlock or ProcessNoiseBlock based on source.
void DispatchAudio(AudioSource source, void DispatchAudio(AudioSource source,

4
webrtc/modules/audio_processing/transient/transient_suppressor.h
View File

@ -15,7 +15,9 @@
#include <set> #include <set>
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
#include "webrtc/test/testsupport/gtest_prod_util.h" #include "webrtc/test/testsupport/gtest_prod_util.h"
#endif
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -59,8 +61,10 @@ class TransientSuppressor {
bool key_pressed); bool key_pressed);
private: private:
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
FRIEND_TEST_ALL_PREFIXES(TransientSuppressorTest, FRIEND_TEST_ALL_PREFIXES(TransientSuppressorTest,
TypingDetectionLogicWorksAsExpectedForMono); TypingDetectionLogicWorksAsExpectedForMono);
#endif
void Suppress(float* in_ptr, float* spectral_mean, float* out_ptr); void Suppress(float* in_ptr, float* spectral_mean, float* out_ptr);
void UpdateKeypress(bool key_pressed); void UpdateKeypress(bool key_pressed);

6
webrtc/modules/interface/module_common_types.h
View File

@ -19,7 +19,9 @@
#include "webrtc/base/constructormagic.h" #include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
#include "webrtc/common_video/rotation.h" #include "webrtc/common_video/rotation.h"
#endif
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -233,6 +235,7 @@ enum RtpVideoCodecTypes {
kRtpVideoVp9, kRtpVideoVp9,
kRtpVideoH264 kRtpVideoH264
}; };
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
// Since RTPVideoHeader is used as a member of a union, it can't have a // Since RTPVideoHeader is used as a member of a union, it can't have a
// non-trivial default constructor. // non-trivial default constructor.
struct RTPVideoHeader { struct RTPVideoHeader {
@ -246,9 +249,12 @@ struct RTPVideoHeader {
RtpVideoCodecTypes codec; RtpVideoCodecTypes codec;
RTPVideoTypeHeader codecHeader; RTPVideoTypeHeader codecHeader;
}; };
#endif
union RTPTypeHeader { union RTPTypeHeader {
RTPAudioHeader Audio; RTPAudioHeader Audio;
#ifndef WEBRTC_AUDIO_PROCESSING_ONLY_BUILD
RTPVideoHeader Video; RTPVideoHeader Video;
#endif
}; };
struct WebRtcRTPHeader { struct WebRtcRTPHeader {