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

Commit b2a6582c authored by Dheeraj Sharma's avatar Dheeraj Sharma Committed by Android Git Automerger
Browse files

am c46e0e43: Merging on top of new sync 

* commit 'c46e0e43762debf25e2c10953a0f420850891531':
  Merging on top of new sync
parents ce149967 eab39fb9

libvideoeditor/lvpp/VideoEditorPreviewController.cpp

+5 −0
Original line number Diff line number Diff line
@@ -123,6 +123,11 @@ VideoEditorPreviewController::~VideoEditorPreviewController() { 
        mEffectsSettings = NULL;

    }



    if (mAudioMixPCMFileHandle) {

        err = M4OSA_fileReadClose (mAudioMixPCMFileHandle);

        mAudioMixPCMFileHandle = M4OSA_NULL;

    }



    if(mTarget != NULL) {

        delete mTarget;

        mTarget = NULL;

libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ M4OSA_ERR VideoEditorMp3Reader_open(M4OSA_Context context, 


    LOGV("VideoEditorMp3Reader_open Datasource start %s",

        (char*)pFileDescriptor);

    pReaderContext->mDataSource = DataSource::CreateFromURI(

        (char*)pFileDescriptor);

    pReaderContext->mDataSource = new FileSource ((char*)pFileDescriptor);

    LOGV("VideoEditorMp3Reader_open Datasource end");



    if (pReaderContext->mDataSource == NULL) {
@@ -230,6 +229,7 @@ M4OSA_ERR VideoEditorMp3Reader_close(M4OSA_Context context) { 


    pReaderContext->mMediaSource->stop();

    pReaderContext->mMediaSource.clear();

    pReaderContext->mExtractor.clear();

    pReaderContext->mDataSource.clear();



    LOGV("VideoEditorMp3Reader_close end ");