diff options
| author | Wei Jia <wjia@google.com> | 2015-04-30 21:14:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 21:14:54 +0000 |
| commit | 457e82586d51c6d360ce4feb4c1dff1a31dcb8d3 (patch) | |
| tree | 6b64f269ba9d971077ab26c3112d5e90a80f2fb7 /include | |
| parent | dc0ac804721efff054ec9720d53e93ecca86cf5e (diff) | |
| parent | bac588208fadec78e3fa205c238089df277d3817 (diff) | |
| download | frameworks_av-457e82586d51c6d360ce4feb4c1dff1a31dcb8d3.zip frameworks_av-457e82586d51c6d360ce4feb4c1dff1a31dcb8d3.tar.gz frameworks_av-457e82586d51c6d360ce4feb4c1dff1a31dcb8d3.tar.bz2 | |
Merge "MediaSync: map returned output buffers to previously received input buffers." into mnc-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaSync.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaSync.h b/include/media/stagefright/MediaSync.h index 8ad74a4..e071b65 100644 --- a/include/media/stagefright/MediaSync.h +++ b/include/media/stagefright/MediaSync.h @@ -23,6 +23,7 @@ #include <media/stagefright/foundation/AHandler.h> #include <utils/Condition.h> +#include <utils/KeyedVector.h> #include <utils/Mutex.h> namespace android { @@ -190,6 +191,13 @@ private: int64_t mNextBufferItemMediaUs; List<BufferItem> mBufferItems; + + // Keep track of buffers received from |mInput|. This is needed because + // it's possible the consumer of |mOutput| could return a different + // GraphicBuffer::handle (e.g., due to passing buffers through IPC), + // and that could cause problem if the producer of |mInput| only + // supports pre-registered buffers. + KeyedVector<uint64_t, sp<GraphicBuffer> > mBuffersFromInput; sp<ALooper> mLooper; float mPlaybackRate; |