fix audio buffer overflow while playing streamed contents

christiantroy · Jun 21, 2012 · 5e1fa21 · 5e1fa21
1 parent e0a86aa
commit 5e1fa21
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
@@ -1817,8 +1817,12 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) {
                              mCodec->mComponentName.c_str());
                     }
 
-                    CHECK_LE(buffer->size(), info->mData->capacity());
-                    memcpy(info->mData->data(), buffer->data(), buffer->size());
+                    //CHECK_LE(buffer->size(), info->mData->capacity());
+                    //memcpy(info->mData->data(), buffer->data(), buffer->size());
+                    if (buffer->size() > info->mData->capacity())
+		      memcpy(info->mData->data(), buffer->data(), info->mData->capacity());
+		    else
+		      memcpy(info->mData->data(), buffer->data(), buffer->size());
                 }
 
                 if (flags & OMX_BUFFERFLAG_CODECCONFIG) {