Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f3d387e authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge "X86 target fixes"

parents 9e4c36a0 eb5b2652

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

libvideoeditor/lvpp/VideoEditorSRC.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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();

libvideoeditor/lvpp/VideoEditorSRC.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 * limitations under the License.

 */



#include <stdint.h>



#include <utils/RefBase.h>

#include <media/stagefright/MediaErrors.h>