summaryrefslogtreecommitdiffstats
path: root/media/libnbaio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-23 10:54:35 -0700
committerGlenn Kasten <gkasten@google.com>2013-09-03 15:11:39 -0700
commita07a1c2c91dc7ee6ded319262499f20cd01edcf7 (patch)
tree2d7b01150635952af8d8d9e4f1a0d0d48ccfa874 /media/libnbaio
parent943ba3cca8df0da24db38e97e43aaacb5b788a21 (diff)
downloadframeworks_av-a07a1c2c91dc7ee6ded319262499f20cd01edcf7.zip
frameworks_av-a07a1c2c91dc7ee6ded319262499f20cd01edcf7.tar.gz
frameworks_av-a07a1c2c91dc7ee6ded319262499f20cd01edcf7.tar.bz2
Instantiate SingleStateQueue<AudioTimestamp>
as typedef AudioTimestampSingleStateQueue and use it in MonoPipe. Change-Id: Idaebb362bd9d0a81a7ed83792ab9369dc37c0e74
Diffstat (limited to 'media/libnbaio')
-rw-r--r--media/libnbaio/Android.mk5
-rw-r--r--media/libnbaio/MonoPipe.cpp5
2 files changed, 8 insertions, 2 deletions
diff --git a/media/libnbaio/Android.mk b/media/libnbaio/Android.mk
index 5d00d15..69c75b8 100644
--- a/media/libnbaio/Android.mk
+++ b/media/libnbaio/Android.mk
@@ -31,6 +31,9 @@ LOCAL_SHARED_LIBRARIES := \
libcommon_time_client \
libcutils \
libutils \
- liblog
+ liblog \
+ libmedia
+# This dependency on libmedia is for SingleStateQueueInstantiations.
+# Consider a separate a library for SingleStateQueueInstantiations.
include $(BUILD_SHARED_LIBRARY)
diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp
index a74b49e..b55be83 100644
--- a/media/libnbaio/MonoPipe.cpp
+++ b/media/libnbaio/MonoPipe.cpp
@@ -42,7 +42,10 @@ MonoPipe::MonoPipe(size_t reqFrames, NBAIO_Format format, bool writeCanBlock) :
// mWriteTs
mSetpoint((reqFrames * 11) / 16),
mWriteCanBlock(writeCanBlock),
- mIsShutdown(false)
+ mIsShutdown(false),
+ // mTimestampShared
+ mTimestampMutator(&mTimestampShared),
+ mTimestampObserver(&mTimestampShared)
{
CCHelper tmpHelper;
status_t res;