diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-10-07 09:27:06 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-10-07 09:31:15 -0700 |
| commit | 35295078ab59c8c5d143a54d5a55557c3ca62c51 (patch) | |
| tree | ebe936c19f0de4024fa1982fcd286a803bc3b951 /media | |
| parent | 61f58c0c8d02970ea6d94ff816c54bf606f755b7 (diff) | |
| parent | 9a7d11f07dc19327892915f0bfecce758d2f4098 (diff) | |
| download | frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.zip frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.tar.gz frameworks_av-35295078ab59c8c5d143a54d5a55557c3ca62c51.tar.bz2 | |
resolved conflicts for merge of 9a7d11f0 to master
Change-Id: Ie4d101185a93d37ec280f608813ad62a077a584e
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 9 | ||||
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index c5a7777..666fafa 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -474,7 +474,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) ALOGE_IF(originalSessionId != 0 && mSessionId != originalSessionId, "session ID changed from %d to %d", originalSessionId, mSessionId); - if (record == 0) { + if (record == 0 || status != NO_ERROR) { ALOGE("AudioFlinger could not create record track, status: %d", status); AudioSystem::releaseInput(input); return status; @@ -484,6 +484,11 @@ status_t AudioRecord::openRecord_l(size_t epoch) ALOGE("Could not get control block"); return NO_INIT; } + void *iMemPointer = iMem->pointer(); + if (iMemPointer == NULL) { + ALOGE("Could not get control block pointer"); + return NO_INIT; + } if (mAudioRecord != 0) { mAudioRecord->asBinder()->unlinkToDeath(mDeathNotifier, this); mDeathNotifier.clear(); @@ -491,7 +496,7 @@ status_t AudioRecord::openRecord_l(size_t epoch) mInput = input; mAudioRecord = record; mCblkMemory = iMem; - audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMem->pointer()); + audio_track_cblk_t* cblk = static_cast<audio_track_cblk_t*>(iMemPointer); mCblk = cblk; // FIXME missing fast track frameCount logic mAwaitBoost = false; diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index 5d81e5d..f9f6779 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -184,6 +184,17 @@ public: } lStatus = reply.readInt32(); record = interface_cast<IAudioRecord>(reply.readStrongBinder()); + if (lStatus == NO_ERROR) { + if (record == 0) { + ALOGE("openRecord should have returned an IAudioRecord"); + lStatus = UNKNOWN_ERROR; + } + } else { + if (record != 0) { + ALOGE("openRecord returned an IAudioRecord but with status %d", lStatus); + record.clear(); + } + } } if (status != NULL) { *status = lStatus; @@ -802,6 +813,7 @@ status_t BnAudioFlinger::onTransact( status_t status; sp<IAudioRecord> record = openRecord(input, sampleRate, format, channelMask, frameCount, &flags, tid, &sessionId, &status); + LOG_ALWAYS_FATAL_IF((record != 0) != (status == NO_ERROR)); reply->writeInt32(flags); reply->writeInt32(sessionId); reply->writeInt32(status); |