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

Commit eab39fb9 authored by Dheeraj Sharma's avatar Dheeraj Sharma
Browse files

Merging on top of new sync

VideoEditor:Fix for issue 3378727

Change-Id: Iff7d13689b436cda2b2073625a786322945b3edc
parent 78554cc3
Loading
Loading
Loading
Loading
+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;
+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 ");