diff options
| author | Andreas Huber <andih@google.com> | 2010-12-08 14:52:11 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-08 14:52:11 -0800 |
| commit | daac81d1f75e0a05c280e4ee3e94a21c35ca137a (patch) | |
| tree | 5005ef6e0817253bd3715a3234cdb008c2ab1b70 /media | |
| parent | 1542af35976ce121b8a69812ab8dec7b71a0b283 (diff) | |
| parent | b1d49ded620fc9c80f793f32742bf1fef0281271 (diff) | |
| download | frameworks_base-daac81d1f75e0a05c280e4ee3e94a21c35ca137a.zip frameworks_base-daac81d1f75e0a05c280e4ee3e94a21c35ca137a.tar.gz frameworks_base-daac81d1f75e0a05c280e4ee3e94a21c35ca137a.tar.bz2 | |
Merge "Fix thumbnail extraction for extractors that don't have a preference."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/StagefrightMetadataRetriever.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp index c28de93..ee3eefc 100644 --- a/media/libstagefright/StagefrightMetadataRetriever.cpp +++ b/media/libstagefright/StagefrightMetadataRetriever.cpp @@ -144,7 +144,10 @@ static VideoFrame *extractVideoFrameWithCodecFlags( static_cast<MediaSource::ReadOptions::SeekMode>(seekMode); int64_t thumbNailTime; - if (frameTimeUs < 0 && trackMeta->findInt64(kKeyThumbnailTime, &thumbNailTime)) { + if (frameTimeUs < 0) { + if (!trackMeta->findInt64(kKeyThumbnailTime, &thumbNailTime)) { + thumbNailTime = 0; + } options.setSeekTo(thumbNailTime, mode); } else { thumbNailTime = -1; |