summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santosh Madhava <smadhava@google.com> 2011-01-20 23:44:29 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-20 23:44:29 -0800
commitff23e4d7f872df4d5880e69cc3742fc08d66f00b (patch)
tree1e1de3b81179d4fa26bcd3e652d6ba5483f134a6
parent95788cf478d177d6748c40d4ce725fb4f93aec82 (diff)
parent9d5ca4a14cca0985957eb4e23fd09068f2fd2215 (diff)
Merge "Fix for issue 3370052 : Export progress percentage is incorrect" into honeycomb
-rwxr-xr-xmedia/java/android/media/videoeditor/MediaArtistNativeHelper.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
index c3862e2368fa..122ad4e67a74 100755
--- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
+++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
@@ -1814,9 +1814,10 @@ class MediaArtistNativeHelper {
private void onProgressUpdate(int taskId, int progress) {
if (mProcessingState == PROCESSING_EXPORT) {
if (mExportProgressListener != null) {
- if ((progress % 2) == 0) {
- mProgressToApp++;
- mExportProgressListener.onProgress(mVideoEditor, mOutputFilename, mProgressToApp);
+ if (mProgressToApp < progress) {
+ mExportProgressListener.onProgress(mVideoEditor, mOutputFilename, progress);
+ /* record previous progress */
+ mProgressToApp = progress;
}
}
}