Merge "Always request fast track for recording"
diff --git a/src/android/CallbackProtector.cpp b/src/android/CallbackProtector.cpp
index 85eceac..7b9f107 100644
--- a/src/android/CallbackProtector.cpp
+++ b/src/android/CallbackProtector.cpp
@@ -27,9 +27,9 @@
mSafeToEnterCb(true),
mCbCount(0)
#ifdef USE_DEBUG
- , mCallbackThread(NULL),
+ , mCallbackThread((pthread_t) NULL),
mCallbackTid(0),
- mRequesterThread(NULL),
+ mRequesterThread((pthread_t) NULL),
mRequesterTid(0)
#endif
{
@@ -101,7 +101,7 @@
mCbExitedCondition.broadcast();
}
#ifdef USE_DEBUG
- mCallbackThread = NULL;
+ mCallbackThread = (pthread_t) NULL;
mCallbackTid = 0;
#endif
}
diff --git a/src/devices.c b/src/devices.c
index 920dd5e..9959360 100644
--- a/src/devices.c
+++ b/src/devices.c
@@ -89,7 +89,7 @@
static const SLLEDDescriptor SLLEDDescriptor_default = {
32, // ledCount
0, // primaryLED
- ~0 // colorMask
+ (SLuint32) ~0 // colorMask
};
const struct LED_id_descriptor LED_id_descriptors[] = {
@@ -169,7 +169,7 @@
sizeof(SamplingRates_A) / sizeof(SamplingRates_A[0]),
// numSampleRatesSupported
1, // minBitRate
- ~0, // maxBitRate
+ (SLuint32) ~0, // maxBitRate
SL_BOOLEAN_TRUE, // isBitrateRangeContinuous
NULL, // pBitratesSupported
0, // numBitratesSupported
diff --git a/tests/sandbox/Android.mk b/tests/sandbox/Android.mk
index dab840d..af4d750 100644
--- a/tests/sandbox/Android.mk
+++ b/tests/sandbox/Android.mk
@@ -75,7 +75,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -106,7 +107,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -163,7 +165,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -193,7 +196,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -224,7 +228,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -254,7 +259,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -284,7 +290,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -314,7 +321,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -348,7 +356,8 @@
LOCAL_STATIC_LIBRARIES := \
libOpenSLESUT \
- libsndfile
+ libsndfile \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -378,7 +387,8 @@
libOpenSLES
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -408,7 +418,8 @@
libOpenMAXAL
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -439,7 +450,8 @@
libOpenMAXAL
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
@@ -472,7 +484,8 @@
libandroid
LOCAL_STATIC_LIBRARIES := \
- libOpenSLESUT
+ libOpenSLESUT \
+ liblog
ifeq ($(TARGET_OS),linux)
LOCAL_CFLAGS += -DXP_UNIX
diff --git a/tests/sandbox/playbq.c b/tests/sandbox/playbq.c
index 9a33f4d..a6e7b46 100644
--- a/tests/sandbox/playbq.c
+++ b/tests/sandbox/playbq.c
@@ -373,7 +373,7 @@
// get the playback rate interface and configure the rate
SLPlaybackRateItf playerPlaybackRate;
- SLpermille currentRate;
+ SLpermille currentRate = 0;
if (enablePlaybackRate) {
result = (*playerObject)->GetInterface(playerObject, SL_IID_PLAYBACKRATE,
&playerPlaybackRate);
