diff options
| author | Chong Zhang <chz@google.com> | 2015-03-12 20:32:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-12 20:32:40 +0000 |
| commit | 3cb7e0dcc2e915280cb9a5121def8b5277d8a6e6 (patch) | |
| tree | 281f392a8018d7398667b3cf390ce25438bb93e6 /media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h | |
| parent | 5c9054bc6efc080b265e028f2ebb1abd2a2e3953 (diff) | |
| parent | 66704af4d82c2b6303609b29402641f861fdcb19 (diff) | |
| download | frameworks_av-3cb7e0dcc2e915280cb9a5121def8b5277d8a6e6.zip frameworks_av-3cb7e0dcc2e915280cb9a5121def8b5277d8a6e6.tar.gz frameworks_av-3cb7e0dcc2e915280cb9a5121def8b5277d8a6e6.tar.bz2 | |
Merge "NuPlayer: play out pending frames on discontinuity"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h index a6e1faf..173cfbd 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h @@ -43,7 +43,7 @@ protected: virtual void onSetRenderer(const sp<Renderer> &renderer); virtual void onGetInputBuffers(Vector<sp<ABuffer> > *dstBuffers); virtual void onResume(bool notifyComplete); - virtual void onFlush(bool notifyComplete); + virtual void onFlush(); virtual void onShutdown(bool notifyComplete); virtual void doRequestBuffers(); @@ -77,6 +77,7 @@ private: status_t dequeueAccessUnit(sp<ABuffer> *accessUnit); sp<ABuffer> aggregateBuffer(const sp<ABuffer> &accessUnit); status_t fetchInputData(sp<AMessage> &reply); + void doFlush(bool notifyComplete); void onInputBufferFetched(const sp<AMessage> &msg); void onBufferConsumed(int32_t size); |