diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:45:35 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:45:35 -0800 |
| commit | 697a7ab8c538ca84a92b605e50824da1cbf9b466 (patch) | |
| tree | fe32b5c0b8e0fa115cd6358c5428b8a48e285dec /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | |
| parent | 7f8512331f105565054202486fa0a6094ad693c1 (diff) | |
| parent | 5dc9ffe50ef517591b8ffad66c7e4d6ec82b8b4b (diff) | |
| download | frameworks_av-697a7ab8c538ca84a92b605e50824da1cbf9b466.zip frameworks_av-697a7ab8c538ca84a92b605e50824da1cbf9b466.tar.gz frameworks_av-697a7ab8c538ca84a92b605e50824da1cbf9b466.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/av into cm-13.0
Android 6.0.1 release 3
Change-Id: I2f2a1fe1b58c828e8341556996211562d6e195ab
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
| -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 1710076..d23a9e2 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -674,8 +674,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 */, mSource->isStreaming()); + if (err != OK) { + handleError(err); + } } } |