diff options
| author | Eric Laurent <elaurent@google.com> | 2015-10-14 01:12:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-14 01:12:56 +0000 |
| commit | 2894d70256d3f53547807a5aacaf45df62342fb5 (patch) | |
| tree | 58c479c9e8e615602457d8ddb4e68c449ba58c00 /media | |
| parent | 8fa0848cd47882d6df0c584b276515f98b768eca (diff) | |
| parent | 216f0177cbfa0d8e911d64fc17ccbb5100ad87b4 (diff) | |
| download | frameworks_av-2894d70256d3f53547807a5aacaf45df62342fb5.zip frameworks_av-2894d70256d3f53547807a5aacaf45df62342fb5.tar.gz frameworks_av-2894d70256d3f53547807a5aacaf45df62342fb5.tar.bz2 | |
Merge "NuPlayerDecoder: report error in case of audio sink open error." into mnc-dr-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 3646828..c005f3f 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -635,8 +635,11 @@ void NuPlayer::Decoder::handleOutputFormatChange(const sp<AMessage> &format) { flags = AUDIO_OUTPUT_FLAG_NONE; } - mRenderer->openAudioSink( + status_t err = mRenderer->openAudioSink( format, false /* offloadOnly */, hasVideo, flags, NULL /* isOffloaed */); + if (err != OK) { + handleError(err); + } } } |