diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-05-18 13:13:24 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2015-05-18 14:37:52 -0700 |
| commit | 3e98ecd18c906dc3ac2ff1a890f0b3163447272d (patch) | |
| tree | 8c9227dcf79cd1d87d69d6c1ab4c66d440d3207c | |
| parent | 4a95e69406aa2e9896d865962d6d947ebbdac6fc (diff) | |
| download | frameworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.zip frameworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.tar.gz frameworks_av-3e98ecd18c906dc3ac2ff1a890f0b3163447272d.tar.bz2 | |
Clear mAudioRecord and mAudioTrack on set() failure
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
| -rw-r--r-- | media/libmedia/JetPlayer.cpp | 8 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/AudioSource.cpp | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp index 271be0c..34deb59 100644 --- a/media/libmedia/JetPlayer.cpp +++ b/media/libmedia/JetPlayer.cpp @@ -85,12 +85,18 @@ int JetPlayer::init() // create the output AudioTrack mAudioTrack = new AudioTrack(); - mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parameterize this + status_t status = mAudioTrack->set(AUDIO_STREAM_MUSIC, //TODO parameterize this pLibConfig->sampleRate, AUDIO_FORMAT_PCM_16_BIT, audio_channel_out_mask_from_count(pLibConfig->numChannels), (size_t) mTrackBufferSize, AUDIO_OUTPUT_FLAG_NONE); + if (status != OK) { + ALOGE("JetPlayer::init(): Error initializing JET library; AudioTrack error %d", status); + mAudioTrack.clear(); + mState = EAS_STATE_ERROR; + return EAS_FAILURE; + } // create render and playback thread { diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 891a9e9..efbc0d6 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1628,6 +1628,7 @@ status_t MediaPlayerService::AudioOutput::open( if ((t == 0) || (t->initCheck() != NO_ERROR)) { ALOGE("Unable to create audio track"); delete newcbd; + // t goes out of scope, so reference count drops to zero return NO_INIT; } else { // successful AudioTrack initialization implies a legacy stream type was generated diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index e5a6a9b..34f0148 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -85,6 +85,9 @@ AudioSource::AudioSource( this, frameCount /*notificationFrames*/); mInitCheck = mRecord->initCheck(); + if (mInitCheck != OK) { + mRecord.clear(); + } } else { mInitCheck = status; } |