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

Merge "Fix ThumbnailUtils thumbnail pts calculation"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-09 22:53:50 +00:00
committed by Android (Google) Code Review
parent 1b676f4314 0da7cdc103
commit dfb94f02fc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaMetadataRetriever.java
View File

@@ -800,7 +800,7 @@ public class MediaMetadataRetriever implements AutoCloseable {
*/
public static final int METADATA_KEY_YEAR = 8;
/**
* The metadata key to retrieve the playback duration of the data source.
* The metadata key to retrieve the playback duration (in ms) of the data source.
*/
public static final int METADATA_KEY_DURATION = 9;
/**

10
media/java/android/media/ThumbnailUtils.java
View File

@@ -356,19 +356,21 @@ public class ThumbnailUtils {
return ImageDecoder.decodeBitmap(ImageDecoder.createSource(raw), resizer);
}
// Fall back to middle of video
final int width = Integer.parseInt(mmr.extractMetadata(METADATA_KEY_VIDEO_WIDTH));
final int height = Integer.parseInt(mmr.extractMetadata(METADATA_KEY_VIDEO_HEIGHT));
final long duration = Long.parseLong(mmr.extractMetadata(METADATA_KEY_DURATION));
// Fall back to middle of video
// Note: METADATA_KEY_DURATION unit is in ms, not us.
final long thumbnailTimeUs =
Long.parseLong(mmr.extractMetadata(METADATA_KEY_DURATION)) * 1000 / 2;
// If we're okay with something larger than native format, just
// return a frame without up-scaling it
if (size.getWidth() > width && size.getHeight() > height) {
return Objects.requireNonNull(
mmr.getFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC));
mmr.getFrameAtTime(thumbnailTimeUs, OPTION_CLOSEST_SYNC));
} else {
return Objects.requireNonNull(
mmr.getScaledFrameAtTime(duration / 2, OPTION_CLOSEST_SYNC,
mmr.getScaledFrameAtTime(thumbnailTimeUs, OPTION_CLOSEST_SYNC,
size.getWidth(), size.getHeight()));
}
} catch (RuntimeException e) {