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/NuPlayerRenderer.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/NuPlayerRenderer.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h index 14ae924..406c64c 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h @@ -73,11 +73,12 @@ struct NuPlayer::Renderer : public AHandler { int64_t getVideoLateByUs(); void setPauseStartedTimeRealUs(int64_t realUs); - bool openAudioSink( + status_t openAudioSink( const sp<AMessage> &format, bool offloadOnly, bool hasVideo, - uint32_t flags); + uint32_t flags, + bool *isOffloaded); void closeAudioSink(); enum { @@ -209,7 +210,7 @@ private: void onResume(); void onSetVideoFrameRate(float fps); void onAudioOffloadTearDown(AudioOffloadTearDownReason reason); - bool onOpenAudioSink( + status_t onOpenAudioSink( const sp<AMessage> &format, bool offloadOnly, bool hasVideo, |