tequilaOS/platform_hardware_libhardware
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "bug 7253033 Add "exiting" state to remote audio submix module" into jb-mr1-dev

Browse source
This commit is contained in:
Jean-Michel Trivi 2012-09-30 11:56:23 -07:00 committed by Android (Google) Code Review
commit 4d7640ae51
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/audio_remote_submix/Android.mk
View file

@ -24,6 +24,7 @@ LOCAL_C_INCLUDES += \
frameworks/av/include/ \
frameworks/native/include/
LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libnbaio
LOCAL_STATIC_LIBRARIES := libmedia_helper
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)

31
modules/audio_remote_submix/audio_hw.cpp
View file

@ -31,12 +31,13 @@
#include <system/audio.h>
#include <hardware/audio.h>
//#include <media/nbaio/Pipe.h>
//#include <media/nbaio/PipeReader.h>
#include <media/nbaio/MonoPipe.h>
#include <media/nbaio/MonoPipeReader.h>
#include <media/AudioBufferProvider.h>
#include <utils/String8.h>
#include <media/AudioParameter.h>
extern "C" {
namespace android {
@ -175,6 +176,32 @@ static int out_dump(const struct audio_stream *stream, int fd)
static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
{
int exiting = -1;
AudioParameter parms = AudioParameter(String8(kvpairs));
// FIXME this is using hard-coded strings but in the future, this functionality will be
// converted to use audio HAL extensions required to support tunneling
if ((parms.getInt(String8("exiting"), exiting) == NO_ERROR) && (exiting > 0)) {
const struct submix_stream_out *out =
reinterpret_cast<const struct submix_stream_out *>(stream);
pthread_mutex_lock(&out->dev->lock);
MonoPipe* sink = out->dev->rsxSink.get();
if (sink != NULL) {
sink->incStrong(out);
} else {
pthread_mutex_unlock(&out->dev->lock);
return 0;
}
ALOGI("shutdown");
sink->shutdown(true);
sink->decStrong(out);
pthread_mutex_unlock(&out->dev->lock);
}
return 0;
}