summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-09-03 16:11:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-03 16:11:22 -0700
commitfe582a379aa775b34b6aba387eea046b6c4632f1 (patch)
treed523a98bcba494354d6101ec37f1a3320f04b760 /include/media
parenta7fef85e7d419a4f5d6a3144f9ba70ceff2f122a (diff)
parent1a3a8078462e52b450dbad7443abaca1ca9cbfb8 (diff)
downloadframeworks_av-fe582a379aa775b34b6aba387eea046b6c4632f1.zip
frameworks_av-fe582a379aa775b34b6aba387eea046b6c4632f1.tar.gz
frameworks_av-fe582a379aa775b34b6aba387eea046b6c4632f1.tar.bz2
am 1a3a8078: am a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>
* commit '1a3a8078462e52b450dbad7443abaca1ca9cbfb8': Instantiate SingleStateQueue<AudioTimestamp>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/nbaio/MonoPipe.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/media/nbaio/MonoPipe.h b/include/media/nbaio/MonoPipe.h
index ffdcc21..d3802fe 100644
--- a/include/media/nbaio/MonoPipe.h
+++ b/include/media/nbaio/MonoPipe.h
@@ -20,9 +20,12 @@
#include <time.h>
#include <utils/LinearTransform.h>
#include "NBAIO.h"
+#include <media/SingleStateQueue.h>
namespace android {
+typedef SingleStateQueue<AudioTimestamp> AudioTimestampSingleStateQueue;
+
// MonoPipe is similar to Pipe except:
// - supports only a single reader, called MonoPipeReader
// - write() cannot overrun; instead it will return a short actual count if insufficient space
@@ -130,6 +133,10 @@ private:
LinearTransform mSamplesToLocalTime;
bool mIsShutdown; // whether shutdown(true) was called, no barriers are needed
+
+ AudioTimestampSingleStateQueue::Shared mTimestampShared;
+ AudioTimestampSingleStateQueue::Mutator mTimestampMutator;
+ AudioTimestampSingleStateQueue::Observer mTimestampObserver;
};
} // namespace android