diff options
| author | Vasantha Balla <vballa@codeaurora.org> | 2015-12-22 17:07:21 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-01-18 23:52:20 -0800 |
| commit | 427887bc50ea2d9297f2710843a7c9b5c508f0fd (patch) | |
| tree | 219cfc5756cf2226e15acf354ad0e84b458ddf01 /media/libstagefright/MediaCodec.cpp | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-427887bc50ea2d9297f2710843a7c9b5c508f0fd.zip frameworks_av-427887bc50ea2d9297f2710843a7c9b5c508f0fd.tar.gz frameworks_av-427887bc50ea2d9297f2710843a7c9b5c508f0fd.tar.bz2 | |
libstagefright:Fix random memcmp crash while accessing output format.
Random memcmp crash happens while checking for image-data in
output format of audio buffer.Audio output format gets updated with
pcm-format flag after codec formatchange in ExtendedNuUtils.
Simultaneous memory check happens for image-data in FBD of MediaCodec.
So crash happens.
Avoid checking for image-data and crop information for audio buffers.
Change-Id: I85ffcb149dc67a0f1bdb26116245627b1843d932
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 54c57ee..5e0ee55 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -2575,7 +2575,7 @@ ssize_t MediaCodec::dequeuePortBuffer(int32_t portIndex) { info->mOwnedByClient = true; // set image-data - if (info->mFormat != NULL) { + if (info->mFormat != NULL && mIsVideo) { sp<ABuffer> imageData; if (info->mFormat->findBuffer("image-data", &imageData)) { info->mData->meta()->setBuffer("image-data", imageData); |