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

Commit ae27549f authored by Santosh Madhava's avatar Santosh Madhava Committed by Android Git Automerger
Browse files

am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets... 

am c4132eb2: am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb

* commit 'c4132eb2':
  Review rework for issue 3385068 : Play gets out of sync
parents 3cf1554b c4132eb2

media/java/android/media/videoeditor/MediaArtistNativeHelper.java

+12 −17
Original line number Original line Diff line number Diff line
@@ -2867,11 +2867,8 @@ class MediaArtistNativeHelper { 
            mClipProperties.clipProperties = new Properties[mTotalClips];

            mClipProperties.clipProperties = new Properties[mTotalClips];





            /** record the call back progress listner */

            /** record the call back progress listner */

            if (listener != null)

            {

            mMediaProcessingProgressListener = listener;

            mMediaProcessingProgressListener = listener;

            mProgressToApp = 0;

            mProgressToApp = 0;

            }





            if (mediaItemsList.size() > 0) {

            if (mediaItemsList.size() > 0) {

                for (int i = 0; i < mediaItemsList.size(); i++) {

                for (int i = 0; i < mediaItemsList.size(); i++) {
@@ -3022,9 +3019,8 @@ class MediaArtistNativeHelper { 
    public void doPreview(Surface surface, long fromMs, long toMs, boolean loop,

    public void doPreview(Surface surface, long fromMs, long toMs, boolean loop,

            int callbackAfterFrameCount, PreviewProgressListener listener) {

            int callbackAfterFrameCount, PreviewProgressListener listener) {

        mPreviewProgress = fromMs;

        mPreviewProgress = fromMs;

        if (listener != null) {

        mPreviewProgressListener = listener;

        mPreviewProgressListener = listener;

        }



        if (!mInvalidatePreviewArray) {

        if (!mInvalidatePreviewArray) {

            try {

            try {

                /** Modify the image files names to rgb image files. */

                /** Modify the image files names to rgb image files. */
@@ -3555,9 +3551,9 @@ class MediaArtistNativeHelper { 
        int outBitrate = 0;

        int outBitrate = 0;

        mExportFilename = filePath;

        mExportFilename = filePath;

        previewStoryBoard(mediaItemsList, mediaTransitionList, mediaBGMList,null);

        previewStoryBoard(mediaItemsList, mediaTransitionList, mediaBGMList,null);

        if (listener != null) {



        mExportProgressListener = listener;

        mExportProgressListener = listener;

        }



        mProgressToApp = 0;

        mProgressToApp = 0;





        switch (bitrate) {

        switch (bitrate) {
@@ -3682,9 +3678,9 @@ class MediaArtistNativeHelper { 
        int outBitrate = 0;

        int outBitrate = 0;

        mExportFilename = filePath;

        mExportFilename = filePath;

        previewStoryBoard(mediaItemsList, mediaTransitionList, mediaBGMList,null);

        previewStoryBoard(mediaItemsList, mediaTransitionList, mediaBGMList,null);

        if (listener != null) {



        mExportProgressListener = listener;

        mExportProgressListener = listener;

        }



        mProgressToApp = 0;

        mProgressToApp = 0;





        switch (bitrate) {

        switch (bitrate) {
@@ -3977,9 +3973,8 @@ class MediaArtistNativeHelper { 
            ExtractAudioWaveformProgressListener listener, boolean isVideo) {

            ExtractAudioWaveformProgressListener listener, boolean isVideo) {

        String tempPCMFileName;

        String tempPCMFileName;





        if (listener != null) {

        mExtractAudioWaveformProgressListener = listener;

        mExtractAudioWaveformProgressListener = listener;

        }



        /**

        /**

         * in case of Video , first call will generate the PCM file to make the

         * in case of Video , first call will generate the PCM file to make the

         * audio graph

         * audio graph