diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-23 10:54:35 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-09-03 15:11:39 -0700 |
| commit | a07a1c2c91dc7ee6ded319262499f20cd01edcf7 (patch) | |
| tree | 2d7b01150635952af8d8d9e4f1a0d0d48ccfa874 /media | |
| parent | 943ba3cca8df0da24db38e97e43aaacb5b788a21 (diff) | |
| download | frameworks_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')
| -rw-r--r-- | media/libmedia/Android.mk | 1 | ||||
| -rw-r--r-- | media/libmedia/SingleStateQueueInstantiations.cpp | 2 | ||||
| -rw-r--r-- | media/libnbaio/Android.mk | 5 | ||||
| -rw-r--r-- | media/libnbaio/MonoPipe.cpp | 5 |
4 files changed, 11 insertions, 2 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 96755bb..56e7787 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -62,6 +62,7 @@ LOCAL_SRC_FILES += ../libnbaio/roundup.c LOCAL_CFLAGS += -DANDROID_SMP=$(if $(findstring true,$(TARGET_CPU_SMP)),1,0) LOCAL_SRC_FILES += SingleStateQueue.cpp LOCAL_CFLAGS += -DSINGLE_STATE_QUEUE_INSTANTIATIONS='"SingleStateQueueInstantiations.cpp"' +# Consider a separate a library for SingleStateQueueInstantiations. LOCAL_SHARED_LIBRARIES := \ libui liblog libcutils libutils libbinder libsonivox libicuuc libexpat \ diff --git a/media/libmedia/SingleStateQueueInstantiations.cpp b/media/libmedia/SingleStateQueueInstantiations.cpp index 2afebe9..0265c8c 100644 --- a/media/libmedia/SingleStateQueueInstantiations.cpp +++ b/media/libmedia/SingleStateQueueInstantiations.cpp @@ -16,11 +16,13 @@ #include <media/SingleStateQueue.h> #include <private/media/StaticAudioTrackState.h> +#include <media/AudioTimestamp.h> // FIXME hack for gcc namespace android { template class SingleStateQueue<StaticAudioTrackState>; // typedef StaticAudioTrackSingleStateQueue +template class SingleStateQueue<AudioTimestamp>; // typedef AudioTimestampSingleStateQueue } 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; |