diff options
| author | Danny Fernandes <dannyfernandes@google.com> | 2011-02-14 11:10:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-14 11:10:29 -0800 |
| commit | 10622437ecb8270ecaae43005ec9f141efd5c7ef (patch) | |
| tree | 5d9ac47f5ec4f56fb34e31f34d369ffadd650814 | |
| parent | a14f40684961771d656ff88cce7c2b758511e92f (diff) | |
| parent | 2fffed1d281c5d9df2d5b830dca92034271362a2 (diff) | |
| download | frameworks_av-10622437ecb8270ecaae43005ec9f141efd5c7ef.zip frameworks_av-10622437ecb8270ecaae43005ec9f141efd5c7ef.tar.gz frameworks_av-10622437ecb8270ecaae43005ec9f141efd5c7ef.tar.bz2 | |
Merge "Fix for 3431967 Memory leak in SF shells"
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c | 8 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c index 9f50a58..e4de140 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c @@ -208,7 +208,7 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_initPoolBuffers(VIDEOEDITOR_BUFFER_Pool* pool, /** * Initialize all the buffers in the pool */ - for(index = 0; index< pool->NB; index++) + for(index = 0; index < pool->NB; index++) { pool->pNXPBuffer[index].pData = M4OSA_NULL; pool->pNXPBuffer[index].pData = (M4OSA_Void*)M4OSA_malloc( @@ -218,10 +218,10 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_initPoolBuffers(VIDEOEDITOR_BUFFER_Pool* pool, { for (j = 0; j < index; j++) { - if(M4OSA_NULL != pool->pNXPBuffer[index].pData) + if(M4OSA_NULL != pool->pNXPBuffer[j].pData) { - M4OSA_free((M4OSA_MemAddr32)pool->pNXPBuffer[index].pData); - pool->pNXPBuffer[index].pData = M4OSA_NULL; + M4OSA_free((M4OSA_MemAddr32)pool->pNXPBuffer[j].pData); + pool->pNXPBuffer[j].pData = M4OSA_NULL; } } err = M4ERR_ALLOC; diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp index a8b9c0c..5f6b90c 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp @@ -745,9 +745,9 @@ M4OSA_ERR VideoEditorVideoDecoder_configureFromMetadata(M4OSA_Context pContext, cropRight = vWidth - 1; cropBottom = vHeight - 1; - LOGI("got dimensions only %d x %d", width, height); + LOGV("got dimensions only %d x %d", width, height); } else { - LOGI("got crop rect %d, %d, %d, %d", + LOGV("got crop rect %d, %d, %d, %d", cropLeft, cropTop, cropRight, cropBottom); } |