Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for issue 3485010: The project thumbnail is not regenerated"

Browse Source
This commit is contained in:
Santosh Madhava
2011-02-24 16:25:53 -08:00
committed by Android (Google) Code Review
parent ffbe826804 89782f5013
commit 92df99547f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/videoeditor/VideoEditorImpl.java
View File

@@ -928,6 +928,7 @@ public class VideoEditorImpl implements VideoEditor {
String name;
MediaItem currentMediaItem = null;
Overlay currentOverlay = null;
boolean regenerateProjectThumbnail = false;
while (eventType != XmlPullParser.END_DOCUMENT) {
switch (eventType) {
case XmlPullParser.START_TAG: {
@@ -948,6 +949,11 @@ public class VideoEditorImpl implements VideoEditor {
} catch (Exception ex) {
Log.w(TAG, "Cannot load media item: " + mediaItemId, ex);
currentMediaItem = null;
// First media item is invalid, mark for project thumbnail removal
if (mMediaItems.size() == 0) {
regenerateProjectThumbnail = true;
}
// Ignore the media item
ignoredMediaItems.add(mediaItemId);
}
@@ -1043,6 +1049,11 @@ public class VideoEditorImpl implements VideoEditor {
eventType = parser.next();
}
computeTimelineDuration();
// Regenerate project thumbnail
if (regenerateProjectThumbnail) {
generateProjectThumbnail();
regenerateProjectThumbnail = false;
}
} finally {
if (fis != null) {
fis.close();