Merge "X86 target fixes"

3 files changed, 7 insertions, 3 deletions

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index ed9de6e..1ac741c 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -403,8 +403,8 @@ size_t VideoEditorAudioPlayer::fillBuffer(void *data, size_t size) {
                         M4OSA_Context fp = M4OSA_NULL;
 
                         uiPCMsize = (mInputBuffer->range_length())/2;
-                        pPTMdata = (M4OSA_Int16*)(mInputBuffer->data() +
-                        mInputBuffer->range_offset());
+                        pPTMdata = (M4OSA_Int16*) ((uint8_t*) mInputBuffer->data()
+                                + mInputBuffer->range_offset());
 
                         LOGV("mix with background malloc to do len %d", len);
 
diff --git a/libvideoeditor/lvpp/VideoEditorSRC.cpp b/libvideoeditor/lvpp/VideoEditorSRC.cpp
index 091bdfb..20c0fe5 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.cpp
+++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp
@@ -325,7 +325,9 @@ status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer) {
         }

         else {

             //copy the buffer

-            memcpy((uint8_t*) (pInterframeBuffer + mInterframeBufferPosition), (uint8_t*) (aBuffer->data() + aBuffer->range_offset()), aBuffer->range_length());

+            memcpy(((uint8_t*) pInterframeBuffer) + mInterframeBufferPosition,

+                    ((uint8_t*) aBuffer->data()) + aBuffer->range_offset(),

+                    aBuffer->range_length());

             LOGV("Read from buffer  %d", aBuffer->range_length());

 

             mInterframeBufferPosition += aBuffer->range_length();

diff --git a/libvideoeditor/lvpp/VideoEditorSRC.h b/libvideoeditor/lvpp/VideoEditorSRC.h
index 3c557a4..eeb1dcc 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.h
+++ b/libvideoeditor/lvpp/VideoEditorSRC.h
@@ -15,6 +15,8 @@
  * limitations under the License.

  */

 

+#include <stdint.h>

+

 #include <utils/RefBase.h>

 #include <media/stagefright/MediaErrors.h>