commit 694816d7291f17364502ac5d3319684a0b180860
author Shyam Pallapothu <shyamp@google.com> Thu Apr 21 09:48:41 2011 -0700
committer Shyam Pallapothu <shyamp@google.com> Thu Apr 21 09:48:41 2011 -0700
tree 21a35b57a0eb154a49999407f466b5fa148d224b
parent 32ed3f4dad00f8a65f7e6b38402c70d5341c57eb

Fix for issue 4133431 "Remove OSAL layer" in engine part

Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index 2fbb573..a83e7b6 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -496,7 +496,7 @@
 
                         LOGV("mix with background malloc to do len %d", len);
 
-                        bgFrame.m_dataAddress = (M4OSA_UInt16*)M4OSA_malloc( len, 1,
+                        bgFrame.m_dataAddress = (M4OSA_UInt16*)M4OSA_32bitAlignedMalloc( len, 1,
                                                        (M4OSA_Char*)"bgFrame");
                         if (NULL == bgFrame.m_dataAddress) {
                             LOGE("mBackgroundAudioSetting Malloc failed");
@@ -504,7 +504,7 @@
 
                         bgFrame.m_bufferSize = len;
 
-                        mixFrame.m_dataAddress = (M4OSA_UInt16*)M4OSA_malloc(len, 1,
+                        mixFrame.m_dataAddress = (M4OSA_UInt16*)M4OSA_32bitAlignedMalloc(len, 1,
                                                     (M4OSA_Char*)"mixFrame");
                         if (NULL == mixFrame.m_dataAddress) {
                             LOGE("mBackgroundAudioSetting Malloc failed");
@@ -602,10 +602,10 @@
                             }
                         }
                         if (bgFrame.m_dataAddress) {
-                            M4OSA_free((M4OSA_MemAddr32)bgFrame.m_dataAddress);
+                            free(bgFrame.m_dataAddress);
                         }
                         if (mixFrame.m_dataAddress) {
-                            M4OSA_free((M4OSA_MemAddr32)mixFrame.m_dataAddress);
+                            free(mixFrame.m_dataAddress);
                         }
                     } else {
                         // No mixing;