diff options
| author | Andy Hung <hunga@google.com> | 2014-12-03 11:47:36 -0800 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-12-03 16:13:50 -0800 |
| commit | 202bce11a7f66f27e6dbb6d154ddc123aa62513d (patch) | |
| tree | 390b83dacc286717243ba6e3c1173c9e2f01b376 /media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h | |
| parent | 9a1c8892f6835325db6931529dc74bf98cf0aee8 (diff) | |
| download | frameworks_av-202bce11a7f66f27e6dbb6d154ddc123aa62513d.zip frameworks_av-202bce11a7f66f27e6dbb6d154ddc123aa62513d.tar.gz frameworks_av-202bce11a7f66f27e6dbb6d154ddc123aa62513d.tar.bz2 | |
Fix NuPlayer assertion on failure to create AudioTrack
Under heavy media load or monkey/stress testing, more than
32 AudioTracks may be created or memory resources may be scarce.
Remove the assertion on failure to create AudioTrack
and signal MEDIA_ERROR.
Bug: 17319843
Change-Id: I5d4e200b5f50d800046851a33e035cdc6ff10075
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h index 5feb6a1..6732ff4 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.h @@ -29,7 +29,7 @@ struct MediaCodec; struct MediaBuffer; struct NuPlayer::DecoderBase : public AHandler { - DecoderBase(); + DecoderBase(const sp<AMessage> ¬ify); void configure(const sp<AMessage> &format); void init(); @@ -71,6 +71,10 @@ protected: void onRequestInputBuffers(); void scheduleRequestBuffers(); virtual void doRequestBuffers() = 0; + virtual void handleError(int32_t err); + + sp<AMessage> mNotify; + int32_t mBufferGeneration; private: enum { |